Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1247654
| From | Tomeu Vizoso <tomeu.vizoso@collabora.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 1/2] clk: samsung: exynos5250: Add DISP1 clocks |
| Date | 2015-10-15 12:40 +0200 |
| Message-ID | <qjO70-3Ld-19@gated-at.bofh.it> (permalink) |
| References | <qjO70-3Ld-11@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
When the DISP1 power domain is powered off, there's two clocks that need
to be temporarily reparented to OSC, and back to their original parents
when the domain is powered on again.
We expose these two clocks in the DT bindings so that the DT node of the
power domain can reference them.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
---
Changes in v2:
- Reuse mout_aclk200_p
- Rename div_aclk300 as div_aclk300_disp
drivers/clk/samsung/clk-exynos5250.c | 14 +++++++++++++-
include/dt-bindings/clock/exynos5250.h | 4 +++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c
index 55b83c7ef878..5bebf8cb0d70 100644
--- a/drivers/clk/samsung/clk-exynos5250.c
+++ b/drivers/clk/samsung/clk-exynos5250.c
@@ -222,9 +222,13 @@ PNAME(mout_mpll_user_p) = { "fin_pll", "mout_mpll" };
PNAME(mout_bpll_user_p) = { "fin_pll", "mout_bpll" };
PNAME(mout_aclk166_p) = { "mout_cpll", "mout_mpll_user" };
PNAME(mout_aclk200_p) = { "mout_mpll_user", "mout_bpll_user" };
+PNAME(mout_aclk300_p) = { "mout_aclk300_disp1_mid",
+ "mout_aclk300_disp1_mid1" };
PNAME(mout_aclk400_p) = { "mout_aclk400_g3d_mid", "mout_gpll" };
PNAME(mout_aclk200_sub_p) = { "fin_pll", "div_aclk200" };
PNAME(mout_aclk266_sub_p) = { "fin_pll", "div_aclk266" };
+PNAME(mout_aclk300_sub_p) = { "fin_pll", "div_aclk300_disp" };
+PNAME(mout_aclk300_disp1_mid1_p) = { "mout_vpll", "mout_cpll" };
PNAME(mout_aclk333_sub_p) = { "fin_pll", "div_aclk333" };
PNAME(mout_aclk400_isp_sub_p) = { "fin_pll", "div_aclk400_isp" };
PNAME(mout_hdmi_p) = { "div_hdmi_pixel", "sclk_hdmiphy" };
@@ -303,9 +307,13 @@ static struct samsung_mux_clock exynos5250_mux_clks[] __initdata = {
*/
MUX(0, "mout_aclk166", mout_aclk166_p, SRC_TOP0, 8, 1),
MUX(0, "mout_aclk200", mout_aclk200_p, SRC_TOP0, 12, 1),
+ MUX(0, "mout_aclk300_disp1_mid", mout_aclk200_p, SRC_TOP0, 14, 1),
+ MUX(0, "mout_aclk300", mout_aclk300_p, SRC_TOP0, 15, 1),
MUX(0, "mout_aclk333", mout_aclk166_p, SRC_TOP0, 16, 1),
MUX(0, "mout_aclk400_g3d_mid", mout_aclk200_p, SRC_TOP0, 20, 1),
+ MUX(0, "mout_aclk300_disp1_mid1", mout_aclk300_disp1_mid1_p, SRC_TOP1,
+ 8, 1),
MUX(0, "mout_aclk400_isp", mout_aclk200_p, SRC_TOP1, 24, 1),
MUX(0, "mout_aclk400_g3d", mout_aclk400_p, SRC_TOP1, 28, 1),
@@ -316,7 +324,10 @@ static struct samsung_mux_clock exynos5250_mux_clks[] __initdata = {
MUX(0, "mout_bpll_user", mout_bpll_user_p, SRC_TOP2, 24, 1),
MUX(CLK_MOUT_GPLL, "mout_gpll", mout_gpll_p, SRC_TOP2, 28, 1),
- MUX(0, "mout_aclk200_disp1_sub", mout_aclk200_sub_p, SRC_TOP3, 4, 1),
+ MUX(CLK_MOUT_ACLK200_DISP1_SUB, "mout_aclk200_disp1_sub",
+ mout_aclk200_sub_p, SRC_TOP3, 4, 1),
+ MUX(CLK_MOUT_ACLK300_DISP1_SUB, "mout_aclk300_disp1_sub",
+ mout_aclk300_sub_p, SRC_TOP3, 6, 1),
MUX(0, "mout_aclk266_gscl_sub", mout_aclk266_sub_p, SRC_TOP3, 8, 1),
MUX(0, "mout_aclk_266_isp_sub", mout_aclk266_sub_p, SRC_TOP3, 16, 1),
MUX(0, "mout_aclk_400_isp_sub", mout_aclk400_isp_sub_p,
@@ -392,6 +403,7 @@ static struct samsung_div_clock exynos5250_div_clks[] __initdata = {
DIV(0, "div_aclk333", "mout_aclk333", DIV_TOP0, 20, 3),
DIV(0, "div_aclk400_g3d", "mout_aclk400_g3d", DIV_TOP0,
24, 3),
+ DIV(0, "div_aclk300_disp", "mout_aclk300", DIV_TOP0, 28, 3),
DIV(0, "div_aclk400_isp", "mout_aclk400_isp", DIV_TOP1, 20, 3),
DIV(0, "div_aclk66_pre", "mout_mpll_user", DIV_TOP1, 24, 3),
diff --git a/include/dt-bindings/clock/exynos5250.h b/include/dt-bindings/clock/exynos5250.h
index 8183d1c237d9..15508adcdfde 100644
--- a/include/dt-bindings/clock/exynos5250.h
+++ b/include/dt-bindings/clock/exynos5250.h
@@ -173,8 +173,10 @@
/* mux clocks */
#define CLK_MOUT_HDMI 1024
#define CLK_MOUT_GPLL 1025
+#define CLK_MOUT_ACLK200_DISP1_SUB 1026
+#define CLK_MOUT_ACLK300_DISP1_SUB 1027
/* must be greater than maximal clock id */
-#define CLK_NR_CLKS 1026
+#define CLK_NR_CLKS 1028
#endif /* _DT_BINDINGS_CLOCK_EXYNOS_5250_H */
--
2.5.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 0/2] Fix display on second resume on 5250-snow Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2015-10-15 12:40 +0200
[PATCH v2 1/2] clk: samsung: exynos5250: Add DISP1 clocks Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2015-10-15 12:40 +0200
Re: [PATCH v2 1/2] clk: samsung: exynos5250: Add DISP1 clocks Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-10-16 01:50 +0200
Re: [PATCH v2 1/2] clk: samsung: exynos5250: Add DISP1 clocks Michael Turquette <mturquette@baylibre.com> - 2015-10-16 14:50 +0200
Re: [PATCH v2 1/2] clk: samsung: exynos5250: Add DISP1 clocks Stephen Boyd <sboyd@codeaurora.org> - 2015-10-16 19:30 +0200
Re: [PATCH v2 1/2] clk: samsung: exynos5250: Add DISP1 clocks Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2015-10-16 21:00 +0200
Re: [PATCH v2 1/2] clk: samsung: exynos5250: Add DISP1 clocks Kukjin Kim <kgene@kernel.org> - 2015-10-17 01:50 +0200
Re: [PATCH v2 1/2] clk: samsung: exynos5250: Add DISP1 clocks Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-10-17 11:00 +0200
Re: [PATCH v2 1/2] clk: samsung: exynos5250: Add DISP1 clocks Javier Martinez Canillas <javier@osg.samsung.com> - 2015-10-17 12:00 +0200
Re: [PATCH v2 1/2] clk: samsung: exynos5250: Add DISP1 clocks Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-10-17 12:10 +0200
[PATCH v2 2/2] ARM: dts: exynos5250: Add clocks to DISP1 domain Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2015-10-15 12:40 +0200
Re: [PATCH v2 2/2] ARM: dts: exynos5250: Add clocks to DISP1 domain Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-10-16 01:50 +0200
Re: [PATCH v2 2/2] ARM: dts: exynos5250: Add clocks to DISP1 domain Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2015-10-16 10:20 +0200
csiph-web