ARM: dts/OMAP: add cpu clock nodes
Subsystems (3)
cover ARM: dts/OMAP: add cpu clock nodes
Add clock nodes for all existing OMAP platforms where cpufreq-cpu0 can be used.
Sanity tested with linux next-20140128 tag, applies on
master 0e47c96 Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd
Ofcourse, I have send 7 different versions[1] previously, so I will start from version 1 again considering that I have finally based on master.
If folks feel that the clock nodes must be split out into various platforms, I can regenerate the series again.
Nishanth Menon (2):
clk: ti: am335x: remove unecessary cpu0 clk node
ARM: dts: OMAP3+: add clock nodes for CPU
arch/arm/boot/dts/am33xx.dtsi | 4 ++++ arch/arm/boot/dts/am4372.dtsi | 5 +++++ arch/arm/boot/dts/dra7.dtsi | 5 +++++ arch/arm/boot/dts/omap3.dtsi | 5 +++++ arch/arm/boot/dts/omap4.dtsi | 5 +++++ arch/arm/boot/dts/omap5.dtsi | 6 ++++++ drivers/clk/ti/clk-33xx.c | 1 - 7 files changed, 30 insertions(+), 1 deletion(-)
[1] Last version of the patch series was posted here:
http://marc.info/?l=linux-omap&m=138245695726479&w=2
Signature · 4 lines
1.7.9.5 Regards, Nishanth Menon
PATCH 1/2 clk: ti: am335x: remove unecessary cpu0 clk node
cpu0 clock node has no functionality, since cpufreq-cpu0 is already capable of picking up the clock from dts.
--- drivers/clk/ti/clk-33xx.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/ti/clk-33xx.c +0 -1
@@ -34,7 +34,6 @@ static struct ti_dt_clk am33xx_clks[] = {DT_CLK (NULL ,"dpll_core_m5_ck" ,"dpll_core_m5_ck" ),DT_CLK (NULL ,"dpll_core_m6_ck" ,"dpll_core_m6_ck" ),DT_CLK (NULL ,"dpll_mpu_ck" ,"dpll_mpu_ck" ), -DT_CLK ("cpu0" ,NULL ,"dpll_mpu_ck" ),DT_CLK (NULL ,"dpll_mpu_m2_ck" ,"dpll_mpu_m2_ck" ),DT_CLK (NULL ,"dpll_ddr_ck" ,"dpll_ddr_ck" ), DT_CLK(NULL, "dpll_ddr_m2_ck", "dpll_ddr_m2_ck"),
Signature · 1 line
1.7.9.5
Re: [PATCH 1/2] clk: ti: am335x: remove unecessary cpu0 clk node
Quoted 4 lines · Nishanth Menon
cpu0 clock node has no functionality, since cpufreq-cpu0 is already capable of picking up the clock from dts.
Signed-off-by Nishanth Menon <[email protected]>
Quoted 17 lines
--- drivers/clk/ti/clk-33xx.c | 1 - 1 file changed, 1 deletion(-)drivers/clk/ti/clk-33xx.c +0
-1@@ -34,7 +34,6 @@ static struct ti_dt_clk am33xx_clks[] = {DT_CLK (NULL ,"dpll_core_m5_ck" ,"dpll_core_m5_ck" ),DT_CLK (NULL ,"dpll_core_m6_ck" ,"dpll_core_m6_ck" ),DT_CLK (NULL ,"dpll_mpu_ck" ,"dpll_mpu_ck" ), -DT_CLK ("cpu0" ,NULL ,"dpll_mpu_ck" ),DT_CLK (NULL ,"dpll_mpu_m2_ck" ,"dpll_mpu_m2_ck" ),DT_CLK (NULL ,"dpll_ddr_ck" ,"dpll_ddr_ck" ), DT_CLK(NULL, "dpll_ddr_m2_ck", "dpll_ddr_m2_ck"),
Re: [PATCH 1/2] clk: ti: am335x: remove unecessary cpu0 clk node
In reply to Nishanth MenonQuoting Nishanth Menon (2014-01-29 10:19:16)
Quoted 4 lines
cpu0 clock node has no functionality, since cpufreq-cpu0 is already capable of picking up the clock from dts.
Signed-off-by Nishanth Menon <[email protected]>
Taken into clk-next!
Regards,
Mike
Quoted 19 lines
--- drivers/clk/ti/clk-33xx.c | 1 - 1 file changed, 1 deletion(-)drivers/clk/ti/clk-33xx.c +0
-1@@ -34,7 +34,6 @@ static struct ti_dt_clk am33xx_clks[] = {DT_CLK (NULL ,"dpll_core_m5_ck" ,"dpll_core_m5_ck" ),DT_CLK (NULL ,"dpll_core_m6_ck" ,"dpll_core_m6_ck" ),DT_CLK (NULL ,"dpll_mpu_ck" ,"dpll_mpu_ck" ), -DT_CLK ("cpu0" ,NULL ,"dpll_mpu_ck" ),DT_CLK (NULL ,"dpll_mpu_m2_ck" ,"dpll_mpu_m2_ck" ),DT_CLK (NULL ,"dpll_ddr_ck" ,"dpll_ddr_ck" ), DT_CLK(NULL, "dpll_ddr_m2_ck", "dpll_ddr_m2_ck"),Signature · 1 line
1.7.9.5
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 clk: ti: am335x: remove unecessary cpu0 clk node
Quoting Kodiak Furr (2014-02-25 16:51:34)
Quoted 1 line
Kodiak Furr liked your message with Boxer.
Dear Mr. Furr,
I don't know what Boxer is, but thanks for the like.
Regards,
Mike
Quoted 41 lines
On February 25, 2014 at 2:24:11 AM CST, Mike Turquette <[email protected]> wrote:
Quoting Nishanth Menon (2014-01-29 10:19:16) > cpu0 clock node has no functionality, since cpufreq-cpu0 is already > capable of picking up the clock from dts. > > Signed-off-by: Nishanth Menon Taken into clk-next! Regards, Mike > --- > drivers/clk/ti/clk-33xx.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/clk/ti/clk-33xx.c b/drivers/clk/ti/clk-33xx.c > index 776ee45..028b337 100644 > --- a/drivers/clk/ti/clk-33xx.c > +++ b/drivers/clk/ti/clk-33xx.c > @@ -34,7 +34,6 @@ static struct ti_dt_clk am33xx_clks[] = { > DT_CLK(NULL, "dpll_core_m5_ck", "dpll_core_m5_ck"), > DT_CLK(NULL, "dpll_core_m6_ck", "dpll_core_m6_ck"), > DT_CLK(NULL, "dpll_mpu_ck", "dpll_mpu_ck"), > - DT_CLK("cpu0", NULL, "dpll_mpu_ck"), > DT_CLK(NULL, "dpll_mpu_m2_ck", "dpll_mpu_m2_ck"), > DT_CLK(NULL, "dpll_ddr_ck", "dpll_ddr_ck"), > DT_CLK(NULL, "dpll_ddr_m2_ck", "dpll_ddr_m2_ck"), > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
PATCH 2/2 ARM: dts: OMAP3+: add clock nodes for CPU
In reply to Nishanth MenonOMAP34xx, AM3517 and OMAP36xx platforms use dpll1 clock.
OMAP443x, OMAP446x, OMAP447x, OMAP5, DRA7, AM43xx platforms use dpll_mpu clock.
Latency used is the generic latency defined in omap-cpufreq driver.
--- arch/arm/boot/dts/am33xx.dtsi | 4 ++++ arch/arm/boot/dts/am4372.dtsi | 5 +++++ arch/arm/boot/dts/dra7.dtsi | 5 +++++ arch/arm/boot/dts/omap3.dtsi | 5 +++++ arch/arm/boot/dts/omap4.dtsi | 5 +++++ arch/arm/boot/dts/omap5.dtsi | 6 ++++++ 6 files changed, 30 insertions(+)
arch/arm/boot/dts/am33xx.dtsi +4 -0
@@ -58,6 +58,10 @@ 275000 1125000 >; voltage-tolerance = <2>; /* 2 percentage */ + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + clock-latency = <300000>; /* From omap-cpufreq driver */ }; };
arch/arm/boot/dts/am4372.dtsi +5 -0
@@ -33,6 +33,11 @@ compatible = "arm,cortex-a9"; device_type = "cpu"; reg = <0>; + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ }; };
arch/arm/boot/dts/dra7.dtsi +5 -0
@@ -47,6 +47,11 @@ 1000000 1060000 1176000 1160000 >; + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ }; cpu at 1 { device_type = "cpu";
arch/arm/boot/dts/omap3.dtsi +5 -0
@@ -35,6 +35,11 @@ compatible = "arm,cortex-a8"; device_type = "cpu"; reg = <0x0>; + + clocks = <&dpll1_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ }; };
arch/arm/boot/dts/omap4.dtsi +5 -0
@@ -36,6 +36,11 @@ device_type = "cpu"; next-level-cache = <&L2>; reg = <0x0>; + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ }; cpu at 1 { compatible = "arm,cortex-a9";
arch/arm/boot/dts/omap5.dtsi +6 -0
@@ -49,6 +49,12 @@ 1000000 1060000 1500000 1250000 >; + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ + /* cooling options */ cooling-min-level = <0>; cooling-max-level = <2>;
Signature · 1 line
1.7.9.5
Re: [PATCH 2/2] ARM: dts: OMAP3+: add clock nodes for CPU
Quoted 9 lines · Nishanth Menon
OMAP34xx, AM3517 and OMAP36xx platforms use dpll1 clock.
OMAP443x, OMAP446x, OMAP447x, OMAP5, DRA7, AM43xx platforms use
dpll_mpuclock.Latency used is the generic latency defined in omap-cpufreq driver.
Signed-off-by Nishanth Menon <[email protected]>
Hi Nishanth,
After this patch, do you see any limitation to finally enabling 1Ghz operation on the beagle-xm by default? Or are we still missing a dependicy somewhere?
cpufreq stats: 300 MHz:98.64%, 600 MHz:0.04%, 800 MHz:0.09%, 1000 MHz:1.23% (11)
full cpufreq output: http://paste.debian.net/79073/
(quoted diff) +0 -0
b/arch/arm/boot/dts/omap3-beagle-xm.dts
index bb5dad0..b0e5863 100644
arch/arm/boot/dts/omap3-beagle-xm.dts +23 -0
@@ -16,9 +16,36 @@ cpus { cpu at 0 { cpu0-supply = <&vcc>; + operating-points = < + /* kHz uV */ + 300000 1012500 + 600000 1200000 + 800000 1325000 + 1000000 1380000 + >; }; }; + abb: regulator-abb { + compatible = "ti,abb-v1"; + regulator-name = "abb"; + #address-cell = <0>; + #size-cells = <0>; + reg = <0x483072f0 0x8>, <0x48306818 0x4>; + reg-names = "base-address", "int-address"; + ti,tranxdone-status-mask = <0x4000000>; + clocks = <&dpll1_ck>; + ti,settling-time = <30>; + ti,clock-cycles = <8>; + ti,abb_info = < + /* uV ABB efuse rbb_m fbb_m vset_m */ + 1012500 0 0 0 0 0 /* Bypass */ + 1200000 3 0 0 0 0 /* RBB mandatory */ + 1320000 1 0 0 0
0 /* FBB mandatory */
+ 1380000 1 0 0 0 0
+ >;
+ };
+
memory {
device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */Signature · 7 lines
1.8.5.3 Regards, -- Robert Nelson http://www.rcn-ee.com/
Re: [PATCH 2/2] ARM: dts: OMAP3+: add clock nodes for CPU
Quoted 9 lines · Robert Nelson
Quoted 8 lines · Nishanth Menon
OMAP34xx, AM3517 and OMAP36xx platforms use dpll1 clock.
OMAP443x, OMAP446x, OMAP447x, OMAP5, DRA7, AM43xx platforms use
dpll_mpuclock.Latency used is the generic latency defined in omap-cpufreq driver.
Quoted 7 lines
Quoted 1 line
Signed-off-by Nishanth Menon <[email protected]>Hi Nishanth,
After this patch, do you see any limitation to finally enabling 1Ghz operation on the beagle-xm by default? Or are we still missing a dependicy somewhere?
yes, there is:
a) ABB dt series - i will repost this in a few mins
b) AVS conversion from non-dt mode to dt supported mode. (which by itself depends on VC/VP conversion).
c) clk notifier based dvfs for cpufreq-cpu0 -> this allows us to introduce the necessary plumbing for mpu voltage domain such that the TWL4030 regulator, AVS and ABB are rightly sequenced.
What you have done in the patch below is to introduce ABB regulator - but no one is actually using it -> this might actually work on certain samples at 1GHz, but prolonged operation will either damage the device or fail on other samples - I have tried numerous times Internally to get approval for non ABB/AVS configuration for 1GHz - but I have a clear feedback that it cannot be done with the constraints of DM3730/OMAP3630.
Lets do this a series at a time and build up the necessary support - we get clock nodes for dvfs (using i2c1) here with cpufreq-cpu0 with this series. If folks can ack and queue this up, we can get in ABB dts nodes in place - allowing us to work on the next set -> sequencing using clock notifier. in parallel we could work on converting AVS back to dt based solution.
yes, the road is long.
Signature · 2 lines
Regards, Nishanth Menon
Re: [PATCH 2/2] ARM: dts: OMAP3+: add clock nodes for CPU
In reply to Nishanth MenonQuoted 9 lines · Nishanth Menon
OMAP34xx, AM3517 and OMAP36xx platforms use dpll1 clock.
OMAP443x, OMAP446x, OMAP447x, OMAP5, DRA7, AM43xx platforms use
dpll_mpuclock.Latency used is the generic latency defined in omap-cpufreq driver.
Signed-off-by Nishanth Menon <[email protected]>
Looks good to me.
Quoted 106 lines
--- arch/arm/boot/dts/am33xx.dtsi | 4 ++++ arch/arm/boot/dts/am4372.dtsi | 5 +++++ arch/arm/boot/dts/dra7.dtsi | 5 +++++ arch/arm/boot/dts/omap3.dtsi | 5 +++++ arch/arm/boot/dts/omap4.dtsi | 5 +++++ arch/arm/boot/dts/omap5.dtsi | 6 ++++++ 6 files changed, 30 insertions(+)arch/arm/boot/dts/am33xx.dtsi +4
-0@@ -58,6 +58,10 @@ 275000 1125000 >; voltage-tolerance = <2>; /* 2 percentage */ + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + clock-latency = <300000>; /* From omap-cpufreq driver */ }; };arch/arm/boot/dts/am4372.dtsi +5
-0@@ -33,6 +33,11 @@ compatible = "arm,cortex-a9"; device_type = "cpu"; reg = <0>; + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ }; };arch/arm/boot/dts/dra7.dtsi +5
-0@@ -47,6 +47,11 @@ 1000000 1060000 1176000 1160000 >; + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ }; cpu at 1 { device_type = "cpu";arch/arm/boot/dts/omap3.dtsi +5
-0@@ -35,6 +35,11 @@ compatible = "arm,cortex-a8"; device_type = "cpu"; reg = <0x0>; + + clocks = <&dpll1_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ }; };arch/arm/boot/dts/omap4.dtsi +5
-0@@ -36,6 +36,11 @@ device_type = "cpu"; next-level-cache = <&L2>; reg = <0x0>; + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ }; cpu at 1 { compatible = "arm,cortex-a9";arch/arm/boot/dts/omap5.dtsi +6
-0@@ -49,6 +49,12 @@ 1000000 1060000 1500000 1250000 >; + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ + /* cooling options */ cooling-min-level = <0>; cooling-max-level = <2>;
Re: [PATCH 2/2] ARM: dts: OMAP3+: add clock nodes for CPU
Quoted 6 lines · Tero Kristo
Quoted 5 lines · Nishanth Menon
OMAP34xx, AM3517 and OMAP36xx platforms use dpll1 clock.
OMAP443x, OMAP446x, OMAP447x, OMAP5, DRA7, AM43xx platforms use
dpll_mpuclock.
Quoted 8 lines
Quoted 4 lines
Latency used is the generic latency defined in omap-cpufreq driver.
Signed-off-by Nishanth Menon <[email protected]>Looks good to me.
Acked-by Tero Kristo <[email protected]>
Thanks applying into omap-for-v3.15/dt.
Regards,
Tony
Quoted 108 lines
Quoted 107 lines
--- arch/arm/boot/dts/am33xx.dtsi | 4 ++++ arch/arm/boot/dts/am4372.dtsi | 5 +++++ arch/arm/boot/dts/dra7.dtsi | 5 +++++ arch/arm/boot/dts/omap3.dtsi | 5 +++++ arch/arm/boot/dts/omap4.dtsi | 5 +++++ arch/arm/boot/dts/omap5.dtsi | 6 ++++++ 6 files changed, 30 insertions(+)arch/arm/boot/dts/am33xx.dtsi +4
-0@@ -58,6 +58,10 @@ 275000 1125000 >; voltage-tolerance = <2>; /* 2 percentage */ + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + clock-latency = <300000>; /* From omap-cpufreq driver */ }; };arch/arm/boot/dts/am4372.dtsi +5
-0@@ -33,6 +33,11 @@ compatible = "arm,cortex-a9"; device_type = "cpu"; reg = <0>; + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ }; };arch/arm/boot/dts/dra7.dtsi +5
-0@@ -47,6 +47,11 @@ 1000000 1060000 1176000 1160000 >; + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ }; cpu at 1 { device_type = "cpu";arch/arm/boot/dts/omap3.dtsi +5
-0@@ -35,6 +35,11 @@ compatible = "arm,cortex-a8"; device_type = "cpu"; reg = <0x0>; + + clocks = <&dpll1_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ }; };arch/arm/boot/dts/omap4.dtsi +5
-0@@ -36,6 +36,11 @@ device_type = "cpu"; next-level-cache = <&L2>; reg = <0x0>; + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ }; cpu at 1 { compatible = "arm,cortex-a9";arch/arm/boot/dts/omap5.dtsi +6
-0@@ -49,6 +49,12 @@ 1000000 1060000 1500000 1250000 >; + + clocks = <&dpll_mpu_ck>; + clock-names = "cpu"; + + clock-latency = <300000>; /* From omap-cpufreq driver */ + /* cooling options */ cooling-min-level = <0>; cooling-max-level = <2>;