diff options
| author | Rahul Sharma <rahul.sharma@samsung.com> | 2013-05-10 11:30:46 +0530 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-07-17 22:47:29 +0400 |
| commit | aa3177677fc0898f338f32dda59873bc8dcf042d (patch) | |
| tree | 2d095bc600574a4810ba7f3280d0f51c8506fdf2 | |
| parent | e6849d30485f942d631ab57fdd3116ecd45b769b (diff) | |
drm/exynos: add mout_hdmi clock in hdmi driver to change parent
Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_hdmi.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 78e5a7aa0421..51eef6c54a83 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -83,7 +83,7 @@ struct hdmi_resources { struct clk *sclk_hdmi; struct clk *sclk_pixel; struct clk *sclk_hdmiphy; - struct clk *hdmiphy; + struct clk *mout_hdmi; struct regulator_bulk_data *regul_bulk; int regul_count; }; @@ -1129,7 +1129,7 @@ static void hdmi_v13_timing_apply(struct hdmi_context *hdata) } clk_disable(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_enable(hdata->res.sclk_hdmi); /* enable HDMI and timing generator */ @@ -1296,7 +1296,7 @@ static void hdmi_v14_timing_apply(struct hdmi_context *hdata) } clk_disable(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_enable(hdata->res.sclk_hdmi); /* enable HDMI and timing generator */ @@ -1322,7 +1322,7 @@ static void hdmiphy_conf_reset(struct hdmi_context *hdata) u32 reg; clk_disable(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_enable(hdata->res.sclk_hdmi); /* operation mode */ @@ -1839,6 +1839,11 @@ static int hdmi_resources_init(struct hdmi_context *hdata) DRM_ERROR("failed to get clock 'sclk_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; + } res->regul_bulk = devm_kzalloc(dev, ARRAY_SIZE(supply) * sizeof(res->regul_bulk[0]), GFP_KERNEL); @@ -1862,7 +1867,7 @@ static int hdmi_resources_init(struct hdmi_context *hdata) clk_prepare(res->sclk_pixel); clk_prepare(res->sclk_hdmiphy); - clk_set_parent(res->sclk_hdmi, res->sclk_pixel); + clk_set_parent(res->mout_hdmi, res->sclk_pixel); return 0; fail: |