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

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>

diff --cc arch/arm/boot/dts/bcm2835.dtsi
index 7e0481e2441ac49b96d33ec1491414562a3d9935,0db295ec8f62dbc1b5da9a896cd041e67a3b4b39..f0052dccf9a86858325bcaa98d9c34d8beec4e37
--- 1/arch/arm/boot/dts/bcm2835.dtsi
--- 2/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@@ -105,7 -120,14 +120,14 @@@
                        compatible = "fixed-clock";
                        reg = <1>;
                        #clock-cells = <0>;
 -                      clock-frequency = <150000000>;
 +                      clock-frequency = <250000000>;
                };
+ 
+               clk_spi: spi {
+                       compatible = "fixed-clock";
+                       reg = <2>;
+                       #clock-cells = <0>;
+                       clock-frequency = <250000000>;
+               };
        };
  };