subject:"\[PATCH 2\/4\] drm\/exynos\: add mout_hdmi clock in hdmi driver to change parent"

[PATCH 2/4] drm/exynos: add mout_hdmi clock in hdmi driver to change parent

2013-06-13 Thread Inki Dae

Applied.

Thanks,
Inki Dae

> -Original Message-
> From: Rahul Sharma [mailto:rahul.sharma at samsung.com]
> Sent: Tuesday, June 11, 2013 3:54 PM
> To: linux-samsung-soc at vger.kernel.org;
devicetree-discuss at lists.ozlabs.org;
> dri-devel at lists.freedesktop.org
> Cc: kgene.kim at samsung.com; sw0312.kim at samsung.com; inki.dae at 
> samsung.com;
> seanpaul at chromium.org; joshi at samsung.com; r.sh.open at gmail.com; Rahul
> Sharma
> Subject: [PATCH 2/4] drm/exynos: add mout_hdmi clock in hdmi driver to
> change parent
> 
> HDMI driver needs to configure the mout_hdmi mux clock to change
> the parent between sclk_hdmiphy and sclk_pixel.
> 
> Signed-off-by: Rahul Sharma 
> ---
>  drivers/gpu/drm/exynos/exynos_hdmi.c |   14 ++
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c
> b/drivers/gpu/drm/exynos/exynos_hdmi.c
> index 5a98194..3b5e215 100644
> --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> @@ -83,6 +83,7 @@ struct hdmi_resources {
>   struct clk  *sclk_pixel;
>   struct clk  *sclk_hdmiphy;
>   struct clk  *hdmiphy;
> + struct clk  *mout_hdmi;
>   struct regulator_bulk_data  *regul_bulk;
>   int regul_count;
>  };
> @@ -1118,7 +1119,7 @@ static void hdmi_v13_mode_apply(struct hdmi_context
> *hdata)
>   }
> 
>   clk_disable_unprepare(hdata->res.sclk_hdmi);
> - clk_set_parent(hdata->res.sclk_hdmi, hdata->res.sclk_hdmiphy);
> + clk_set_parent(hdata->res.mout_hdmi, hdata->res.sclk_hdmiphy);
>   clk_prepare_enable(hdata->res.sclk_hdmi);
> 
>   /* enable HDMI and timing generator */
> @@ -1285,7 +1286,7 @@ static void hdmi_v14_mode_apply(struct hdmi_context
> *hdata)
>   }
> 
>   clk_disable_unprepare(hdata->res.sclk_hdmi);
> - clk_set_parent(hdata->res.sclk_hdmi, hdata->res.sclk_hdmiphy);
> + clk_set_parent(hdata->res.mout_hdmi, hdata->res.sclk_hdmiphy);
>   clk_prepare_enable(hdata->res.sclk_hdmi);
> 
>   /* enable HDMI and timing generator */
> @@ -1311,7 +1312,7 @@ static void hdmiphy_conf_reset(struct hdmi_context
> *hdata)
>   u32 reg;
> 
>   clk_disable_unprepare(hdata->res.sclk_hdmi);
> - clk_set_parent(hdata->res.sclk_hdmi, hdata->res.sclk_pixel);
> + clk_set_parent(hdata->res.mout_hdmi, hdata->res.sclk_pixel);
>   clk_prepare_enable(hdata->res.sclk_hdmi);
> 
>   /* operation mode */
> @@ -1832,8 +1833,13 @@ static int hdmi_resources_init(struct hdmi_context
> *hdata)
>   DRM_ERROR("failed to get clock 'hdmiphy'\n");
>   goto fail;
>   }
> + res->mout_hdmi = devm_clk_get(dev, "mout_hdmi");
> + if (IS_ERR(res->mout_hdmi)) {
> + DRM_ERROR("failed to get clock 'mout_hdmi'\n");
> + goto fail;
> + }
> 
> - clk_set_parent(res->sclk_hdmi, res->sclk_pixel);
> + clk_set_parent(res->mout_hdmi, res->sclk_pixel);
> 
>   res->regul_bulk = devm_kzalloc(dev, ARRAY_SIZE(supply) *
>   sizeof(res->regul_bulk[0]), GFP_KERNEL);
> --
> 1.7.10.4

RE: [PATCH 2/4] drm/exynos: add mout_hdmi clock in hdmi driver to change parent

2013-06-13 Thread Inki Dae

Applied.

Thanks,
Inki Dae

 -Original Message-
 From: Rahul Sharma [mailto:rahul.sha...@samsung.com]
 Sent: Tuesday, June 11, 2013 3:54 PM
 To: linux-samsung-...@vger.kernel.org;
devicetree-disc...@lists.ozlabs.org;
 dri-devel@lists.freedesktop.org
 Cc: kgene@samsung.com; sw0312@samsung.com; inki@samsung.com;
 seanp...@chromium.org; jo...@samsung.com; r.sh.o...@gmail.com; Rahul
 Sharma
 Subject: [PATCH 2/4] drm/exynos: add mout_hdmi clock in hdmi driver to
 change parent
 
 HDMI driver needs to configure the mout_hdmi mux clock to change
 the parent between sclk_hdmiphy and sclk_pixel.
 
 Signed-off-by: Rahul Sharma rahul.sha...@samsung.com
 ---
  drivers/gpu/drm/exynos/exynos_hdmi.c |   14 ++
  1 file changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c
 b/drivers/gpu/drm/exynos/exynos_hdmi.c
 index 5a98194..3b5e215 100644
 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
 +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
 @@ -83,6 +83,7 @@ struct hdmi_resources {
   struct clk  *sclk_pixel;
   struct clk  *sclk_hdmiphy;
   struct clk  *hdmiphy;
 + struct clk  *mout_hdmi;
   struct regulator_bulk_data  *regul_bulk;
   int regul_count;
  };
 @@ -1118,7 +1119,7 @@ static void hdmi_v13_mode_apply(struct hdmi_context
 *hdata)
   }
 
   clk_disable_unprepare(hdata-res.sclk_hdmi);
 - clk_set_parent(hdata-res.sclk_hdmi, hdata-res.sclk_hdmiphy);
 + clk_set_parent(hdata-res.mout_hdmi, hdata-res.sclk_hdmiphy);
   clk_prepare_enable(hdata-res.sclk_hdmi);
 
   /* enable HDMI and timing generator */
 @@ -1285,7 +1286,7 @@ static void hdmi_v14_mode_apply(struct hdmi_context
 *hdata)
   }
 
   clk_disable_unprepare(hdata-res.sclk_hdmi);
 - clk_set_parent(hdata-res.sclk_hdmi, hdata-res.sclk_hdmiphy);
 + clk_set_parent(hdata-res.mout_hdmi, hdata-res.sclk_hdmiphy);
   clk_prepare_enable(hdata-res.sclk_hdmi);
 
   /* enable HDMI and timing generator */
 @@ -1311,7 +1312,7 @@ static void hdmiphy_conf_reset(struct hdmi_context
 *hdata)
   u32 reg;
 
   clk_disable_unprepare(hdata-res.sclk_hdmi);
 - clk_set_parent(hdata-res.sclk_hdmi, hdata-res.sclk_pixel);
 + clk_set_parent(hdata-res.mout_hdmi, hdata-res.sclk_pixel);
   clk_prepare_enable(hdata-res.sclk_hdmi);
 
   /* operation mode */
 @@ -1832,8 +1833,13 @@ static int hdmi_resources_init(struct hdmi_context
 *hdata)
   DRM_ERROR(failed to get clock 'hdmiphy'\n);
   goto fail;
   }
 + res-mout_hdmi = devm_clk_get(dev, mout_hdmi);
 + if (IS_ERR(res-mout_hdmi)) {
 + DRM_ERROR(failed to get clock 'mout_hdmi'\n);
 + goto fail;
 + }
 
 - clk_set_parent(res-sclk_hdmi, res-sclk_pixel);
 + clk_set_parent(res-mout_hdmi, res-sclk_pixel);
 
   res-regul_bulk = devm_kzalloc(dev, ARRAY_SIZE(supply) *
   sizeof(res-regul_bulk[0]), GFP_KERNEL);
 --
 1.7.10.4

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 2/4] drm/exynos: add mout_hdmi clock in hdmi driver to change parent

2013-06-11 Thread Rahul Sharma

HDMI driver needs to configure the mout_hdmi mux clock to change
the parent between sclk_hdmiphy and sclk_pixel.

Signed-off-by: Rahul Sharma 
---
 drivers/gpu/drm/exynos/exynos_hdmi.c |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c 
b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 5a98194..3b5e215 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -83,6 +83,7 @@ struct hdmi_resources {
struct clk  *sclk_pixel;
struct clk  *sclk_hdmiphy;
struct clk  *hdmiphy;
+   struct clk  *mout_hdmi;
struct regulator_bulk_data  *regul_bulk;
int regul_count;
 };
@@ -1118,7 +1119,7 @@ static void hdmi_v13_mode_apply(struct hdmi_context 
*hdata)
}

clk_disable_unprepare(hdata->res.sclk_hdmi);
-   clk_set_parent(hdata->res.sclk_hdmi, hdata->res.sclk_hdmiphy);
+   clk_set_parent(hdata->res.mout_hdmi, hdata->res.sclk_hdmiphy);
clk_prepare_enable(hdata->res.sclk_hdmi);

/* enable HDMI and timing generator */
@@ -1285,7 +1286,7 @@ static void hdmi_v14_mode_apply(struct hdmi_context 
*hdata)
}

clk_disable_unprepare(hdata->res.sclk_hdmi);
-   clk_set_parent(hdata->res.sclk_hdmi, hdata->res.sclk_hdmiphy);
+   clk_set_parent(hdata->res.mout_hdmi, hdata->res.sclk_hdmiphy);
clk_prepare_enable(hdata->res.sclk_hdmi);

/* enable HDMI and timing generator */
@@ -1311,7 +1312,7 @@ static void hdmiphy_conf_reset(struct hdmi_context *hdata)
u32 reg;

clk_disable_unprepare(hdata->res.sclk_hdmi);
-   clk_set_parent(hdata->res.sclk_hdmi, hdata->res.sclk_pixel);
+   clk_set_parent(hdata->res.mout_hdmi, hdata->res.sclk_pixel);
clk_prepare_enable(hdata->res.sclk_hdmi);

/* operation mode */
@@ -1832,8 +1833,13 @@ static int hdmi_resources_init(struct hdmi_context 
*hdata)
DRM_ERROR("failed to get clock 'hdmiphy'\n");
goto fail;
}
+   res->mout_hdmi = devm_clk_get(dev, "mout_hdmi");
+   if (IS_ERR(res->mout_hdmi)) {
+   DRM_ERROR("failed to get clock 'mout_hdmi'\n");
+   goto fail;
+   }

-   clk_set_parent(res->sclk_hdmi, res->sclk_pixel);
+   clk_set_parent(res->mout_hdmi, res->sclk_pixel);

res->regul_bulk = devm_kzalloc(dev, ARRAY_SIZE(supply) *
sizeof(res->regul_bulk[0]), GFP_KERNEL);
-- 
1.7.10.4

[PATCH 2/4] drm/exynos: add mout_hdmi clock in hdmi driver to change parent

2013-06-11 Thread Rahul Sharma

HDMI driver needs to configure the mout_hdmi mux clock to change
the parent between sclk_hdmiphy and sclk_pixel.

Signed-off-by: Rahul Sharma rahul.sha...@samsung.com
---
 drivers/gpu/drm/exynos/exynos_hdmi.c |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c 
b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 5a98194..3b5e215 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -83,6 +83,7 @@ struct hdmi_resources {
struct clk  *sclk_pixel;
struct clk  *sclk_hdmiphy;
struct clk  *hdmiphy;
+   struct clk  *mout_hdmi;
struct regulator_bulk_data  *regul_bulk;
int regul_count;
 };
@@ -1118,7 +1119,7 @@ static void hdmi_v13_mode_apply(struct hdmi_context 
*hdata)
}
 
clk_disable_unprepare(hdata-res.sclk_hdmi);
-   clk_set_parent(hdata-res.sclk_hdmi, hdata-res.sclk_hdmiphy);
+   clk_set_parent(hdata-res.mout_hdmi, hdata-res.sclk_hdmiphy);
clk_prepare_enable(hdata-res.sclk_hdmi);
 
/* enable HDMI and timing generator */
@@ -1285,7 +1286,7 @@ static void hdmi_v14_mode_apply(struct hdmi_context 
*hdata)
}
 
clk_disable_unprepare(hdata-res.sclk_hdmi);
-   clk_set_parent(hdata-res.sclk_hdmi, hdata-res.sclk_hdmiphy);
+   clk_set_parent(hdata-res.mout_hdmi, hdata-res.sclk_hdmiphy);
clk_prepare_enable(hdata-res.sclk_hdmi);
 
/* enable HDMI and timing generator */
@@ -1311,7 +1312,7 @@ static void hdmiphy_conf_reset(struct hdmi_context *hdata)
u32 reg;
 
clk_disable_unprepare(hdata-res.sclk_hdmi);
-   clk_set_parent(hdata-res.sclk_hdmi, hdata-res.sclk_pixel);
+   clk_set_parent(hdata-res.mout_hdmi, hdata-res.sclk_pixel);
clk_prepare_enable(hdata-res.sclk_hdmi);
 
/* operation mode */
@@ -1832,8 +1833,13 @@ static int hdmi_resources_init(struct hdmi_context 
*hdata)
DRM_ERROR(failed to get clock 'hdmiphy'\n);
goto fail;
}
+   res-mout_hdmi = devm_clk_get(dev, mout_hdmi);
+   if (IS_ERR(res-mout_hdmi)) {
+   DRM_ERROR(failed to get clock 'mout_hdmi'\n);
+   goto fail;
+   }
 
-   clk_set_parent(res-sclk_hdmi, res-sclk_pixel);
+   clk_set_parent(res-mout_hdmi, res-sclk_pixel);
 
res-regul_bulk = devm_kzalloc(dev, ARRAY_SIZE(supply) *
sizeof(res-regul_bulk[0]), GFP_KERNEL);
-- 
1.7.10.4

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 2/4] drm/exynos: add mout_hdmi clock in hdmi driver to change parent

RE: [PATCH 2/4] drm/exynos: add mout_hdmi clock in hdmi driver to change parent

[PATCH 2/4] drm/exynos: add mout_hdmi clock in hdmi driver to change parent

[PATCH 2/4] drm/exynos: add mout_hdmi clock in hdmi driver to change parent

4 matches

Site Navigation

Mail list logo

Footer information