Merge tag 'for-linus' of git://github.com/realmz/blackfin-linux

[~andy/linux] / arch / arm / boot / dts / bcm2835.dtsi

diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index 7e0481e2441ac49b96d33ec1491414562a3d9935..f0052dccf9a86858325bcaa98d9c34d8beec4e37 100644 (file)
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -34,6 +34,11 @@
                        reg = <0x7e100000 0x28>;
                };
 
+               rng {
+                       compatible = "brcm,bcm2835-rng";
+                       reg = <0x7e104000 0x10>;
+               };
+
                uart@20201000 {
                        compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
                        reg = <0x7e201000 0x1000>;
@@ -64,6 +69,16 @@
                        #interrupt-cells = <2>;
                };
 
+               spi: spi@20204000 {
+                       compatible = "brcm,bcm2835-spi";
+                       reg = <0x7e204000 0x1000>;
+                       interrupts = <2 22>;
+                       clocks = <&clk_spi>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
                i2c0: i2c@20205000 {
                        compatible = "brcm,bcm2835-i2c";
                        reg = <0x7e205000 0x1000>;
@@ -107,5 +122,12 @@
                        #clock-cells = <0>;
                        clock-frequency = <250000000>;
                };
+
+               clk_spi: spi {
+                       compatible = "fixed-clock";
+                       reg = <2>;
+                       #clock-cells = <0>;
+                       clock-frequency = <250000000>;
+               };
        };
 };