diff mbox

OMAP: clock DT conversion issues with omap36xx

Message ID 1391767923.4937.110.camel@mars (mailing list archive)
State New, archived
Headers show

Commit Message

Christoph Fritz Feb. 7, 2014, 10:12 a.m. UTC
On Tue, 2014-02-04 at 17:50 +0200, Tero Kristo wrote:
> On 01/29/2014 01:21 PM, Christoph Fritz wrote:
> >> Currently I only analyzed sys_clkout2 (see attachments for full
> >> clk_summary files):
> >>
> >> clk_summary__next-20140115__works_as_expected:
> >>               dpll4_m2_ck        1           1            96000000
> >>                  dpll4_m2x2_ck   1           1            96000000
> >>                     omap_192m_alwon_fck 1           1            96000000
> >>                        omap_96m_alwon_fck 1           2            96000000
> >>                           per_96m_fck 0           6            96000000
> >>                              mcbsp4_fck 0           1            96000000
> >>                              mcbsp3_fck 0           2            96000000
> >>                              mcbsp2_fck 0           2            96000000
> >>                           cm_96m_fck 2           3            96000000
> >>                              clkout2_src_ck 1           1            96000000
> >>                                 sys_clkout2 1           1            24000000
> >>
> >> For real, on pin sys_clkout2 are correctly 24 Mhz measured.
> >>
> >> clk_summary__next-20140124__sysclkout2_dss_fails:
> >>               dpll4_m2_ck        1           1            96000000
> >>                  dpll4_m2x2_mul_ck 1           1            192000000
> >>                     dpll4_m2x2_ck 1           1            192000000
> >>                        omap_192m_alwon_fck 0           0            192000000
> >>                        omap_96m_alwon_fck 1           2            192000000
> >>                           per_96m_fck 0           6            192000000
> >>                              mcbsp4_fck 0           1            192000000
> >>                              mcbsp3_fck 0           2            192000000
> >>                              mcbsp2_fck 0           2            192000000
> >>                           cm_96m_fck 2           3            192000000
> >>                              clkout2_src_ck 1           1            192000000
> >>                                 sys_clkout2 1           1            24000000
> >>
> >> For real, on pin sys_clkout2 are only ~12 Mhz measured.
> 
> Hey Christoph,
> 
> I had a chance to look at this in more detail, and it looks like your 
> patch above was almost the correct one (except that I think you modified 
> wrong property and also modified the clock node for all omap3 variants.) 
> Can you give this one a shot? Can you also send me the clk-summary dump 
> with this patch (with the relevant nodes)?

             dpll4_m2_ck        1           1            96000000   0
                dpll4_m2x2_mul_ck 1           1            192000000  0
                   dpll4_m2x2_ck 1           1            192000000  0
                      omap_192m_alwon_fck 0           0            192000000  0
                      omap_96m_alwon_fck 1           2            96000000   0
                         per_96m_fck 0           6            96000000   0
                            mcbsp4_fck 0           1            96000000   0
                            mcbsp3_fck 0           2            96000000   0
                            mcbsp2_fck 0           2            96000000   0
                         cm_96m_fck 2           3            96000000   0
                            clkout2_src_ck 1           1            96000000   0
                               sys_clkout2 1           1            24000000   0

Yes, your patch fixes the issues for sys_clkout2. Thanks! If you want,
you can add my:
Tested-by: Christoph Fritz <chf.fritz@googlemail.com>

Below is my clock fix for dss:

From b90a62128068e1b6b0ba2a11c5cc0c8e587cf301 Mon Sep 17 00:00:00 2001
From: Christoph Fritz <chf.fritz@googlemail.com>
Date: Fri, 7 Feb 2014 10:51:15 +0100
Subject: [PATCH] ARM: dts: omap36xx: fix dpll4_m4_ck tree

OMAP36xx has different hardware implementation for the dpll4_m4_ck tree
compared to other OMAP3 variants. Reflect this properly in the dts file.

before omap dt clock conversion:
             dpll4_m4_ck        1           1            57600000
                dpll4_m4x2_ck   1           1            57600000
                   dss1_alwon_fck_3430es2 2           4            57600000

after omap dt clock conversion:
             dpll4_m4_ck        0           1            96000000   0
                dpll4_m4x2_mul_ck 0           1            192000000  0
                   dpll4_m4x2_ck 0           1            192000000  0
                      dss1_alwon_fck_3430es2 0           4            192000000  0
with this patch:
             dpll4_m4_ck        1           1            57600000   0
                dss1_alwon_fck_3430es2 2           4            57600000   0
                dpll4_m4x2_mul_ck 0           0            115200000  0
                   dpll4_m4x2_ck 0           0            115200000  0

Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
---
 arch/arm/boot/dts/omap36xx-clocks.dtsi |    8 ++++++++
 arch/arm/boot/dts/omap36xx.dtsi        |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

Comments

Tomi Valkeinen Feb. 7, 2014, 1:49 p.m. UTC | #1
Hi,

On 07/02/14 12:12, Christoph Fritz wrote:

> Yes, your patch fixes the issues for sys_clkout2. Thanks! If you want,
> you can add my:
> Tested-by: Christoph Fritz <chf.fritz@googlemail.com>
> 
> Below is my clock fix for dss:
> 
> From b90a62128068e1b6b0ba2a11c5cc0c8e587cf301 Mon Sep 17 00:00:00 2001
> From: Christoph Fritz <chf.fritz@googlemail.com>
> Date: Fri, 7 Feb 2014 10:51:15 +0100
> Subject: [PATCH] ARM: dts: omap36xx: fix dpll4_m4_ck tree
> 
> OMAP36xx has different hardware implementation for the dpll4_m4_ck tree
> compared to other OMAP3 variants. Reflect this properly in the dts file.

I rebased the DSS DT branch on top of v3.14-rc1, and I'm trying to get
beagle-xM working. Pinmuxing was wrong, but after fixing that, the
clk_set_rate for dss fclk failed. I applied Tero's and your patches, but
now when starting omapdss I see:

[   19.704193] omap clock: module associated with clock
dss1_alwon_fck_3430es2 didn't enable in 1000
00 tries

I wonder if I'm still missing some patch?

 Tomi
Christoph Fritz Feb. 10, 2014, 8:54 p.m. UTC | #2
On Fri, 2014-02-07 at 15:49 +0200, Tomi Valkeinen wrote:
> On 07/02/14 12:12, Christoph Fritz wrote:
> 
> > Yes, your patch fixes the issues for sys_clkout2. Thanks! If you want,
> > you can add my:
> > Tested-by: Christoph Fritz <chf.fritz@googlemail.com>
> > 
> > Below is my clock fix for dss:
> > 
> > From b90a62128068e1b6b0ba2a11c5cc0c8e587cf301 Mon Sep 17 00:00:00 2001
> > From: Christoph Fritz <chf.fritz@googlemail.com>
> > Date: Fri, 7 Feb 2014 10:51:15 +0100
> > Subject: [PATCH] ARM: dts: omap36xx: fix dpll4_m4_ck tree
> > 
> > OMAP36xx has different hardware implementation for the dpll4_m4_ck tree
> > compared to other OMAP3 variants. Reflect this properly in the dts file.
> 
> I rebased the DSS DT branch on top of v3.14-rc1, and I'm trying to get
> beagle-xM working. Pinmuxing was wrong, but after fixing that, the
> clk_set_rate for dss fclk failed. I applied Tero's and your patches, but
> now when starting omapdss I see:
> 
> [   19.704193] omap clock: module associated with clock
> dss1_alwon_fck_3430es2 didn't enable in 1000
> 00 tries
> 
> I wonder if I'm still missing some patch?

Is beagle-xM using DSI? Because here the LILLY-A83X board is not. The
clock registers are all fine now as before the dt clock conversion
patches.

I suppose you are using current linus tree. I tested 'next' but didn't
get DSS working. I guessed that it would have something to do with early
DSS DT integration issues.

I'll rebase my current dt board support patchset for LILLY-A83X to
current linus tree and investigate DSS further.

 Thanks
  -- Christoph

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tomi Valkeinen Feb. 11, 2014, 2:53 p.m. UTC | #3
On 10/02/14 22:54, Christoph Fritz wrote:

>> I wonder if I'm still missing some patch?
> 
> Is beagle-xM using DSI? Because here the LILLY-A83X board is not. The
> clock registers are all fine now as before the dt clock conversion
> patches.

No, Beagle xM doesn't use DSI, plain DPI.

 Tomi
diff mbox

Patch

diff --git a/arch/arm/boot/dts/omap36xx-clocks.dtsi b/arch/arm/boot/dts/omap36xx-clocks.dtsi
index 24869cb..8ac8926 100644
--- a/arch/arm/boot/dts/omap36xx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap36xx-clocks.dtsi
@@ -74,6 +74,14 @@ 
 	clock-div = <2>;
 };
 
+&dpll4_m4_ck {
+	clock-div = <15>;
+};
+
+&dss1_alwon_fck_3430es2 {
+	clocks = <&dpll4_m4_ck>;
+};
+
 &cm_clockdomains {
 	dpll4_clkdm: dpll4_clkdm {
 		compatible = "ti,clockdomain";
diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
index 7e8dee9..5e1bcd0 100644
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -52,7 +52,7 @@ 
 	};
 };
 
-/include/ "omap36xx-clocks.dtsi"
 /include/ "omap34xx-omap36xx-clocks.dtsi"
 /include/ "omap36xx-omap3430es2plus-clocks.dtsi"
 /include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
+/include/ "omap36xx-clocks.dtsi"