Commit bd130230 authored by Heiko Stuebner's avatar Heiko Stuebner

drm/rockchip: dw_hdmi: allow including external phys

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: default avatarHeiko Stuebner <heiko@sntech.de>
Tested-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarZheng Yang <zhengyang@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180912124740.20343-5-heiko@sntech.de
parent 9f891dbe
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/mfd/syscon.h> #include <linux/mfd/syscon.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/phy/phy.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <drm/drm_of.h> #include <drm/drm_of.h>
...@@ -49,6 +50,7 @@ struct rockchip_hdmi { ...@@ -49,6 +50,7 @@ struct rockchip_hdmi {
struct clk *vpll_clk; struct clk *vpll_clk;
struct clk *grf_clk; struct clk *grf_clk;
struct dw_hdmi *hdmi; struct dw_hdmi *hdmi;
struct phy *phy;
}; };
#define to_rockchip_hdmi(x) container_of(x, struct rockchip_hdmi, x) #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, ...@@ -376,6 +378,14 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
return ret; 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_helper_add(encoder, &dw_hdmi_rockchip_encoder_helper_funcs);
drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs, drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs,
DRM_MODE_ENCODER_TMDS, NULL); DRM_MODE_ENCODER_TMDS, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment