Merge tag 'bcm2835-for-3.10-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/dt

From Stephen Warren <swarren@wwwdotorg.org>:

ARM: bcm2835: device tree updates

This branch adds two devices to the BCM2835 SoC device tree: the SPI
controller and the HW random number generator.

The SPI controller isn't actually instantiated in the Raspberry Pi
device tree, since there are no on-board SPI devices; it's up to the
end-user to modify their own device-tree to describe whatever they
have attached.

* tag 'bcm2835-for-3.10-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
  ARM: bcm2835: add Broadcom BCM2835 RNG to the device tree
  ARM: bcm2835: add SPI device to DT

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 22 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index 7e0481e2441a..f0052dccf9a8 100644
--- 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>;
+                };
         };
 };