Some clocks were not properly defined:
- ICPLL and OUT values for PLLA got mixed on sam9x5 and sam9n12
- mainck was not correctly defined on sam9261
Alexandre Belloni (3):
ARM: at91/dt: sam9x5: correct PLLA ICPLL and OUT values
ARM: at91/dt: sam9n12: correct PLLA ICPLL and OUT values
ARM: at91/dt: sam9261: correctly define mainck
arch/arm/boot/dts/at91sam9261.dtsi | 10 ++++++++--
arch/arm/boot/dts/at91sam9n12.dtsi | 4 ++--
arch/arm/boot/dts/at91sam9x5.dtsi | 4 ++--
3 files changed, 12 insertions(+), 6 deletions(-)
--
1.9.1
ICPLL can only take 0 or 1, it got mixed with OUT which can be in the [0-3]
range.
Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9n12.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index d1b82e6635d5..287795985e32 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -132,8 +132,8 @@
<595000000 650000000 3 0>,
<545000000 600000000 0 1>,
<495000000 555000000 1 1>,
- <445000000 500000000 1 2>,
- <400000000 450000000 1 3>;
+ <445000000 500000000 2 1>,
+ <400000000 450000000 3 1>;
};
plladiv: plladivck {
--
1.9.1
mainck (CKGR_MCFR register) is actually using main_osc (CKGR_MOR register).
Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9261.dtsi | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index b309c1c6e848..9de312e9bb3e 100644
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -581,13 +581,19 @@
clocks = <&slow_rc_osc &slow_xtal>;
};
- main: mainck {
- compatible = "atmel,at91rm9200-clk-main";
+ main_osc: main_osc {
+ compatible = "atmel,at91rm9200-clk-main-osc";
#clock-cells = <0>;
interrupts-extended = <&pmc AT91_PMC_MOSCS>;
clocks = <&main_xtal>;
};
+ main: mainck {
+ compatible = "atmel,at91rm9200-clk-main";
+ #clock-cells = <0>;
+ clocks = <&main_osc>;
+ };
+
plla: pllack {
compatible = "atmel,at91rm9200-clk-pll";
#clock-cells = <0>;
--
1.9.1
ICPLL can only take 0 or 1, it got mixed with OUT which can be in the [0-3]
range.
Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9x5.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 1a57298636a5..d6133f497207 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -140,8 +140,8 @@
595000000 650000000 3 0
545000000 600000000 0 1
495000000 555000000 1 1
- 445000000 500000000 1 2
- 400000000 450000000 1 3>;
+ 445000000 500000000 2 1
+ 400000000 450000000 3 1>;
};
plladiv: plladivck {
--
1.9.1
On 13/06/2014 15:43, Alexandre Belloni wrote:
> Some clocks were not properly defined:
> - ICPLL and OUT values for PLLA got mixed on sam9x5 and sam9n12
> - mainck was not correctly defined on sam9261
On the whole series:
Acked-by: Boris BREZILLON <[email protected]>
Thanks.
Boris
>
> Alexandre Belloni (3):
> ARM: at91/dt: sam9x5: correct PLLA ICPLL and OUT values
> ARM: at91/dt: sam9n12: correct PLLA ICPLL and OUT values
> ARM: at91/dt: sam9261: correctly define mainck
>
> arch/arm/boot/dts/at91sam9261.dtsi | 10 ++++++++--
> arch/arm/boot/dts/at91sam9n12.dtsi | 4 ++--
> arch/arm/boot/dts/at91sam9x5.dtsi | 4 ++--
> 3 files changed, 12 insertions(+), 6 deletions(-)
>
--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
On 13/06/2014 15:43, Alexandre Belloni :
> Some clocks were not properly defined:
> - ICPLL and OUT values for PLLA got mixed on sam9x5 and sam9n12
> - mainck was not correctly defined on sam9261
>
> Alexandre Belloni (3):
> ARM: at91/dt: sam9x5: correct PLLA ICPLL and OUT values
> ARM: at91/dt: sam9n12: correct PLLA ICPLL and OUT values
> ARM: at91/dt: sam9261: correctly define mainck
Acked-by: Nicolas Ferre <[email protected]>
and added to the at91-3.16-fixes branch.
Thanks,
> arch/arm/boot/dts/at91sam9261.dtsi | 10 ++++++++--
> arch/arm/boot/dts/at91sam9n12.dtsi | 4 ++--
> arch/arm/boot/dts/at91sam9x5.dtsi | 4 ++--
> 3 files changed, 12 insertions(+), 6 deletions(-)
>
--
Nicolas Ferre