Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[karo-tx-linux.git] / arch / arm / boot / dts / at91sam9260.dtsi

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 4bc34754910280fd1c0dd2a6db06a93b560ed9ba..be9c027ddd979c75173a061ea4b574006083d8e5 100644 (file)
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -359,11 +359,13 @@
                        rstc@fffffd00 {
                                compatible = "atmel,at91sam9260-rstc";
                                reg = <0xfffffd00 0x10>;
+                               clocks = <&clk32k>;
                        };
 
                        shdwc@fffffd10 {
                                compatible = "atmel,at91sam9260-shdwc";
                                reg = <0xfffffd10 0x10>;
+                               clocks = <&clk32k>;
                        };
 
                        pit: timer@fffffd30 {
@@ -379,8 +381,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>, <&clk32k>;
+                               clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk";
                        };
 
                        tcb1: timer@fffdc000 {
@@ -389,8 +391,8 @@
                                interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0
                                              27 IRQ_TYPE_LEVEL_HIGH 0
                                              28 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>, <&clk32k>;
+                               clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk";
                        };
 
                        pinctrl@fffff400 {
@@ -973,6 +975,7 @@
                                compatible = "atmel,at91sam9260-wdt";
                                reg = <0xfffffd40 0x10>;
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                               clocks = <&clk32k>;
                                atmel,watchdog-type = "hardware";
                                atmel,reset-type = "all";
                                atmel,dbg-halt;