| Message ID | 1404202211-15788-2-git-send-email-m.szyprowski@samsung.com |
|---|---|
| State | New |
| Headers | show |
Hello Marek, I think this particular clock setup should already be handled by this patch: http://www.spinics.net/lists/arm-kernel/msg320013.html Or am I missing something here? With best wishes, Tobias Marek Szyprowski wrote: > This patch adds support for exporting mout_hdmi and mout_mixer to device > tree. Access to those clocks is required to correctly setup HDMI module > on Exynos 4210 and 4x12 SoCs. > > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > CC: Mike Turquette <mturquette@linaro.org> > CC: Tomasz Figa <t.figa@samsung.com> > --- > drivers/clk/samsung/clk-exynos4.c | 4 ++-- > include/dt-bindings/clock/exynos4.h | 2 ++ > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c > index 4f150c9dd38c..a30a779869eb 100644 > --- a/drivers/clk/samsung/clk-exynos4.c > +++ b/drivers/clk/samsung/clk-exynos4.c > @@ -440,7 +440,7 @@ static struct samsung_fixed_rate_clock exynos4210_fixed_rate_clks[] __initdata = > static struct samsung_mux_clock exynos4_mux_clks[] __initdata = { > MUX_FA(CLK_MOUT_APLL, "mout_apll", mout_apll_p, SRC_CPU, 0, 1, > CLK_SET_RATE_PARENT, 0, "mout_apll"), > - MUX(0, "mout_hdmi", mout_hdmi_p, SRC_TV, 0, 1), > + MUX(CLK_MOUT_HDMI, "mout_hdmi", mout_hdmi_p, SRC_TV, 0, 1), > MUX(0, "mout_mfc1", sclk_evpll_p, SRC_MFC, 4, 1), > MUX(0, "mout_mfc", mout_mfc_p, SRC_MFC, 8, 1), > MUX_F(CLK_MOUT_G3D1, "mout_g3d1", sclk_evpll_p, SRC_G3D, 4, 1, > @@ -463,7 +463,7 @@ static struct samsung_mux_clock exynos4210_mux_clks[] __initdata = { > MUX(0, "mout_aclk100", sclk_ampll_p4210, SRC_TOP0, 16, 1), > MUX(0, "mout_aclk160", sclk_ampll_p4210, SRC_TOP0, 20, 1), > MUX(0, "mout_aclk133", sclk_ampll_p4210, SRC_TOP0, 24, 1), > - MUX(0, "mout_mixer", mout_mixer_p4210, SRC_TV, 4, 1), > + MUX(CLK_MOUT_MIXER, "mout_mixer", mout_mixer_p4210, SRC_TV, 4, 1), > MUX(0, "mout_dac", mout_dac_p4210, SRC_TV, 8, 1), > MUX(0, "mout_g2d0", sclk_ampll_p4210, E4210_SRC_IMAGE, 0, 1), > MUX(0, "mout_g2d1", sclk_evpll_p, E4210_SRC_IMAGE, 4, 1), > diff --git a/include/dt-bindings/clock/exynos4.h b/include/dt-bindings/clock/exynos4.h > index 1106ca540a96..5bfb3509ee3c 100644 > --- a/include/dt-bindings/clock/exynos4.h > +++ b/include/dt-bindings/clock/exynos4.h > @@ -229,6 +229,8 @@ > #define CLK_MOUT_G3D1 393 > #define CLK_MOUT_G3D 394 > #define CLK_ACLK400_MCUISP 395 /* Exynos4x12 only */ > +#define CLK_MOUT_HDMI 396 > +#define CLK_MOUT_MIXER 397 > > /* div clocks */ > #define CLK_DIV_ISP0 450 /* Exynos4x12 only */ > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello, On 2014-07-01 10:46, Tobias Jakobi wrote: > Hello Marek, > > I think this particular clock setup should already be handled by this patch: > http://www.spinics.net/lists/arm-kernel/msg320013.html > > Or am I missing something here? The patch you have pointed requires adding support for SET_PARENT_PARENT feature to clock core, which has not been accepted yet. Only then Exynod DRM drivers can be updated to correctly handle the changed clock tree. My approach is to introduce minimal changes and use the code which is already in the exynos drm/hdmi driver (it already manages 'mout_hdmi/mixer' clocks). If other solution is finally accepted, the code can be simplified and mout_hdmi/mixer clocks simply ignored. For now - my changes are needed to get HDMI output working and have least dependencies. Best regards
Hi, Marek Szyprowski wrote: > Hello, > > On 2014-07-01 10:46, Tobias Jakobi wrote: >> Hello Marek, >> >> I think this particular clock setup should already be handled by this >> patch: >> http://www.spinics.net/lists/arm-kernel/msg320013.html >> >> Or am I missing something here? > > The patch you have pointed requires adding support for SET_PARENT_PARENT > feature to clock core, which has not been accepted yet. Only then Exynod > DRM drivers can be updated to correctly handle the changed clock tree. I'm aware of this, but my point is: Wouldn't it be better to get the SET_PARENT_PARENT upstream instead of applying a work-around (I am assuming of course that SET_PARENT_PARENT is the correct way of handling these clocks), which would be reverted later anyway? Also this looks like similar to the work duplication issue that was raised before here on the ml. Different groups working on the same thing, but with no or little coordination between them. Might be just me though... > My approach is to introduce minimal changes and use the code which is > already in the exynos drm/hdmi driver (it already manages 'mout_hdmi/mixer' > clocks). If other solution is finally accepted, the code can be simplified > and mout_hdmi/mixer clocks simply ignored. For now - my changes are needed > to get HDMI output working and have least dependencies. > > Best regards With best wishes, Tobias -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c index 4f150c9dd38c..a30a779869eb 100644 --- a/drivers/clk/samsung/clk-exynos4.c +++ b/drivers/clk/samsung/clk-exynos4.c @@ -440,7 +440,7 @@ static struct samsung_fixed_rate_clock exynos4210_fixed_rate_clks[] __initdata = static struct samsung_mux_clock exynos4_mux_clks[] __initdata = { MUX_FA(CLK_MOUT_APLL, "mout_apll", mout_apll_p, SRC_CPU, 0, 1, CLK_SET_RATE_PARENT, 0, "mout_apll"), - MUX(0, "mout_hdmi", mout_hdmi_p, SRC_TV, 0, 1), + MUX(CLK_MOUT_HDMI, "mout_hdmi", mout_hdmi_p, SRC_TV, 0, 1), MUX(0, "mout_mfc1", sclk_evpll_p, SRC_MFC, 4, 1), MUX(0, "mout_mfc", mout_mfc_p, SRC_MFC, 8, 1), MUX_F(CLK_MOUT_G3D1, "mout_g3d1", sclk_evpll_p, SRC_G3D, 4, 1, @@ -463,7 +463,7 @@ static struct samsung_mux_clock exynos4210_mux_clks[] __initdata = { MUX(0, "mout_aclk100", sclk_ampll_p4210, SRC_TOP0, 16, 1), MUX(0, "mout_aclk160", sclk_ampll_p4210, SRC_TOP0, 20, 1), MUX(0, "mout_aclk133", sclk_ampll_p4210, SRC_TOP0, 24, 1), - MUX(0, "mout_mixer", mout_mixer_p4210, SRC_TV, 4, 1), + MUX(CLK_MOUT_MIXER, "mout_mixer", mout_mixer_p4210, SRC_TV, 4, 1), MUX(0, "mout_dac", mout_dac_p4210, SRC_TV, 8, 1), MUX(0, "mout_g2d0", sclk_ampll_p4210, E4210_SRC_IMAGE, 0, 1), MUX(0, "mout_g2d1", sclk_evpll_p, E4210_SRC_IMAGE, 4, 1), diff --git a/include/dt-bindings/clock/exynos4.h b/include/dt-bindings/clock/exynos4.h index 1106ca540a96..5bfb3509ee3c 100644 --- a/include/dt-bindings/clock/exynos4.h +++ b/include/dt-bindings/clock/exynos4.h @@ -229,6 +229,8 @@ #define CLK_MOUT_G3D1 393 #define CLK_MOUT_G3D 394 #define CLK_ACLK400_MCUISP 395 /* Exynos4x12 only */ +#define CLK_MOUT_HDMI 396 +#define CLK_MOUT_MIXER 397 /* div clocks */ #define CLK_DIV_ISP0 450 /* Exynos4x12 only */
This patch adds support for exporting mout_hdmi and mout_mixer to device tree. Access to those clocks is required to correctly setup HDMI module on Exynos 4210 and 4x12 SoCs. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> CC: Mike Turquette <mturquette@linaro.org> CC: Tomasz Figa <t.figa@samsung.com> --- drivers/clk/samsung/clk-exynos4.c | 4 ++-- include/dt-bindings/clock/exynos4.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)