Merge branch 'at91-3.16-cleanup' into at91-3.16-dt3

1 files changed, 39 insertions, 7 deletions

diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 92a52faebef7..ae9c39a28c63 100644
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -48,6 +48,18 @@
                 reg = <0x20000000 0x04000000>;
         };
 
+        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>;
+        };
+
         ahb {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -548,17 +560,11 @@
                                 #size-cells = <0>;
                                 #interrupt-cells = <1>;
 
-                                clk32k: slck {
-                                        compatible = "fixed-clock";
-                                        #clock-cells = <0>;
-                                        clock-frequency = <32768>;
-                                };
-
                                 main: mainck {
                                         compatible = "atmel,at91rm9200-clk-main";
                                         #clock-cells = <0>;
                                         interrupts-extended = <&pmc AT91_PMC_MOSCS>;
-                                        clocks = <&clk32k>;
+                                        clocks = <&main_xtal>;
                                 };
 
                                 plla: pllack {
@@ -769,6 +775,32 @@
                                 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                 status = "disabled";
                         };
+
+                        sckc@fffffd50 {
+                                compatible = "atmel,at91sam9x5-sckc";
+                                reg = <0xfffffd50 0x4>;
+
+                                slow_osc: slow_osc {
+                                        compatible = "atmel,at91sam9x5-clk-slow-osc";
+                                        #clock-cells = <0>;
+                                        atmel,startup-time-usec = <1200000>;
+                                        clocks = <&slow_xtal>;
+                                };
+
+                                slow_rc_osc: slow_rc_osc {
+                                        compatible = "atmel,at91sam9x5-clk-slow-rc-osc";
+                                        #clock-cells = <0>;
+                                        atmel,startup-time-usec = <75>;
+                                        clock-frequency = <32768>;
+                                        clock-accuracy = <50000000>;
+                                };
+
+                                clk32k: slck {
+                                        compatible = "atmel,at91sam9x5-clk-slow";
+                                        #clock-cells = <0>;
+                                        clocks = <&slow_rc_osc &slow_osc>;
+                                };
+                        };
                 };
         };