diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-06-17 09:30:20 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-07-09 12:02:45 -0400 |
commit | 334394c0d853c52f857a4584866ca8ec442fd05f (patch) | |
tree | 85f4b919c39afb61978b635fd14ac9cabcb5cb31 | |
parent | 12dde44998a30fff18a43999934f0abedfe4c16a (diff) |
ARM: at91/dt: sama5d3 crystals under the clocks node
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 <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r-- | arch/arm/boot/dts/at91-sama5d3_xplained.dts | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d3.dtsi | 22 | ||||
-rw-r--r-- | 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 @@ | |||
21 | reg = <0x20000000 0x10000000>; | 21 | reg = <0x20000000 0x10000000>; |
22 | }; | 22 | }; |
23 | 23 | ||
24 | slow_xtal { | 24 | clocks { |
25 | clock-frequency = <32768>; | 25 | slow_xtal { |
26 | }; | 26 | clock-frequency = <32768>; |
27 | }; | ||
27 | 28 | ||
28 | main_xtal { | 29 | main_xtal { |
29 | clock-frequency = <12000000>; | 30 | clock-frequency = <12000000>; |
31 | }; | ||
30 | }; | 32 | }; |
31 | 33 | ||
32 | ahb { | 34 | 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 @@ | |||
58 | reg = <0x20000000 0x8000000>; | 58 | reg = <0x20000000 0x8000000>; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | slow_xtal: slow_xtal { | 61 | clocks { |
62 | compatible = "fixed-clock"; | 62 | slow_xtal: slow_xtal { |
63 | #clock-cells = <0>; | 63 | compatible = "fixed-clock"; |
64 | clock-frequency = <0>; | 64 | #clock-cells = <0>; |
65 | }; | 65 | clock-frequency = <0>; |
66 | }; | ||
66 | 67 | ||
67 | main_xtal: main_xtal { | 68 | main_xtal: main_xtal { |
68 | compatible = "fixed-clock"; | 69 | compatible = "fixed-clock"; |
69 | #clock-cells = <0>; | 70 | #clock-cells = <0>; |
70 | clock-frequency = <0>; | 71 | clock-frequency = <0>; |
71 | }; | 72 | }; |
72 | 73 | ||
73 | clocks { | ||
74 | adc_op_clk: adc_op_clk{ | 74 | adc_op_clk: adc_op_clk{ |
75 | compatible = "fixed-clock"; | 75 | compatible = "fixed-clock"; |
76 | #clock-cells = <0>; | 76 | #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 @@ | |||
18 | reg = <0x20000000 0x20000000>; | 18 | reg = <0x20000000 0x20000000>; |
19 | }; | 19 | }; |
20 | 20 | ||
21 | slow_xtal { | 21 | clocks { |
22 | clock-frequency = <32768>; | 22 | slow_xtal { |
23 | }; | 23 | clock-frequency = <32768>; |
24 | }; | ||
24 | 25 | ||
25 | main_xtal { | 26 | main_xtal { |
26 | clock-frequency = <12000000>; | 27 | clock-frequency = <12000000>; |
28 | }; | ||
27 | }; | 29 | }; |
28 | 30 | ||
29 | ahb { | 31 | ahb { |