8 files changed, 144 insertions, 20 deletions

diff --git a/arch/arm/boot/dts/at91-cosino_mega2560.dts b/arch/arm/boot/dts/at91-cosino_mega2560.dts
index a542d5837a17..27ebb0f722fd 100644
--- a/arch/arm/boot/dts/at91-cosino_mega2560.dts
+++ b/arch/arm/boot/dts/at91-cosino_mega2560.dts
@@ -32,11 +32,6 @@
                                 status = "okay";
                         };
 
-
-                        tsadcc: tsadcc@f804c000 {
-                                status = "okay";
-                        };
-
                         rtc@fffffeb0 {
                                 status = "okay";
                         };
diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index 4537259ce529..099111bd4221 100644
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -21,6 +21,14 @@
                 reg = <0x20000000 0x10000000>;
         };
 
+        slow_xtal {
+                clock-frequency = <32768>;
+        };
+
+        main_xtal {
+                clock-frequency = <12000000>;
+        };
+
         ahb {
                 apb {
                         mmc0: mmc@f0000000 {
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index 3be973e9889a..80cdcecf0332 100644
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -45,6 +45,18 @@
                 reg = <0x20000000 0x08000000>;
         };
 
+        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>;
+        };
+
         ahb {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -524,17 +536,24 @@
                                 #size-cells = <0>;
                                 #interrupt-cells = <1>;
 
-                                clk32k: slck {
+                                slow_rc_osc: slow_rc_osc {
                                         compatible = "fixed-clock";
                                         #clock-cells = <0>;
                                         clock-frequency = <32768>;
+                                        clock-accuracy = <50000000>;
+                                };
+
+                                clk32k: slck {
+                                        compatible = "atmel,at91sam9260-clk-slow";
+                                        #clock-cells = <0>;
+                                        clocks = <&slow_rc_osc &slow_xtal>;
                                 };
 
                                 main: mainck {
                                         compatible = "atmel,at91rm9200-clk-main";
                                         #clock-cells = <0>;
                                         interrupts-extended = <&pmc AT91_PMC_MOSCS>;
-                                        clocks = <&clk32k>;
+                                        clocks = <&main_xtal>;
                                 };
 
                                 plla: pllack {
diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts
index 2ce527e70c7a..c6683ea8b743 100644
--- a/arch/arm/boot/dts/at91sam9261ek.dts
+++ b/arch/arm/boot/dts/at91sam9261ek.dts
@@ -20,6 +20,10 @@
                 reg = <0x20000000 0x4000000>;
         };
 
+        main_xtal {
+                clock-frequency = <18432000>;
+        };
+
         clocks {
                 #address-cells = <1>;
                 #size-cells = <1>;
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>;
+                                };
+                        };
                 };
         };
 
diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts
index cddb37825fad..b3b89baf972e 100644
--- a/arch/arm/boot/dts/at91sam9rlek.dts
+++ b/arch/arm/boot/dts/at91sam9rlek.dts
@@ -20,6 +20,15 @@
                 reg = <0x20000000 0x4000000>;
         };
 
+
+        slow_xtal {
+                clock-frequency = <32768>;
+        };
+
+        main_xtal {
+                clock-frequency = <12000000>;
+        };
+
         clocks {
                 #address-cells = <1>;
                 #size-cells = <1>;
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index a106b0872910..3f260b9cd51f 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -58,6 +58,18 @@
                 reg = <0x20000000 0x8000000>;
         };
 
+        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>;
+        };
+
         clocks {
                 adc_op_clk: adc_op_clk{
                         compatible = "fixed-clock";
@@ -749,18 +761,29 @@
                                 #size-cells = <0>;
                                 #interrupt-cells = <1>;
 
-                                clk32k: slck {
-                                        compatible = "fixed-clock";
+                                main_rc_osc: main_rc_osc {
+                                        compatible = "atmel,at91sam9x5-clk-main-rc-osc";
                                         #clock-cells = <0>;
-                                        clock-frequency = <32768>;
+                                        interrupt-parent = <&pmc>;
+                                        interrupts = <AT91_PMC_MOSCRCS>;
+                                        clock-frequency = <12000000>;
+                                        clock-accuracy = <50000000>;
                                 };
 
-                                main: mainck {
-                                        compatible = "atmel,at91rm9200-clk-main";
+                                main_osc: main_osc {
+                                        compatible = "atmel,at91rm9200-clk-main-osc";
                                         #clock-cells = <0>;
                                         interrupt-parent = <&pmc>;
                                         interrupts = <AT91_PMC_MOSCS>;
-                                        clocks = <&clk32k>;
+                                        clocks = <&main_xtal>;
+                                };
+
+                                main: mainck {
+                                        compatible = "atmel,at91sam9x5-clk-main";
+                                        #clock-cells = <0>;
+                                        interrupt-parent = <&pmc>;
+                                        interrupts = <AT91_PMC_MOSCSELS>;
+                                        clocks = <&main_rc_osc &main_osc>;
                                 };
 
                                 plla: pllack {
@@ -1089,6 +1112,32 @@
                                 status = "disabled";
                         };
 
+                        sckc@fffffe50 {
+                                compatible = "atmel,at91sam9x5-sckc";
+                                reg = <0xfffffe50 0x4>;
+
+                                slow_rc_osc: slow_rc_osc {
+                                        compatible = "atmel,at91sam9x5-clk-slow-rc-osc";
+                                        #clock-cells = <0>;
+                                        clock-frequency = <32768>;
+                                        clock-accuracy = <50000000>;
+                                        atmel,startup-time-usec = <75>;
+                                };
+
+                                slow_osc: slow_osc {
+                                        compatible = "atmel,at91sam9x5-clk-slow-osc";
+                                        #clock-cells = <0>;
+                                        clocks = <&slow_xtal>;
+                                        atmel,startup-time-usec = <1200000>;
+                                };
+
+                                clk32k: slowck {
+                                        compatible = "atmel,at91sam9x5-clk-slow";
+                                        #clock-cells = <0>;
+                                        clocks = <&slow_rc_osc &slow_osc>;
+                                };
+                        };
+
                         rtc@fffffeb0 {
                                 compatible = "atmel,at91rm9200-rtc";
                                 reg = <0xfffffeb0 0x30>;
diff --git a/arch/arm/boot/dts/sama5d3xcm.dtsi b/arch/arm/boot/dts/sama5d3xcm.dtsi
index f55ed072c8e6..b0b1331c1974 100644
--- a/arch/arm/boot/dts/sama5d3xcm.dtsi
+++ b/arch/arm/boot/dts/sama5d3xcm.dtsi
@@ -18,6 +18,14 @@
                 reg = <0x20000000 0x20000000>;
         };
 
+        slow_xtal {
+                clock-frequency = <32768>;
+        };
+
+        main_xtal {
+                clock-frequency = <12000000>;
+        };
+
         ahb {
                 apb {
                         spi0: spi@f0004000 {