From: Milo Kim <woogyom.kim@gmail.com> To: Inki Dae <inki.dae@samsung.com>, Joonyoung Shim <jy0922.shim@samsung.com>, Seung-Woo Kim <sw0312.kim@samsung.com>, Rob Herring <robh+dt@kernel.org> Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Milo Kim <woogyom.kim@gmail.com> Subject: [PATCH 4/4] gpu: drm: exynos_hdmi: Use consolidated function on binding PHY DT property Date: Tue, 23 Aug 2016 18:13:39 +0900 [thread overview] Message-ID: <1471943619-6102-5-git-send-email-woogyom.kim@gmail.com> (raw) In-Reply-To: <1471943619-6102-1-git-send-email-woogyom.kim@gmail.com> Handle legacy and raw 'phy' parsing in single function. And it also removes goto condition. Cc: Inki Dae <inki.dae@samsung.com> Cc: Joonyoung Shim <jy0922.shim@samsung.com> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Milo Kim <woogyom.kim@gmail.com> --- drivers/gpu/drm/exynos/exynos_hdmi.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 6a636f2..bb2d6d4 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -1778,11 +1778,22 @@ static struct device_node *hdmi_ddc_dt_binding(struct device *dev) return np; } -static struct device_node *hdmi_legacy_phy_dt_binding(struct device *dev) +static struct device_node *hdmi_phy_dt_binding(struct device *dev) { const char *compatible_str = "samsung,exynos4212-hdmiphy"; + struct device_node *np; + + np = of_find_compatible_node(NULL, NULL, compatible_str); + if (np) + return np; + + np = of_parse_phandle(dev->of_node, "phy", 0); + if (!np) + return NULL; + + of_node_put(dev->of_node); - return of_find_compatible_node(NULL, NULL, compatible_str); + return np; } static int hdmi_probe(struct platform_device *pdev) @@ -1829,19 +1840,13 @@ static int hdmi_probe(struct platform_device *pdev) return -EPROBE_DEFER; } - phy_node = hdmi_legacy_phy_dt_binding(dev); - if (phy_node) - goto out_get_phy_port; - - phy_node = of_parse_phandle(dev->of_node, "phy", 0); + phy_node = hdmi_phy_dt_binding(dev); if (!phy_node) { DRM_ERROR("Failed to find hdmiphy node in device tree\n"); ret = -ENODEV; goto err_ddc; } - of_node_put(dev->of_node); -out_get_phy_port: if (hdata->drv_data->is_apb_phy) { hdata->regs_hdmiphy = of_iomap(phy_node, 0); if (!hdata->regs_hdmiphy) { -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: woogyom.kim@gmail.com (Milo Kim) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/4] gpu: drm: exynos_hdmi: Use consolidated function on binding PHY DT property Date: Tue, 23 Aug 2016 18:13:39 +0900 [thread overview] Message-ID: <1471943619-6102-5-git-send-email-woogyom.kim@gmail.com> (raw) In-Reply-To: <1471943619-6102-1-git-send-email-woogyom.kim@gmail.com> Handle legacy and raw 'phy' parsing in single function. And it also removes goto condition. Cc: Inki Dae <inki.dae@samsung.com> Cc: Joonyoung Shim <jy0922.shim@samsung.com> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: devicetree at vger.kernel.org Cc: linux-arm-kernel at lists.infradead.org Cc: linux-samsung-soc at vger.kernel.org Cc: linux-kernel at vger.kernel.org Cc: dri-devel at lists.freedesktop.org Signed-off-by: Milo Kim <woogyom.kim@gmail.com> --- drivers/gpu/drm/exynos/exynos_hdmi.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 6a636f2..bb2d6d4 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -1778,11 +1778,22 @@ static struct device_node *hdmi_ddc_dt_binding(struct device *dev) return np; } -static struct device_node *hdmi_legacy_phy_dt_binding(struct device *dev) +static struct device_node *hdmi_phy_dt_binding(struct device *dev) { const char *compatible_str = "samsung,exynos4212-hdmiphy"; + struct device_node *np; + + np = of_find_compatible_node(NULL, NULL, compatible_str); + if (np) + return np; + + np = of_parse_phandle(dev->of_node, "phy", 0); + if (!np) + return NULL; + + of_node_put(dev->of_node); - return of_find_compatible_node(NULL, NULL, compatible_str); + return np; } static int hdmi_probe(struct platform_device *pdev) @@ -1829,19 +1840,13 @@ static int hdmi_probe(struct platform_device *pdev) return -EPROBE_DEFER; } - phy_node = hdmi_legacy_phy_dt_binding(dev); - if (phy_node) - goto out_get_phy_port; - - phy_node = of_parse_phandle(dev->of_node, "phy", 0); + phy_node = hdmi_phy_dt_binding(dev); if (!phy_node) { DRM_ERROR("Failed to find hdmiphy node in device tree\n"); ret = -ENODEV; goto err_ddc; } - of_node_put(dev->of_node); -out_get_phy_port: if (hdata->drv_data->is_apb_phy) { hdata->regs_hdmiphy = of_iomap(phy_node, 0); if (!hdata->regs_hdmiphy) { -- 1.9.1
next prev parent reply other threads:[~2016-08-23 9:14 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-08-23 9:13 [PATCH 0/4] ARM: dts: exynos: Enable HDMI in Arndale Octa board Milo Kim 2016-08-23 9:13 ` Milo Kim 2016-08-23 9:13 ` [PATCH 1/4] ARM: dts: exynos: Enable HDMI for " Milo Kim 2016-08-23 9:13 ` Milo Kim 2016-08-23 9:13 ` [PATCH 2/4] ARM: dts: exynos: Use 'hpd-gpios' instead of 'hpd-gpio' Milo Kim 2016-08-23 9:13 ` Milo Kim 2016-08-23 20:10 ` Rob Herring 2016-08-23 20:10 ` Rob Herring 2016-08-23 20:10 ` Rob Herring 2016-08-23 9:13 ` [PATCH 3/4] gpu: drm: exynos_hdmi: Use consolidated function on binding DDC DT property Milo Kim 2016-08-23 9:13 ` Milo Kim 2016-08-23 9:13 ` Milo Kim [this message] 2016-08-23 9:13 ` [PATCH 4/4] gpu: drm: exynos_hdmi: Use consolidated function on binding PHY " Milo Kim 2016-08-23 19:55 ` [PATCH 0/4] ARM: dts: exynos: Enable HDMI in Arndale Octa board Krzysztof Kozlowski 2016-08-23 19:55 ` Krzysztof Kozlowski 2016-08-23 19:55 ` Krzysztof Kozlowski 2016-08-24 2:30 ` Milo Kim 2016-08-24 2:30 ` Milo Kim
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=1471943619-6102-5-git-send-email-woogyom.kim@gmail.com \ --to=woogyom.kim@gmail.com \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=inki.dae@samsung.com \ --cc=jy0922.shim@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=robh+dt@kernel.org \ --cc=sw0312.kim@samsung.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.