Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

[karo-tx-linux.git] / arch / arm / boot / dts / versatile-pb.dts

diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts
index 8d39677b7d4c8922bd285e24d1c2fe82645e9fe1..e36c1e82fea74d62f7efb7cc3c3585597abd78c2 100644 (file)
--- a/arch/arm/boot/dts/versatile-pb.dts
+++ b/arch/arm/boot/dts/versatile-pb.dts
@@ -13,6 +13,8 @@
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
+                       clocks = <&pclk>;
+                       clock-names = "apb_pclk";
                };
 
                gpio3: gpio@101e7000 {
@@ -23,6 +25,8 @@
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
+                       clocks = <&pclk>;
+                       clock-names = "apb_pclk";
                };
 
                fpga {
@@ -31,17 +35,23 @@
                                reg = <0x9000 0x1000>;
                                interrupt-parent = <&sic>;
                                interrupts = <6>;
+                               clocks = <&xtal24mhz>, <&pclk>;
+                               clock-names = "uartclk", "apb_pclk";
                        };
                        sci@a000 {
                                compatible = "arm,primecell";
                                reg = <0xa000 0x1000>;
                                interrupt-parent = <&sic>;
                                interrupts = <5>;
+                               clocks = <&xtal24mhz>;
+                               clock-names = "apb_pclk";
                        };
                        mmc@b000 {
-                               compatible = "arm,primecell";
+                               compatible = "arm,pl180", "arm,primecell";
                                reg = <0xb000 0x1000>;
                                interrupts-extended = <&vic 23 &sic 2>;
+                               clocks = <&xtal24mhz>, <&pclk>;
+                               clock-names = "mclk", "apb_pclk";
                        };
                };
        };