| Message ID | 1397485240-29163-1-git-send-email-p.zabel@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
On Mon, Apr 14, 2014 at 04:20:39PM +0200, Philipp Zabel wrote: > From: Sascha Hauer <s.hauer@pengutronix.de> > > Route the video PLL to the display interface clocks via the di_pre_sel > and di_sel muxes by default. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Applied both, thanks.
On 14.04.2014 16:20, Philipp Zabel wrote: > From: Sascha Hauer <s.hauer@pengutronix.de> > > Route the video PLL to the display interface clocks via the di_pre_sel > and di_sel muxes by default. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > --- > arch/arm/mach-imx/clk-imx6q.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c > index a3a69ab..ba17299 100644 > --- a/arch/arm/mach-imx/clk-imx6q.c > +++ b/arch/arm/mach-imx/clk-imx6q.c > @@ -445,6 +445,15 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) > clk_set_parent(clk[ldb_di1_sel], clk[pll5_video_div]); > } > > + clk_set_parent(clk[ipu1_di0_pre_sel], clk[pll5_video_div]); > + clk_set_parent(clk[ipu1_di1_pre_sel], clk[pll5_video_div]); > + clk_set_parent(clk[ipu2_di0_pre_sel], clk[pll5_video_div]); > + clk_set_parent(clk[ipu2_di1_pre_sel], clk[pll5_video_div]); > + clk_set_parent(clk[ipu1_di0_sel], clk[ipu1_di0_pre]); > + clk_set_parent(clk[ipu1_di1_sel], clk[ipu1_di1_pre]); > + clk_set_parent(clk[ipu2_di0_sel], clk[ipu2_di0_pre]); > + clk_set_parent(clk[ipu2_di1_sel], clk[ipu2_di1_pre]); > + > /* > * The gpmi needs 100MHz frequency in the EDO/Sync mode, > * We can not get the 100MHz from the pll2_pfd0_352m. I'm no expert on this, so just a question from an internal review: With this, having both ldb_di0_sel and ipu1_di0_sel driven by pll5_video, what will happen if both lvds and hdmi are trying to set the rate of pll5_video_div? Best regards Dirk
Am Mittwoch, den 23.04.2014, 09:55 +0200 schrieb Dirk Behme: > On 14.04.2014 16:20, Philipp Zabel wrote: > > From: Sascha Hauer <s.hauer@pengutronix.de> > > > > Route the video PLL to the display interface clocks via the di_pre_sel > > and di_sel muxes by default. > > > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > > --- > > arch/arm/mach-imx/clk-imx6q.c | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c > > index a3a69ab..ba17299 100644 > > --- a/arch/arm/mach-imx/clk-imx6q.c > > +++ b/arch/arm/mach-imx/clk-imx6q.c > > @@ -445,6 +445,15 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) > > clk_set_parent(clk[ldb_di1_sel], clk[pll5_video_div]); > > } > > > > + clk_set_parent(clk[ipu1_di0_pre_sel], clk[pll5_video_div]); > > + clk_set_parent(clk[ipu1_di1_pre_sel], clk[pll5_video_div]); > > + clk_set_parent(clk[ipu2_di0_pre_sel], clk[pll5_video_div]); > > + clk_set_parent(clk[ipu2_di1_pre_sel], clk[pll5_video_div]); > > + clk_set_parent(clk[ipu1_di0_sel], clk[ipu1_di0_pre]); > > + clk_set_parent(clk[ipu1_di1_sel], clk[ipu1_di1_pre]); > > + clk_set_parent(clk[ipu2_di0_sel], clk[ipu2_di0_pre]); > > + clk_set_parent(clk[ipu2_di1_sel], clk[ipu2_di1_pre]); > > + > > /* > > * The gpmi needs 100MHz frequency in the EDO/Sync mode, > > * We can not get the 100MHz from the pll2_pfd0_352m. > > I'm no expert on this, so just a question from an internal review: > > With this, having both ldb_di0_sel and ipu1_di0_sel driven by > pll5_video, what will happen if both lvds and hdmi are trying to set the > rate of pll5_video_div? > Last one that comes around wins. We could change this to use clock notifiers, but it doesn't make much sense right now, as this would just change the situation to first one wins. What we really need is some kind of clock negotiation, but there isn't anything in the clock framework yet to make this happen. We have some ideas about this, but it will take a little while. In the meanwhile this patch improves the situation for people using the driver with one LVDS or HDMI display. Regards, Lucas
On Wed, Apr 23, 2014 at 09:55:47AM +0200, Dirk Behme wrote: > On 14.04.2014 16:20, Philipp Zabel wrote: > >From: Sascha Hauer <s.hauer@pengutronix.de> > > > >Route the video PLL to the display interface clocks via the di_pre_sel > >and di_sel muxes by default. > > > >Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > >Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > >--- > > arch/arm/mach-imx/clk-imx6q.c | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > >diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c > >index a3a69ab..ba17299 100644 > >--- a/arch/arm/mach-imx/clk-imx6q.c > >+++ b/arch/arm/mach-imx/clk-imx6q.c > >@@ -445,6 +445,15 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) > > clk_set_parent(clk[ldb_di1_sel], clk[pll5_video_div]); > > } > > > >+ clk_set_parent(clk[ipu1_di0_pre_sel], clk[pll5_video_div]); > >+ clk_set_parent(clk[ipu1_di1_pre_sel], clk[pll5_video_div]); > >+ clk_set_parent(clk[ipu2_di0_pre_sel], clk[pll5_video_div]); > >+ clk_set_parent(clk[ipu2_di1_pre_sel], clk[pll5_video_div]); > >+ clk_set_parent(clk[ipu1_di0_sel], clk[ipu1_di0_pre]); > >+ clk_set_parent(clk[ipu1_di1_sel], clk[ipu1_di1_pre]); > >+ clk_set_parent(clk[ipu2_di0_sel], clk[ipu2_di0_pre]); > >+ clk_set_parent(clk[ipu2_di1_sel], clk[ipu2_di1_pre]); > >+ > > /* > > * The gpmi needs 100MHz frequency in the EDO/Sync mode, > > * We can not get the 100MHz from the pll2_pfd0_352m. > > I'm no expert on this, so just a question from an internal review: > > With this, having both ldb_di0_sel and ipu1_di0_sel driven by > pll5_video, what will happen if both lvds and hdmi are trying to set > the rate of pll5_video_div? It's indeed a good question. Very likely, one or the other will be broken, depending which one calls clk_set_rate() first. The one calling clk_set_rate() later will work fine. It's a result of that there is no negotiation between rate change requests from different clients on the same clock. Such negotiation can be done with clk rate change notifier. It will make these client driver quite complex on clk set rate operation though. Also, if none of the possible rate of the source clock can meet the different requests from these clients at the same time, we're stuck anyway. That said, for now we have limitation to support both lvds and hdmi. Shawn
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index a3a69ab..ba17299 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -445,6 +445,15 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) clk_set_parent(clk[ldb_di1_sel], clk[pll5_video_div]); } + clk_set_parent(clk[ipu1_di0_pre_sel], clk[pll5_video_div]); + clk_set_parent(clk[ipu1_di1_pre_sel], clk[pll5_video_div]); + clk_set_parent(clk[ipu2_di0_pre_sel], clk[pll5_video_div]); + clk_set_parent(clk[ipu2_di1_pre_sel], clk[pll5_video_div]); + clk_set_parent(clk[ipu1_di0_sel], clk[ipu1_di0_pre]); + clk_set_parent(clk[ipu1_di1_sel], clk[ipu1_di1_pre]); + clk_set_parent(clk[ipu2_di0_sel], clk[ipu2_di0_pre]); + clk_set_parent(clk[ipu2_di1_sel], clk[ipu2_di1_pre]); + /* * The gpmi needs 100MHz frequency in the EDO/Sync mode, * We can not get the 100MHz from the pll2_pfd0_352m.