Hi,
This patch set fixes more issues with the clocks on AT91:
The first patch define the slow crystal on the at91sam9261ek board
The next patchs are moving all the clocks that were under the root under a
"clocks" node to be consistent accross all architecture.
Alexandre Belloni (6):
ARM: at91/dt: define sam9261ek slow crystal frequency
ARM: at91/dt: sam9261 crystals under the clocks node
ARM: at91/dt: sam9n12 crystals under the clocks node
ARM: at91/dt: sam9rl crystals under the clocks node
ARM: at91/dt: sam9x5 crystals under the clocks node
ARM: at91/dt: sama5d3 crystals under the clocks node
arch/arm/boot/dts/at91-sama5d3_xplained.dts | 12 +++++++-----
arch/arm/boot/dts/at91sam9261.dtsi | 20 ++++++++++---------
arch/arm/boot/dts/at91sam9261ek.dts | 12 ++++++++----
arch/arm/boot/dts/at91sam9n12.dtsi | 20 ++++++++++---------
arch/arm/boot/dts/at91sam9n12ek.dts | 16 +++++++--------
arch/arm/boot/dts/at91sam9rl.dtsi | 22 ++++++++++-----------
arch/arm/boot/dts/at91sam9rlek.dts | 17 ++++++++--------
arch/arm/boot/dts/at91sam9x5.dtsi | 30 +++++++++++++++--------------
arch/arm/boot/dts/at91sam9x5cm.dtsi | 12 +++++++-----
arch/arm/boot/dts/sama5d3.dtsi | 22 ++++++++++-----------
arch/arm/boot/dts/sama5d3xcm.dtsi | 12 +++++++-----
11 files changed, 105 insertions(+), 90 deletions(-)
--
1.9.1
Having clocks grouped in a subnode is common practice, so move the crystals
under a clocks node for the at91sam9261 SoC and at91sam9261 based boards.
Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9261.dtsi | 20 +++++++++++---------
arch/arm/boot/dts/at91sam9261ek.dts | 16 ++++++++--------
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index 9de312e9bb3e..c8e8b92df51b 100644
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -46,16 +46,18 @@
reg = <0x20000000 0x08000000>;
};
- main_xtal: main_xtal {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <0>;
- };
+ clocks {
+ main_xtal: main_xtal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <0>;
+ };
- slow_xtal: slow_xtal {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <0>;
+ slow_xtal: slow_xtal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <0>;
+ };
};
ahb {
diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts
index aa35a7aec9a8..f4a765729c7a 100644
--- a/arch/arm/boot/dts/at91sam9261ek.dts
+++ b/arch/arm/boot/dts/at91sam9261ek.dts
@@ -20,14 +20,6 @@
reg = <0x20000000 0x4000000>;
};
- slow_xtal {
- clock-frequency = <32768>;
- };
-
- main_xtal {
- clock-frequency = <18432000>;
- };
-
clocks {
#address-cells = <1>;
#size-cells = <1>;
@@ -37,6 +29,14 @@
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <18432000>;
};
+
+ slow_xtal {
+ clock-frequency = <32768>;
+ };
+
+ main_xtal {
+ clock-frequency = <18432000>;
+ };
};
ahb {
--
1.9.1
Having clocks grouped in a subnode is common practice, so move the crystals
under a clocks node for the at91sam9rl SoC and at91sam9rl based boards.
Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9rl.dtsi | 22 +++++++++++-----------
arch/arm/boot/dts/at91sam9rlek.dts | 17 ++++++++---------
2 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 1da183155eee..8d6751a00074 100644
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -50,19 +50,19 @@
reg = <0x20000000 0x04000000>;
};
- slow_xtal: slow_xtal {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <0>;
- };
+ clocks {
+ slow_xtal: slow_xtal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <0>;
+ };
- main_xtal: main_xtal {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <0>;
- };
+ main_xtal: main_xtal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <0>;
+ };
- clocks {
adc_op_clk: adc_op_clk{
compatible = "fixed-clock";
#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts
index d4a010e40fe3..9be5b540eebf 100644
--- a/arch/arm/boot/dts/at91sam9rlek.dts
+++ b/arch/arm/boot/dts/at91sam9rlek.dts
@@ -20,15 +20,6 @@
reg = <0x20000000 0x4000000>;
};
-
- slow_xtal {
- clock-frequency = <32768>;
- };
-
- main_xtal {
- clock-frequency = <12000000>;
- };
-
clocks {
#address-cells = <1>;
#size-cells = <1>;
@@ -38,6 +29,14 @@
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
+
+ slow_xtal {
+ clock-frequency = <32768>;
+ };
+
+ main_xtal {
+ clock-frequency = <12000000>;
+ };
};
ahb {
--
1.9.1
Having clocks grouped in a subnode is common practice, so move the crystals and
the ADC clock under a clocks node for the at91sam9x5 SoC and at91sam9x5 based
boards.
Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9x5.dtsi | 30 ++++++++++++++++--------------
arch/arm/boot/dts/at91sam9x5cm.dtsi | 12 +++++++-----
2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index d6133f497207..ed9251324c90 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -52,22 +52,24 @@
reg = <0x20000000 0x10000000>;
};
- slow_xtal: slow_xtal {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <0>;
- };
+ clocks {
+ slow_xtal: slow_xtal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <0>;
+ };
- main_xtal: main_xtal {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <0>;
- };
+ main_xtal: main_xtal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <0>;
+ };
- adc_op_clk: adc_op_clk{
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <5000000>;
+ adc_op_clk: adc_op_clk{
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <5000000>;
+ };
};
ahb {
diff --git a/arch/arm/boot/dts/at91sam9x5cm.dtsi b/arch/arm/boot/dts/at91sam9x5cm.dtsi
index 8413e21192eb..229d6c24a9c4 100644
--- a/arch/arm/boot/dts/at91sam9x5cm.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5cm.dtsi
@@ -23,12 +23,14 @@
};
};
- slow_xtal {
- clock-frequency = <32768>;
- };
+ clocks {
+ slow_xtal {
+ clock-frequency = <32768>;
+ };
- main_xtal {
- clock-frequency = <12000000>;
+ main_xtal {
+ clock-frequency = <12000000>;
+ };
};
ahb {
--
1.9.1
Having clocks grouped in a subnode is common practice, so move the crystals
under a clocks node for the sama5d3 SoC and sama5d3 based boards.
Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91-sama5d3_xplained.dts | 12 +++++++-----
arch/arm/boot/dts/sama5d3.dtsi | 22 +++++++++++-----------
arch/arm/boot/dts/sama5d3xcm.dtsi | 12 +++++++-----
3 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index 5b8e40400bec..fec1fca2ad66 100644
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -21,12 +21,14 @@
reg = <0x20000000 0x10000000>;
};
- slow_xtal {
- clock-frequency = <32768>;
- };
+ clocks {
+ slow_xtal {
+ clock-frequency = <32768>;
+ };
- main_xtal {
- clock-frequency = <12000000>;
+ main_xtal {
+ clock-frequency = <12000000>;
+ };
};
ahb {
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index e0b15a6e8897..45013b867c8d 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -58,19 +58,19 @@
reg = <0x20000000 0x8000000>;
};
- slow_xtal: slow_xtal {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <0>;
- };
+ clocks {
+ slow_xtal: slow_xtal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <0>;
+ };
- main_xtal: main_xtal {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <0>;
- };
+ main_xtal: main_xtal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <0>;
+ };
- clocks {
adc_op_clk: adc_op_clk{
compatible = "fixed-clock";
#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/sama5d3xcm.dtsi b/arch/arm/boot/dts/sama5d3xcm.dtsi
index b0b1331c1974..f7d8583eef82 100644
--- a/arch/arm/boot/dts/sama5d3xcm.dtsi
+++ b/arch/arm/boot/dts/sama5d3xcm.dtsi
@@ -18,12 +18,14 @@
reg = <0x20000000 0x20000000>;
};
- slow_xtal {
- clock-frequency = <32768>;
- };
+ clocks {
+ slow_xtal {
+ clock-frequency = <32768>;
+ };
- main_xtal {
- clock-frequency = <12000000>;
+ main_xtal {
+ clock-frequency = <12000000>;
+ };
};
ahb {
--
1.9.1
Having clocks grouped in a subnode is common practice, so move the crystals
under a clocks node for the at91sam9n12 SoC and at91sam9n12 based boards.
Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9n12.dtsi | 20 +++++++++++---------
arch/arm/boot/dts/at91sam9n12ek.dts | 16 ++++++++--------
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 287795985e32..67efd442fd85 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -50,16 +50,18 @@
reg = <0x20000000 0x10000000>;
};
- slow_xtal: slow_xtal {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <0>;
- };
+ clocks {
+ slow_xtal: slow_xtal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <0>;
+ };
- main_xtal: main_xtal {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <0>;
+ main_xtal: main_xtal {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <0>;
+ };
};
ahb {
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index 64bbe46e4f90..32f1aad889d2 100644
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -21,14 +21,6 @@
reg = <0x20000000 0x8000000>;
};
- slow_xtal {
- clock-frequency = <32768>;
- };
-
- main_xtal {
- clock-frequency = <16000000>;
- };
-
clocks {
#address-cells = <1>;
#size-cells = <1>;
@@ -38,6 +30,14 @@
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <16000000>;
};
+
+ slow_xtal {
+ clock-frequency = <32768>;
+ };
+
+ main_xtal {
+ clock-frequency = <16000000>;
+ };
};
ahb {
--
1.9.1
Define at91sam9261ek's slow crystal frequencies.
Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9261ek.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts
index c6683ea8b743..aa35a7aec9a8 100644
--- a/arch/arm/boot/dts/at91sam9261ek.dts
+++ b/arch/arm/boot/dts/at91sam9261ek.dts
@@ -20,6 +20,10 @@
reg = <0x20000000 0x4000000>;
};
+ slow_xtal {
+ clock-frequency = <32768>;
+ };
+
main_xtal {
clock-frequency = <18432000>;
};
--
1.9.1
Hello,
On 17/06/2014 18:41, Alexandre Belloni wrote:
> Hi,
>
> This patch set fixes more issues with the clocks on AT91:
>
> The first patch define the slow crystal on the at91sam9261ek board
>
> The next patchs are moving all the clocks that were under the root under a
> "clocks" node to be consistent accross all architecture.
I'm just nitpicking here, but you could swap patch 1 and 2 so that
slow_xtal node appears directly under clocks node.
Apart from that,
Acked-by: Boris BREZILLON <[email protected]>
>
> Alexandre Belloni (6):
> ARM: at91/dt: define sam9261ek slow crystal frequency
> ARM: at91/dt: sam9261 crystals under the clocks node
> ARM: at91/dt: sam9n12 crystals under the clocks node
> ARM: at91/dt: sam9rl crystals under the clocks node
> ARM: at91/dt: sam9x5 crystals under the clocks node
> ARM: at91/dt: sama5d3 crystals under the clocks node
>
> arch/arm/boot/dts/at91-sama5d3_xplained.dts | 12 +++++++-----
> arch/arm/boot/dts/at91sam9261.dtsi | 20 ++++++++++---------
> arch/arm/boot/dts/at91sam9261ek.dts | 12 ++++++++----
> arch/arm/boot/dts/at91sam9n12.dtsi | 20 ++++++++++---------
> arch/arm/boot/dts/at91sam9n12ek.dts | 16 +++++++--------
> arch/arm/boot/dts/at91sam9rl.dtsi | 22 ++++++++++-----------
> arch/arm/boot/dts/at91sam9rlek.dts | 17 ++++++++--------
> arch/arm/boot/dts/at91sam9x5.dtsi | 30 +++++++++++++++--------------
> arch/arm/boot/dts/at91sam9x5cm.dtsi | 12 +++++++-----
> arch/arm/boot/dts/sama5d3.dtsi | 22 ++++++++++-----------
> arch/arm/boot/dts/sama5d3xcm.dtsi | 12 +++++++-----
> 11 files changed, 105 insertions(+), 90 deletions(-)
>
--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
On 17/06/2014 18:41, Alexandre Belloni :
> Hi,
>
> This patch set fixes more issues with the clocks on AT91:
>
> The first patch define the slow crystal on the at91sam9261ek board
>
> The next patchs are moving all the clocks that were under the root under a
> "clocks" node to be consistent accross all architecture.
>
> Alexandre Belloni (6):
> ARM: at91/dt: define sam9261ek slow crystal frequency
> ARM: at91/dt: sam9261 crystals under the clocks node
> ARM: at91/dt: sam9n12 crystals under the clocks node
> ARM: at91/dt: sam9rl crystals under the clocks node
> ARM: at91/dt: sam9x5 crystals under the clocks node
> ARM: at91/dt: sama5d3 crystals under the clocks node
On the whole series:
Acked-by: Nicolas Ferre <[email protected]>
And stacked on 3.16-fixes branch.
Best regards,
> arch/arm/boot/dts/at91-sama5d3_xplained.dts | 12 +++++++-----
> arch/arm/boot/dts/at91sam9261.dtsi | 20 ++++++++++---------
> arch/arm/boot/dts/at91sam9261ek.dts | 12 ++++++++----
> arch/arm/boot/dts/at91sam9n12.dtsi | 20 ++++++++++---------
> arch/arm/boot/dts/at91sam9n12ek.dts | 16 +++++++--------
> arch/arm/boot/dts/at91sam9rl.dtsi | 22 ++++++++++-----------
> arch/arm/boot/dts/at91sam9rlek.dts | 17 ++++++++--------
> arch/arm/boot/dts/at91sam9x5.dtsi | 30 +++++++++++++++--------------
> arch/arm/boot/dts/at91sam9x5cm.dtsi | 12 +++++++-----
> arch/arm/boot/dts/sama5d3.dtsi | 22 ++++++++++-----------
> arch/arm/boot/dts/sama5d3xcm.dtsi | 12 +++++++-----
> 11 files changed, 105 insertions(+), 90 deletions(-)
>
--
Nicolas Ferre