These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / boot / dts / at91rm9200.dtsi

diff --git a/kernel/arch/arm/boot/dts/at91rm9200.dtsi b/kernel/arch/arm/boot/dts/at91rm9200.dtsi
index 4fb333b..f6cb7a8 100644 (file)
--- a/kernel/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/kernel/arch/arm/boot/dts/at91rm9200.dtsi
@@ -92,12 +92,12 @@
                        };
 
                        ramc0: ramc@ffffff00 {
-                               compatible = "atmel,at91rm9200-sdramc";
+                               compatible = "atmel,at91rm9200-sdramc", "syscon";
                                reg = <0xffffff00 0x100>;
                        };
 
                        pmc: pmc@fffffc00 {
-                               compatible = "atmel,at91rm9200-pmc";
+                               compatible = "atmel,at91rm9200-pmc", "syscon";
                                reg = <0xfffffc00 0x100>;
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                interrupt-controller;
@@ -359,6 +359,7 @@
                                compatible = "atmel,at91rm9200-st", "syscon", "simple-mfd";
                                reg = <0xfffffd00 0x100>;
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                               clocks = <&slow_xtal>;
 
                                watchdog {
                                        compatible = "atmel,at91rm9200-wdt";
@@ -369,6 +370,7 @@
                                compatible = "atmel,at91rm9200-rtc";
                                reg = <0xfffffe00 0x40>;
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                               clocks = <&slow_xtal>;
                                status = "disabled";
                        };
 
@@ -378,8 +380,8 @@
                                interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0
                                              18 IRQ_TYPE_LEVEL_HIGH 0
                                              19 IRQ_TYPE_LEVEL_HIGH 0>;
-                               clocks = <&tc0_clk>, <&tc1_clk>, <&tc2_clk>;
-                               clock-names = "t0_clk", "t1_clk", "t2_clk";
+                               clocks = <&tc0_clk>, <&tc1_clk>, <&tc2_clk>, <&slow_xtal>;
+                               clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk";
                        };
 
                        tcb1: timer@fffa4000 {
@@ -388,8 +390,8 @@
                                interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0
                                              21 IRQ_TYPE_LEVEL_HIGH 0
                                              22 IRQ_TYPE_LEVEL_HIGH 0>;
-                               clocks = <&tc3_clk>, <&tc4_clk>, <&tc5_clk>;
-                               clock-names = "t0_clk", "t1_clk", "t2_clk";
+                               clocks = <&tc3_clk>, <&tc4_clk>, <&tc5_clk>, <&slow_xtal>;
+                               clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk";
                        };
 
                        i2c0: i2c@fffb8000 {
@@ -424,7 +426,7 @@
                                pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
                                clocks = <&ssc0_clk>;
                                clock-names = "pclk";
-                               status = "disable";
+                               status = "disabled";
                        };
 
                        ssc1: ssc@fffd4000 {
@@ -435,7 +437,7 @@
                                pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
                                clocks = <&ssc1_clk>;
                                clock-names = "pclk";
-                               status = "disable";
+                               status = "disabled";
                        };
 
                        ssc2: ssc@fffd8000 {
@@ -446,7 +448,7 @@
                                pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>;
                                clocks = <&ssc2_clk>;
                                clock-names = "pclk";
-                               status = "disable";
+                               status = "disabled";
                        };
 
                        macb0: ethernet@fffbc000 {
@@ -940,8 +942,8 @@
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00300000 0x100000>;
                        interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
-                       clocks = <&usb>, <&ohci_clk>, <&ohci_clk>, <&uhpck>;
-                       clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
+                       clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>;
+                       clock-names = "ohci_clk", "hclk", "uhpck";
                        status = "disabled";
                };
        };