ARM: at91/dt: sam9261 crystals under the clocks node

This change “ARM: at91/dt: sam9261 crystals under the clocks node” (commit 73b173e) in Linux kernel is authored by Alexandre Belloni <alexandre.belloni [at] free-electrons.com> on Tue Jun 17 15:30:18 2014 +0200.

Description of "ARM: at91/dt: sam9261 crystals under the clocks node"

The change “ARM: at91/dt: sam9261 crystals under the clocks node” introduces changes as follows.

ARM: at91/dt: sam9261 crystals under the clocks node

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 <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Linux kernel releases containing commit 73b173e

The Linux kernel releases containing this commit are as follows.

Linux kernel code changes from "ARM: at91/dt: sam9261 crystals under the clocks node"

There are 36 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 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 04927db1d6bf..a81aab4281a7 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 {

The commit for this change in Linux stable tree is 73b173e (patch).

Last modified: 2020/02/10