diff mbox series

[v5,4/6] drm/rockchip: dw_hdmi: allow including external phys

Message ID 20180912124740.20343-5-heiko@sntech.de (mailing list archive)
State New, archived
Headers show
Series drm/rockchip: hdmi support for rk3328 | expand

Commit Message

Heiko Stübner Sept. 12, 2018, 12:47 p.m. UTC
Some variants of the dw-hdmi on Rockchip socs use a separate phy block
accessed via the generic phy framework, so allow them to be included
if such a phy reference is found.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Robin Murphy <robin.murphy@arm.com>
---
 drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Zheng Yang Sept. 28, 2018, 7:52 a.m. UTC | #1
Hi, Heiko:

Reviewed-by: zhengyang <zhengyang@rock-chips.com>

> Some variants of the dw-hdmi on Rockchip socs use a separate phy block
> accessed via the generic phy framework, so allow them to be included
> if such a phy reference is found.
>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> Tested-by: Robin Murphy <robin.murphy@arm.com>
> ---
>  drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c 
> b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
> index b09c3531305b..57e76dfd5f6d 100644
> --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
> +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
> @@ -11,6 +11,7 @@
>  #include <linux/mfd/syscon.h>
>  #include <linux/module.h>
>  #include <linux/platform_device.h>
> +#include <linux/phy/phy.h>
>  #include <linux/regmap.h>
>   #include <drm/drm_of.h>
> @@ -49,6 +50,7 @@ struct rockchip_hdmi {
>      struct clk *vpll_clk;
>      struct clk *grf_clk;
>      struct dw_hdmi *hdmi;
> +    struct phy *phy;
>  };
>   #define to_rockchip_hdmi(x)    container_of(x, struct rockchip_hdmi, x)
> @@ -376,6 +378,14 @@ static int dw_hdmi_rockchip_bind(struct device 
> *dev, struct device *master,
>          return ret;
>      }
>  +    hdmi->phy = devm_phy_optional_get(dev, "hdmi");
> +    if (IS_ERR(hdmi->phy)) {
> +        ret = PTR_ERR(hdmi->phy);
> +        if (ret != -EPROBE_DEFER)
> +            DRM_DEV_ERROR(hdmi->dev, "failed to get phy\n");
> +        return ret;
> +    }
> +
>      drm_encoder_helper_add(encoder, 
> &dw_hdmi_rockchip_encoder_helper_funcs);
>      drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs,
>               DRM_MODE_ENCODER_TMDS, NULL);
diff mbox series

Patch

diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index b09c3531305b..57e76dfd5f6d 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -11,6 +11,7 @@ 
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/phy/phy.h>
 #include <linux/regmap.h>
 
 #include <drm/drm_of.h>
@@ -49,6 +50,7 @@  struct rockchip_hdmi {
 	struct clk *vpll_clk;
 	struct clk *grf_clk;
 	struct dw_hdmi *hdmi;
+	struct phy *phy;
 };
 
 #define to_rockchip_hdmi(x)	container_of(x, struct rockchip_hdmi, x)
@@ -376,6 +378,14 @@  static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
 		return ret;
 	}
 
+	hdmi->phy = devm_phy_optional_get(dev, "hdmi");
+	if (IS_ERR(hdmi->phy)) {
+		ret = PTR_ERR(hdmi->phy);
+		if (ret != -EPROBE_DEFER)
+			DRM_DEV_ERROR(hdmi->dev, "failed to get phy\n");
+		return ret;
+	}
+
 	drm_encoder_helper_add(encoder, &dw_hdmi_rockchip_encoder_helper_funcs);
 	drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs,
 			 DRM_MODE_ENCODER_TMDS, NULL);