From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from galahad.ideasonboard.com ([185.26.127.97]:40959 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752315AbdCCReP (ORCPT ); Fri, 3 Mar 2017 12:34:15 -0500 From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Cc: Andy Yan , Archit Taneja , Fabio Estevam , Jose Abreu , Kieran Bingham , Neil Armstrong , Nickey Yang , Russell King , Vladimir Zapolskiy , linux-renesas-soc@vger.kernel.org, Kieran Bingham Subject: [PATCH v5 08/10] drm: bridge: dw-hdmi: Remove device type from platform data Date: Fri, 3 Mar 2017 19:20:05 +0200 Message-Id: <20170303172007.26541-9-laurent.pinchart+renesas@ideasonboard.com> In-Reply-To: <20170303172007.26541-1-laurent.pinchart+renesas@ideasonboard.com> References: <20170303172007.26541-1-laurent.pinchart+renesas@ideasonboard.com> Sender: linux-renesas-soc-owner@vger.kernel.org List-ID: From: Kieran Bingham The device type isn't used anymore now that workarounds and PHY-specific operations are performed based on version information read at runtime. Remove it. Signed-off-by: Kieran Bingham Signed-off-by: Laurent Pinchart Tested-by: Neil Armstrong Reviewed-by: Jose Abreu --- drivers/gpu/drm/bridge/dw-hdmi.c | 2 -- drivers/gpu/drm/imx/dw_hdmi-imx.c | 2 -- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 1 - include/drm/bridge/dw_hdmi.h | 7 ------- 4 files changed, 12 deletions(-) diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index b835d81bb471..132c00685796 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -127,7 +127,6 @@ struct dw_hdmi { struct drm_connector connector; struct drm_bridge bridge; - enum dw_hdmi_devtype dev_type; unsigned int version; struct platform_device *audio; @@ -2014,7 +2013,6 @@ __dw_hdmi_probe(struct platform_device *pdev, hdmi->plat_data = plat_data; hdmi->dev = dev; - hdmi->dev_type = plat_data->dev_type; hdmi->sample_rate = 48000; hdmi->disabled = true; hdmi->rxsense = true; diff --git a/drivers/gpu/drm/imx/dw_hdmi-imx.c b/drivers/gpu/drm/imx/dw_hdmi-imx.c index f645275e6e63..f039641070ac 100644 --- a/drivers/gpu/drm/imx/dw_hdmi-imx.c +++ b/drivers/gpu/drm/imx/dw_hdmi-imx.c @@ -175,7 +175,6 @@ static struct dw_hdmi_plat_data imx6q_hdmi_drv_data = { .mpll_cfg = imx_mpll_cfg, .cur_ctr = imx_cur_ctr, .phy_config = imx_phy_config, - .dev_type = IMX6Q_HDMI, .mode_valid = imx6q_hdmi_mode_valid, }; @@ -183,7 +182,6 @@ static struct dw_hdmi_plat_data imx6dl_hdmi_drv_data = { .mpll_cfg = imx_mpll_cfg, .cur_ctr = imx_cur_ctr, .phy_config = imx_phy_config, - .dev_type = IMX6DL_HDMI, .mode_valid = imx6dl_hdmi_mode_valid, }; diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index a6d4a0236e8f..d53827413996 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -237,7 +237,6 @@ static const struct dw_hdmi_plat_data rockchip_hdmi_drv_data = { .mpll_cfg = rockchip_mpll_cfg, .cur_ctr = rockchip_cur_ctr, .phy_config = rockchip_phy_config, - .dev_type = RK3288_HDMI, }; static const struct of_device_id dw_hdmi_rockchip_dt_ids[] = { diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h index dd330259a3dc..545f04fae3b6 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -21,12 +21,6 @@ enum { DW_HDMI_RES_MAX, }; -enum dw_hdmi_devtype { - IMX6Q_HDMI, - IMX6DL_HDMI, - RK3288_HDMI, -}; - enum dw_hdmi_phy_type { DW_HDMI_PHY_DWC_HDMI_TX_PHY = 0x00, DW_HDMI_PHY_DWC_MHL_PHY_HEAC = 0xb2, @@ -65,7 +59,6 @@ struct dw_hdmi_phy_ops { }; struct dw_hdmi_plat_data { - enum dw_hdmi_devtype dev_type; enum drm_mode_status (*mode_valid)(struct drm_connector *connector, struct drm_display_mode *mode); -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: [PATCH v5 08/10] drm: bridge: dw-hdmi: Remove device type from platform data Date: Fri, 3 Mar 2017 19:20:05 +0200 Message-ID: <20170303172007.26541-9-laurent.pinchart+renesas@ideasonboard.com> References: <20170303172007.26541-1-laurent.pinchart+renesas@ideasonboard.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [IPv6:2001:4b98:dc2:45:216:3eff:febb:480d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1222C6EDA9 for ; Fri, 3 Mar 2017 17:19:44 +0000 (UTC) In-Reply-To: <20170303172007.26541-1-laurent.pinchart+renesas@ideasonboard.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Fabio Estevam , Jose Abreu , Neil Armstrong , Kieran Bingham , linux-renesas-soc@vger.kernel.org, Nickey Yang , Kieran Bingham , Russell King , Andy Yan , Vladimir Zapolskiy List-Id: dri-devel@lists.freedesktop.org RnJvbTogS2llcmFuIEJpbmdoYW0gPGtpZXJhbi5iaW5naGFtK3JlbmVzYXNAaWRlYXNvbmJvYXJk LmNvbT4KClRoZSBkZXZpY2UgdHlwZSBpc24ndCB1c2VkIGFueW1vcmUgbm93IHRoYXQgd29ya2Fy b3VuZHMgYW5kIFBIWS1zcGVjaWZpYwpvcGVyYXRpb25zIGFyZSBwZXJmb3JtZWQgYmFzZWQgb24g dmVyc2lvbiBpbmZvcm1hdGlvbiByZWFkIGF0IHJ1bnRpbWUuClJlbW92ZSBpdC4KClNpZ25lZC1v ZmYtYnk6IEtpZXJhbiBCaW5naGFtIDxraWVyYW4uYmluZ2hhbStyZW5lc2FzQGlkZWFzb25ib2Fy ZC5jb20+ClNpZ25lZC1vZmYtYnk6IExhdXJlbnQgUGluY2hhcnQgPGxhdXJlbnQucGluY2hhcnQr cmVuZXNhc0BpZGVhc29uYm9hcmQuY29tPgpUZXN0ZWQtYnk6IE5laWwgQXJtc3Ryb25nIDxuYXJt c3Ryb25nQGJheWxpYnJlLmNvbT4KUmV2aWV3ZWQtYnk6IEpvc2UgQWJyZXUgPGpvYWJyZXVAc3lu b3BzeXMuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2UvZHctaGRtaS5jICAgICAgICAg ICAgfCAyIC0tCiBkcml2ZXJzL2dwdS9kcm0vaW14L2R3X2hkbWktaW14LmMgICAgICAgICAgIHwg MiAtLQogZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3X2hkbWktcm9ja2NoaXAuYyB8IDEgLQog aW5jbHVkZS9kcm0vYnJpZGdlL2R3X2hkbWkuaCAgICAgICAgICAgICAgICB8IDcgLS0tLS0tLQog NCBmaWxlcyBjaGFuZ2VkLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYnJpZGdlL2R3LWhkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvZHctaGRtaS5j CmluZGV4IGI4MzVkODFiYjQ3MS4uMTMyYzAwNjg1Nzk2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYnJpZGdlL2R3LWhkbWkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2R3LWhk bWkuYwpAQCAtMTI3LDcgKzEyNyw2IEBAIHN0cnVjdCBkd19oZG1pIHsKIAlzdHJ1Y3QgZHJtX2Nv bm5lY3RvciBjb25uZWN0b3I7CiAJc3RydWN0IGRybV9icmlkZ2UgYnJpZGdlOwogCi0JZW51bSBk d19oZG1pX2RldnR5cGUgZGV2X3R5cGU7CiAJdW5zaWduZWQgaW50IHZlcnNpb247CiAKIAlzdHJ1 Y3QgcGxhdGZvcm1fZGV2aWNlICphdWRpbzsKQEAgLTIwMTQsNyArMjAxMyw2IEBAIF9fZHdfaGRt aV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2LAogCiAJaGRtaS0+cGxhdF9kYXRh ID0gcGxhdF9kYXRhOwogCWhkbWktPmRldiA9IGRldjsKLQloZG1pLT5kZXZfdHlwZSA9IHBsYXRf ZGF0YS0+ZGV2X3R5cGU7CiAJaGRtaS0+c2FtcGxlX3JhdGUgPSA0ODAwMDsKIAloZG1pLT5kaXNh YmxlZCA9IHRydWU7CiAJaGRtaS0+cnhzZW5zZSA9IHRydWU7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaW14L2R3X2hkbWktaW14LmMgYi9kcml2ZXJzL2dwdS9kcm0vaW14L2R3X2hkbWkt aW14LmMKaW5kZXggZjY0NTI3NWU2ZTYzLi5mMDM5NjQxMDcwYWMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pbXgvZHdfaGRtaS1pbXguYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaW14L2R3 X2hkbWktaW14LmMKQEAgLTE3NSw3ICsxNzUsNiBAQCBzdGF0aWMgc3RydWN0IGR3X2hkbWlfcGxh dF9kYXRhIGlteDZxX2hkbWlfZHJ2X2RhdGEgPSB7CiAJLm1wbGxfY2ZnICAgPSBpbXhfbXBsbF9j ZmcsCiAJLmN1cl9jdHIgICAgPSBpbXhfY3VyX2N0ciwKIAkucGh5X2NvbmZpZyA9IGlteF9waHlf Y29uZmlnLAotCS5kZXZfdHlwZSAgID0gSU1YNlFfSERNSSwKIAkubW9kZV92YWxpZCA9IGlteDZx X2hkbWlfbW9kZV92YWxpZCwKIH07CiAKQEAgLTE4Myw3ICsxODIsNiBAQCBzdGF0aWMgc3RydWN0 IGR3X2hkbWlfcGxhdF9kYXRhIGlteDZkbF9oZG1pX2Rydl9kYXRhID0gewogCS5tcGxsX2NmZyA9 IGlteF9tcGxsX2NmZywKIAkuY3VyX2N0ciAgPSBpbXhfY3VyX2N0ciwKIAkucGh5X2NvbmZpZyA9 IGlteF9waHlfY29uZmlnLAotCS5kZXZfdHlwZSA9IElNWDZETF9IRE1JLAogCS5tb2RlX3ZhbGlk ID0gaW14NmRsX2hkbWlfbW9kZV92YWxpZCwKIH07CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9yb2NrY2hpcC9kd19oZG1pLXJvY2tjaGlwLmMgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2No aXAvZHdfaGRtaS1yb2NrY2hpcC5jCmluZGV4IGE2ZDRhMDIzNmU4Zi4uZDUzODI3NDEzOTk2IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHdfaGRtaS1yb2NrY2hpcC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kd19oZG1pLXJvY2tjaGlwLmMKQEAgLTIzNyw3 ICsyMzcsNiBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGR3X2hkbWlfcGxhdF9kYXRhIHJvY2tjaGlw X2hkbWlfZHJ2X2RhdGEgPSB7CiAJLm1wbGxfY2ZnICAgPSByb2NrY2hpcF9tcGxsX2NmZywKIAku Y3VyX2N0ciAgICA9IHJvY2tjaGlwX2N1cl9jdHIsCiAJLnBoeV9jb25maWcgPSByb2NrY2hpcF9w aHlfY29uZmlnLAotCS5kZXZfdHlwZSAgID0gUkszMjg4X0hETUksCiB9OwogCiBzdGF0aWMgY29u c3Qgc3RydWN0IG9mX2RldmljZV9pZCBkd19oZG1pX3JvY2tjaGlwX2R0X2lkc1tdID0gewpkaWZm IC0tZ2l0IGEvaW5jbHVkZS9kcm0vYnJpZGdlL2R3X2hkbWkuaCBiL2luY2x1ZGUvZHJtL2JyaWRn ZS9kd19oZG1pLmgKaW5kZXggZGQzMzAyNTlhM2RjLi41NDVmMDRmYWUzYjYgMTAwNjQ0Ci0tLSBh L2luY2x1ZGUvZHJtL2JyaWRnZS9kd19oZG1pLmgKKysrIGIvaW5jbHVkZS9kcm0vYnJpZGdlL2R3 X2hkbWkuaApAQCAtMjEsMTIgKzIxLDYgQEAgZW51bSB7CiAJRFdfSERNSV9SRVNfTUFYLAogfTsK IAotZW51bSBkd19oZG1pX2RldnR5cGUgewotCUlNWDZRX0hETUksCi0JSU1YNkRMX0hETUksCi0J UkszMjg4X0hETUksCi19OwotCiBlbnVtIGR3X2hkbWlfcGh5X3R5cGUgewogCURXX0hETUlfUEhZ X0RXQ19IRE1JX1RYX1BIWSA9IDB4MDAsCiAJRFdfSERNSV9QSFlfRFdDX01ITF9QSFlfSEVBQyA9 IDB4YjIsCkBAIC02NSw3ICs1OSw2IEBAIHN0cnVjdCBkd19oZG1pX3BoeV9vcHMgewogfTsKIAog c3RydWN0IGR3X2hkbWlfcGxhdF9kYXRhIHsKLQllbnVtIGR3X2hkbWlfZGV2dHlwZSBkZXZfdHlw ZTsKIAllbnVtIGRybV9tb2RlX3N0YXR1cyAoKm1vZGVfdmFsaWQpKHN0cnVjdCBkcm1fY29ubmVj dG9yICpjb25uZWN0b3IsCiAJCQkJCSAgIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlKTsK IAotLSAKUmVnYXJkcywKCkxhdXJlbnQgUGluY2hhcnQKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=