* [PATCH v4 0/3] gpu: drm: exynos_hdmi: Code refactoring on hdmi ddc and phy
@ 2016-08-31 6:14 Milo Kim
2016-08-31 6:14 ` [PATCH v4 1/3] gpu: drm: exynos_hdmi: Move DDC logic into single function Milo Kim
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Milo Kim @ 2016-08-31 6:14 UTC (permalink / raw)
To: David Airlie
Cc: Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park,
Andrzej Hajda, dri-devel, linux-kernel, Milo Kim
v4:
Only DRM patchset is sent, DTS patch was sent separately.
Milo Kim (3):
gpu: drm: exynos_hdmi: Move DDC logic into single function
gpu: drm: exynos_hdmi: Move PHY logic into single function
gpu: drm: exynos_hdmi: Remove duplicate initialization of regulator
bulk consumer
drivers/gpu/drm/exynos/exynos_hdmi.c | 112 ++++++++++++++++++-----------------
1 file changed, 59 insertions(+), 53 deletions(-)
--
2.9.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v4 1/3] gpu: drm: exynos_hdmi: Move DDC logic into single function
2016-08-31 6:14 [PATCH v4 0/3] gpu: drm: exynos_hdmi: Code refactoring on hdmi ddc and phy Milo Kim
@ 2016-08-31 6:14 ` Milo Kim
2016-08-31 6:57 ` Andrzej Hajda
2016-08-31 6:14 ` [PATCH v4 2/3] gpu: drm: exynos_hdmi: Move PHY " Milo Kim
2016-08-31 6:14 ` [PATCH v4 3/3] gpu: drm: exynos_hdmi: Remove duplicate initialization of regulator bulk consumer Milo Kim
2 siblings, 1 reply; 6+ messages in thread
From: Milo Kim @ 2016-08-31 6:14 UTC (permalink / raw)
To: David Airlie
Cc: Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park,
Andrzej Hajda, dri-devel, linux-kernel, Milo Kim
Paring DT properties and getting the I2C adapter in one function.
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
---
drivers/gpu/drm/exynos/exynos_hdmi.c | 46 ++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 2275efe..1440dfd 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -1760,16 +1760,34 @@ static const struct component_ops hdmi_component_ops = {
.unbind = hdmi_unbind,
};
-static struct device_node *hdmi_legacy_ddc_dt_binding(struct device *dev)
+static int hdmi_get_ddc_adapter(struct hdmi_context *hdata)
{
const char *compatible_str = "samsung,exynos4210-hdmiddc";
struct device_node *np;
+ struct i2c_adapter *adpt;
np = of_find_compatible_node(NULL, NULL, compatible_str);
if (np)
- return of_get_next_parent(np);
+ np = of_get_next_parent(np);
+ else
+ np = of_parse_phandle(hdata->dev->of_node, "ddc", 0);
+
+ if (!np) {
+ DRM_ERROR("Failed to find ddc node in device tree\n");
+ return -ENODEV;
+ }
+
+ adpt = of_find_i2c_adapter_by_node(np);
+ of_node_put(np);
- return NULL;
+ if (!adpt) {
+ DRM_INFO("Failed to get ddc i2c adapter by node\n");
+ return -EPROBE_DEFER;
+ }
+
+ hdata->ddc_adpt = adpt;
+
+ return 0;
}
static struct device_node *hdmi_legacy_phy_dt_binding(struct device *dev)
@@ -1781,7 +1799,7 @@ static struct device_node *hdmi_legacy_phy_dt_binding(struct device *dev)
static int hdmi_probe(struct platform_device *pdev)
{
- struct device_node *ddc_node, *phy_node;
+ struct device_node *phy_node;
struct device *dev = &pdev->dev;
struct hdmi_context *hdata;
struct resource *res;
@@ -1811,23 +1829,9 @@ static int hdmi_probe(struct platform_device *pdev)
return ret;
}
- ddc_node = hdmi_legacy_ddc_dt_binding(dev);
- if (ddc_node)
- goto out_get_ddc_adpt;
-
- ddc_node = of_parse_phandle(dev->of_node, "ddc", 0);
- if (!ddc_node) {
- DRM_ERROR("Failed to find ddc node in device tree\n");
- return -ENODEV;
- }
- of_node_put(dev->of_node);
-
-out_get_ddc_adpt:
- hdata->ddc_adpt = of_find_i2c_adapter_by_node(ddc_node);
- if (!hdata->ddc_adpt) {
- DRM_ERROR("Failed to get ddc i2c adapter by node\n");
- return -EPROBE_DEFER;
- }
+ ret = hdmi_get_ddc_adapter(hdata);
+ if (ret)
+ return ret;
phy_node = hdmi_legacy_phy_dt_binding(dev);
if (phy_node)
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 2/3] gpu: drm: exynos_hdmi: Move PHY logic into single function
2016-08-31 6:14 [PATCH v4 0/3] gpu: drm: exynos_hdmi: Code refactoring on hdmi ddc and phy Milo Kim
2016-08-31 6:14 ` [PATCH v4 1/3] gpu: drm: exynos_hdmi: Move DDC logic into single function Milo Kim
@ 2016-08-31 6:14 ` Milo Kim
2016-08-31 7:02 ` Andrzej Hajda
2016-08-31 6:14 ` [PATCH v4 3/3] gpu: drm: exynos_hdmi: Remove duplicate initialization of regulator bulk consumer Milo Kim
2 siblings, 1 reply; 6+ messages in thread
From: Milo Kim @ 2016-08-31 6:14 UTC (permalink / raw)
To: David Airlie
Cc: Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park,
Andrzej Hajda, dri-devel, linux-kernel, Milo Kim
Paring DT properties and getting PHY IO (memory mapped or I2C) in one
function.
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
---
drivers/gpu/drm/exynos/exynos_hdmi.c | 63 +++++++++++++++++++-----------------
1 file changed, 33 insertions(+), 30 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 1440dfd..42b0b98 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -1790,16 +1790,44 @@ static int hdmi_get_ddc_adapter(struct hdmi_context *hdata)
return 0;
}
-static struct device_node *hdmi_legacy_phy_dt_binding(struct device *dev)
+static int hdmi_get_phy_io(struct hdmi_context *hdata)
{
const char *compatible_str = "samsung,exynos4212-hdmiphy";
+ struct device_node *np;
+ int ret = 0;
+
+ np = of_find_compatible_node(NULL, NULL, compatible_str);
+ if (!np) {
+ np = of_parse_phandle(hdata->dev->of_node, "phy", 0);
+ if (!np) {
+ DRM_ERROR("Failed to find hdmiphy node in device tree\n");
+ return -ENODEV;
+ }
+ }
+
+ if (hdata->drv_data->is_apb_phy) {
+ hdata->regs_hdmiphy = of_iomap(np, 0);
+ if (!hdata->regs_hdmiphy) {
+ DRM_ERROR("failed to ioremap hdmi phy\n");
+ ret = -ENOMEM;
+ goto out;
+ }
+ } else {
+ hdata->hdmiphy_port = of_find_i2c_device_by_node(np);
+ if (!hdata->hdmiphy_port) {
+ DRM_INFO("Failed to get hdmi phy i2c client\n");
+ ret = -EPROBE_DEFER;
+ goto out;
+ }
+ }
- return of_find_compatible_node(NULL, NULL, compatible_str);
+out:
+ of_node_put(np);
+ return ret;
}
static int hdmi_probe(struct platform_device *pdev)
{
- struct device_node *phy_node;
struct device *dev = &pdev->dev;
struct hdmi_context *hdata;
struct resource *res;
@@ -1833,34 +1861,9 @@ static int hdmi_probe(struct platform_device *pdev)
if (ret)
return ret;
- 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);
- if (!phy_node) {
- DRM_ERROR("Failed to find hdmiphy node in device tree\n");
- ret = -ENODEV;
+ ret = hdmi_get_phy_io(hdata);
+ if (ret)
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) {
- DRM_ERROR("failed to ioremap hdmi phy\n");
- ret = -ENOMEM;
- goto err_ddc;
- }
- } else {
- hdata->hdmiphy_port = of_find_i2c_device_by_node(phy_node);
- if (!hdata->hdmiphy_port) {
- DRM_ERROR("Failed to get hdmi phy i2c client\n");
- ret = -EPROBE_DEFER;
- goto err_ddc;
- }
- }
INIT_DELAYED_WORK(&hdata->hotplug_work, hdmi_hotplug_work_func);
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 3/3] gpu: drm: exynos_hdmi: Remove duplicate initialization of regulator bulk consumer
2016-08-31 6:14 [PATCH v4 0/3] gpu: drm: exynos_hdmi: Code refactoring on hdmi ddc and phy Milo Kim
2016-08-31 6:14 ` [PATCH v4 1/3] gpu: drm: exynos_hdmi: Move DDC logic into single function Milo Kim
2016-08-31 6:14 ` [PATCH v4 2/3] gpu: drm: exynos_hdmi: Move PHY " Milo Kim
@ 2016-08-31 6:14 ` Milo Kim
2 siblings, 0 replies; 6+ messages in thread
From: Milo Kim @ 2016-08-31 6:14 UTC (permalink / raw)
To: David Airlie
Cc: Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park,
Andrzej Hajda, dri-devel, linux-kernel, Milo Kim
The helper, devm_regulator_bulk_get() initializes the consumer as NULL,
so this code can be ignored.
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
---
drivers/gpu/drm/exynos/exynos_hdmi.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 42b0b98..e8fb6ef 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -1669,10 +1669,9 @@ static int hdmi_resources_init(struct hdmi_context *hdata)
if (ret)
return ret;
- for (i = 0; i < ARRAY_SIZE(supply); ++i) {
+ for (i = 0; i < ARRAY_SIZE(supply); ++i)
hdata->regul_bulk[i].supply = supply[i];
- hdata->regul_bulk[i].consumer = NULL;
- }
+
ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(supply), hdata->regul_bulk);
if (ret) {
if (ret != -EPROBE_DEFER)
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v4 1/3] gpu: drm: exynos_hdmi: Move DDC logic into single function
2016-08-31 6:14 ` [PATCH v4 1/3] gpu: drm: exynos_hdmi: Move DDC logic into single function Milo Kim
@ 2016-08-31 6:57 ` Andrzej Hajda
0 siblings, 0 replies; 6+ messages in thread
From: Andrzej Hajda @ 2016-08-31 6:57 UTC (permalink / raw)
To: Milo Kim, David Airlie
Cc: Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park,
dri-devel, linux-kernel
On 08/31/2016 08:14 AM, Milo Kim wrote:
> Paring DT properties and getting the I2C adapter in one function.
>
> Cc: Inki Dae <inki.dae@samsung.com>
> Cc: Joonyoung Shim <jy0922.shim@samsung.com>
> Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
--
Regards
Andrzej
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4 2/3] gpu: drm: exynos_hdmi: Move PHY logic into single function
2016-08-31 6:14 ` [PATCH v4 2/3] gpu: drm: exynos_hdmi: Move PHY " Milo Kim
@ 2016-08-31 7:02 ` Andrzej Hajda
0 siblings, 0 replies; 6+ messages in thread
From: Andrzej Hajda @ 2016-08-31 7:02 UTC (permalink / raw)
To: Milo Kim, David Airlie
Cc: Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park,
dri-devel, linux-kernel
On 08/31/2016 08:14 AM, Milo Kim wrote:
> Paring DT properties and getting PHY IO (memory mapped or I2C) in one
> function.
>
> Cc: Inki Dae <inki.dae@samsung.com>
> Cc: Joonyoung Shim <jy0922.shim@samsung.com>
> Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
--
Regards
Andrzej
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-08-31 7:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-31 6:14 [PATCH v4 0/3] gpu: drm: exynos_hdmi: Code refactoring on hdmi ddc and phy Milo Kim
2016-08-31 6:14 ` [PATCH v4 1/3] gpu: drm: exynos_hdmi: Move DDC logic into single function Milo Kim
2016-08-31 6:57 ` Andrzej Hajda
2016-08-31 6:14 ` [PATCH v4 2/3] gpu: drm: exynos_hdmi: Move PHY " Milo Kim
2016-08-31 7:02 ` Andrzej Hajda
2016-08-31 6:14 ` [PATCH v4 3/3] gpu: drm: exynos_hdmi: Remove duplicate initialization of regulator bulk consumer Milo Kim
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).