From: Archit Taneja <architt@codeaurora.org>
To: robdclark@gmail.com
Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
arnd@arndb.de
Subject: [PATCH v3 05/10] drm/msm/hdmi: Make HDMI core get its PHY
Date: Thu, 25 Feb 2016 11:22:40 +0530 [thread overview]
Message-ID: <1456379565-15045-6-git-send-email-architt@codeaurora.org> (raw)
In-Reply-To: <1456379565-15045-1-git-send-email-architt@codeaurora.org>
Make HDMI core get its PHY by parsing the "phys" phandle. The core will use
this PHY reference to enable/disable PHY. The driver defers probe until PHY
isn't available.
The DT bindings used here is the same as the one used for PHYs using the
common PHY framework bindings.
Signed-off-by: Archit Taneja <architt@codeaurora.org>
---
drivers/gpu/drm/msm/hdmi/hdmi.c | 40 ++++++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/msm/hdmi/hdmi.h | 2 ++
2 files changed, 42 insertions(+)
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index 0fe5411..043a70c 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -81,12 +81,46 @@ static void hdmi_destroy(struct hdmi *hdmi)
if (phy)
phy->funcs->destroy(phy);
+ if (hdmi->phy_dev) {
+ put_device(hdmi->phy_dev);
+ hdmi->phy = NULL;
+ hdmi->phy_dev = NULL;
+ }
+
if (hdmi->i2c)
hdmi_i2c_destroy(hdmi->i2c);
platform_set_drvdata(hdmi->pdev, NULL);
}
+static int hdmi_get_phy(struct hdmi *hdmi)
+{
+ struct platform_device *pdev = hdmi->pdev;
+ struct platform_device *phy_pdev;
+ struct device_node *phy_node;
+
+ phy_node = of_parse_phandle(pdev->dev.of_node, "phys", 0);
+ if (!phy_node) {
+ dev_err(&pdev->dev, "cannot find phy device\n");
+ return -ENXIO;
+ }
+
+ phy_pdev = of_find_device_by_node(phy_node);
+ if (phy_pdev)
+ hdmi->phy = platform_get_drvdata(phy_pdev);
+
+ of_node_put(phy_node);
+
+ if (!phy_pdev || !hdmi->phy) {
+ dev_err(&pdev->dev, "phy driver is not ready\n");
+ return -EPROBE_DEFER;
+ }
+
+ hdmi->phy_dev = get_device(&phy_pdev->dev);
+
+ return 0;
+}
+
/* construct hdmi at bind/probe time, grab all the resources. If
* we are to EPROBE_DEFER we want to do it here, rather than later
* at modeset_init() time
@@ -230,6 +264,12 @@ static struct hdmi *hdmi_init(struct platform_device *pdev)
goto fail;
}
+ ret = hdmi_get_phy(hdmi);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to get phy\n");
+ goto fail;
+ }
+
hdmi->hdcp_ctrl = hdmi_hdcp_init(hdmi);
if (IS_ERR(hdmi->hdcp_ctrl)) {
dev_warn(&pdev->dev, "failed to init hdcp: disabled\n");
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h
index 1beace8..f8122cf 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.h
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.h
@@ -70,6 +70,8 @@ struct hdmi {
struct clk **pwr_clks;
struct hdmi_phy *phy;
+ struct device *phy_dev;
+
struct i2c_adapter *i2c;
struct drm_connector *connector;
struct drm_bridge *bridge;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-02-25 5:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 5:52 [PATCH v3 00/10] drm/msm/hdmi: HDMI support on MSM8996 Archit Taneja
2016-02-25 5:52 ` [PATCH v3 01/10] drm/msm/hdmi: Clean up connector gpio usage Archit Taneja
2016-02-25 5:52 ` [PATCH v3 02/10] drm/msm/hdmi: Fix connector detect when there is no HPD gpio Archit Taneja
2016-02-25 5:52 ` [PATCH v3 03/10] drm/msm/hdmi: Create a separate HDMI PHY driver Archit Taneja
2016-02-25 5:52 ` [PATCH v3 04/10] drm/msm/hdmi: Manage HDMI PLL through " Archit Taneja
2016-02-25 5:52 ` Archit Taneja [this message]
2016-02-25 5:52 ` [PATCH v3 06/10] drm/msm/hdmi: Convert PHY files according to new design Archit Taneja
2016-02-25 5:52 ` [PATCH v3 07/10] drm/msm/hdmi: Update generated headers to split PHY/PLL offsets Archit Taneja
2016-02-25 5:52 ` [PATCH v3 08/10] drm/msm/hdmi: Update generated headers for HDMI 8996 PHY Archit Taneja
2016-02-25 5:52 ` [PATCH v3 09/10] drm/msm/hdmi: HDMI 8996 PHY/PLL support Archit Taneja
2016-02-25 5:52 ` [PATCH v3 10/10] dt-bindings: msm/hdmi: Add HDMI PHY bindings Archit Taneja
2016-03-02 17:41 ` Rob Herring
2016-02-25 8:39 ` [PATCH v3 00/10] drm/msm/hdmi: HDMI support on MSM8996 Arnd Bergmann
2016-02-25 8:47 ` Archit Taneja
2016-02-25 9:03 ` Archit Taneja
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=1456379565-15045-6-git-send-email-architt@codeaurora.org \
--to=architt@codeaurora.org \
--cc=arnd@arndb.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=robdclark@gmail.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;
as well as URLs for NNTP newsgroup(s).