public inbox for linux-rockchip@lists.infradead.org
 help / color / mirror / Atom feed
From: Heiko Stuebner <heiko@sntech.de>
To: architt@codeaurora.org, hjc@rock-chips.com, a.hajda@samsung.com
Cc: Jose.Abreu@synopsys.com, algea.cao@rock-chips.com,
	jonas@kwiboo.se, dri-devel@lists.freedesktop.org,
	linux-rockchip@lists.infradead.org,
	Laurent.pinchart@ideasonboard.com,
	linux-arm-kernel@lists.infradead.org, zhengyang@rock-chips.com
Subject: [PATCH v5 4/6] drm/rockchip: dw_hdmi: allow including external phys
Date: Wed, 12 Sep 2018 14:47:38 +0200	[thread overview]
Message-ID: <20180912124740.20343-5-heiko@sntech.de> (raw)
In-Reply-To: <20180912124740.20343-1-heiko@sntech.de>

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);
-- 
2.17.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2018-09-12 12:47 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-12 12:47 [PATCH v5 0/6] drm/rockchip: hdmi support for rk3328 Heiko Stuebner
2018-09-12 12:47 ` [PATCH v5 1/6] drm/bridge: dw-hdmi: allow forcing vendor phy-type Heiko Stuebner
     [not found]   ` <1851d56f-b628-2d10-0da7-72c1075b2b9a@rock-chips.com>
2018-09-28  7:51     ` Zheng Yang
2018-09-28  8:09   ` Andrzej Hajda
2018-09-12 12:47 ` [PATCH v5 2/6] drm/rockchip: dw_hdmi: Allow outputs that don't need output switching Heiko Stuebner
     [not found]   ` <6d4ee8b5-a1fa-23b7-88db-32b2c02833cb@rock-chips.com>
2018-09-28  7:52     ` Fwd: " Zheng Yang
2018-09-12 12:47 ` [PATCH v5 3/6] dt-bindings: allow optional phys in Rockchip dw_hdmi binding Heiko Stuebner
2018-09-12 12:47 ` Heiko Stuebner [this message]
     [not found]   ` <4187b1f6-9682-6c3e-741e-0374e3e9165b@rock-chips.com>
2018-09-28  7:52     ` Fwd: [PATCH v5 4/6] drm/rockchip: dw_hdmi: allow including external phys Zheng Yang
2018-09-12 12:47 ` [PATCH v5 5/6] drm/rockchip: dw_hdmi: store rockchip_hdmi reference in phy_data object Heiko Stuebner
     [not found]   ` <3a8b88a3-ec0c-cf39-0a97-a941068318c2@rock-chips.com>
2018-09-28  7:52     ` Fwd: " Zheng Yang
2018-09-12 12:47 ` [PATCH v5 6/6] drm/rockchip: dw_hdmi: add dw-hdmi support for the rk3328 Heiko Stuebner
     [not found]   ` <8ec9f7d2-069a-81e4-acf5-050d6b2094f7@rock-chips.com>
2018-09-28  7:52     ` Fwd: " Zheng Yang
2018-09-28 11:14 ` [PATCH v5 0/6] drm/rockchip: hdmi support for rk3328 Heiko Stuebner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180912124740.20343-5-heiko@sntech.de \
    --to=heiko@sntech.de \
    --cc=Jose.Abreu@synopsys.com \
    --cc=Laurent.pinchart@ideasonboard.com \
    --cc=a.hajda@samsung.com \
    --cc=algea.cao@rock-chips.com \
    --cc=architt@codeaurora.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=hjc@rock-chips.com \
    --cc=jonas@kwiboo.se \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=zhengyang@rock-chips.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox