summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Stanislawski <t.stanislaws@samsung.com>2014-04-30 08:26:31 (GMT)
committerMarek Szyprowski <m.szyprowski@samsung.com>2014-05-15 05:29:13 (GMT)
commit6696209924878765fff4799755139cce9f0582e6 (patch)
treeceedec2cd2a6be24a4bdefb8d282c1001a47110f
parent31a5362ddda8a76984e3c81673d080e61f60724a (diff)
downloadlinux-3.10-6696209924878765fff4799755139cce9f0582e6.zip
linux-3.10-6696209924878765fff4799755139cce9f0582e6.tar.gz
linux-3.10-6696209924878765fff4799755139cce9f0582e6.tar.bz2
Revert "drm/exynos: add mout_hdmi clock in hdmi driver to change parent"
Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r--drivers/gpu/drm/exynos/exynos_hdmi.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 62ea017..098182a 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -87,7 +87,6 @@ struct hdmi_resources {
struct clk *sclk_pixel;
struct clk *sclk_hdmiphy;
struct phy *hdmiphy;
- struct clk *mout_hdmi;
struct regulator_bulk_data *regul_bulk;
int regul_count;
};
@@ -1982,13 +1981,8 @@ static int hdmi_resources_init(struct hdmi_context *hdata)
DRM_ERROR("failed to get phy '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->mout_hdmi, res->sclk_pixel);
+ clk_set_parent(res->sclk_hdmi, res->sclk_pixel);
res->regul_bulk = devm_kzalloc(dev, ARRAY_SIZE(supply) *
sizeof(res->regul_bulk[0]), GFP_KERNEL);