From: Tomasz Stanislawski <t.stanislaws@samsung.com>
To: devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org, kyungmin.park@samsung.com,
t.figa@samsung.com, kishon@ti.com, sw0312.kim@samsung.com,
inki.dae@samsung.com, rahul.sharma@samsung.com,
kgene.kim@samsung.com, s.nawrocki@samsung.com,
thomas.abraham@linaro.org, mturquette@linaro.org,
Tomasz Stanislawski <t.stanislaws@samsung.com>
Subject: [RFC 06/12] Revert "drm/exynos: add mout_hdmi clock in hdmi driver to change parent"
Date: Mon, 21 Oct 2013 16:18:25 +0200 [thread overview]
Message-ID: <1382365111-6533-7-git-send-email-t.stanislaws@samsung.com> (raw)
In-Reply-To: <1382365111-6533-1-git-send-email-t.stanislaws@samsung.com>
This reverts commit 59956d35a8618235ea715280b49447bb36f2c975.
---
drivers/gpu/drm/exynos/exynos_hdmi.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index a0e10ae..fcfa23a 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -83,7 +83,6 @@ 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;
};
@@ -1113,7 +1112,7 @@ static void hdmi_v13_mode_apply(struct hdmi_context *hdata)
}
clk_disable_unprepare(hdata->res.sclk_hdmi);
- clk_set_parent(hdata->res.mout_hdmi, hdata->res.sclk_hdmiphy);
+ clk_set_parent(hdata->res.sclk_hdmi, hdata->res.sclk_hdmiphy);
clk_prepare_enable(hdata->res.sclk_hdmi);
/* enable HDMI and timing generator */
@@ -1280,7 +1279,7 @@ static void hdmi_v14_mode_apply(struct hdmi_context *hdata)
}
clk_disable_unprepare(hdata->res.sclk_hdmi);
- clk_set_parent(hdata->res.mout_hdmi, hdata->res.sclk_hdmiphy);
+ clk_set_parent(hdata->res.sclk_hdmi, hdata->res.sclk_hdmiphy);
clk_prepare_enable(hdata->res.sclk_hdmi);
/* enable HDMI and timing generator */
@@ -1306,7 +1305,7 @@ static void hdmiphy_conf_reset(struct hdmi_context *hdata)
u32 reg;
clk_disable_unprepare(hdata->res.sclk_hdmi);
- clk_set_parent(hdata->res.mout_hdmi, hdata->res.sclk_pixel);
+ clk_set_parent(hdata->res.sclk_hdmi, hdata->res.sclk_pixel);
clk_prepare_enable(hdata->res.sclk_hdmi);
/* operation mode */
@@ -1815,13 +1814,8 @@ 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->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);
--
1.7.9.5
next prev parent reply other threads:[~2013-10-21 14:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-21 14:18 [RFC 00/12] Add DRM Exynos HDMI on SoCs from Exynos4 family Tomasz Stanislawski
2013-10-21 14:18 ` [RFC 01/12] clk: propagate parent change up one level Tomasz Stanislawski
2013-10-21 14:18 ` [RFC 02/12] clk: exynos4: export sclk_hdmiphy clock Tomasz Stanislawski
2013-10-21 14:18 ` [RFC 03/12] clk: exynos4: enable clk_set_parent() propagation for sclk_hdmi and sclk_mixer clocks Tomasz Stanislawski
2013-10-21 14:18 ` [RFC 04/12] phy: Add simple-phy driver Tomasz Stanislawski
2013-10-24 15:52 ` Kishon Vijay Abraham I
2013-10-25 7:51 ` Tomasz Stanislawski
2013-11-04 7:08 ` Kishon Vijay Abraham I
2013-10-21 14:18 ` [RFC 05/12] phy: use of_phy_simple_xlate for NULL xlate function Tomasz Stanislawski
2013-10-24 15:33 ` Kishon Vijay Abraham I
2013-10-21 14:18 ` Tomasz Stanislawski [this message]
2013-10-21 14:18 ` [RFC 07/12] drm: exynos: hdmi: use hdmiphy as PHY Tomasz Stanislawski
2013-10-21 14:18 ` [RFC 08/12] drm: exynos: hdmi: simplify extracting hpd-gpio from DT Tomasz Stanislawski
2013-10-21 14:18 ` [RFC 09/12] drm: exynos: add compatibles for HDMI and Mixer chips and exynos4210 SoC Tomasz Stanislawski
2013-10-21 14:18 ` [RFC 10/12] arm: dts: exynos4: add i2c controller for HDMIPHY Tomasz Stanislawski
2013-10-21 14:18 ` [RFC 11/12] arm: dts: exynos4: add HDMI devices Tomasz Stanislawski
2013-10-21 14:18 ` [RFC 12/12] arm: dts: universal_c210: " Tomasz Stanislawski
2013-10-28 13:42 ` [RFC 00/12] Add DRM Exynos HDMI on SoCs from Exynos4 family Inki Dae
2013-10-28 16:00 ` Kukjin Kim
2013-10-28 17:19 ` Inki Dae
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=1382365111-6533-7-git-send-email-t.stanislaws@samsung.com \
--to=t.stanislaws@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=inki.dae@samsung.com \
--cc=kgene.kim@samsung.com \
--cc=kishon@ti.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=rahul.sharma@samsung.com \
--cc=s.nawrocki@samsung.com \
--cc=sw0312.kim@samsung.com \
--cc=t.figa@samsung.com \
--cc=thomas.abraham@linaro.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox