Merge remote-tracking branch 'bcm2835/for-next'

Conflicts:
	arch/arm/Kconfig
	arch/arm/Kconfig.debug

diff --cc arch/arm/Kconfig
index aca2c23a1bbae0ed9c13a18cc515a7e052cbb599,0d3daa62e8a8ad84d43e9ad5fb43218dbdcfdc5e..5f7bfd20c42c38d0da17a188b230f9d4dccb722c
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -361,26 -362,17 +361,6 @@@ config ARCH_AT9
          This enables support for systems based on Atmel
          AT91RM9200 and AT91SAM9* processors.
  
- config ARCH_BCM2835
-       bool "Broadcom BCM2835 family"
-       select ARCH_REQUIRE_GPIOLIB
-       select ARM_AMBA
-       select ARM_ERRATA_411920
-       select ARM_TIMER_SP804
-       select CLKDEV_LOOKUP
-       select CLKSRC_OF
-       select COMMON_CLK
-       select CPU_V6
 -config ARCH_CNS3XXX
 -      bool "Cavium Networks CNS3XXX family"
 -      select ARM_GIC
 -      select CPU_V6K
--      select GENERIC_CLOCKEVENTS
-       select MULTI_IRQ_HANDLER
-       select PINCTRL
-       select PINCTRL_BCM2835
-       select SPARSE_IRQ
-       select USE_OF
 -      select MIGHT_HAVE_CACHE_L2X0
 -      select MIGHT_HAVE_PCI
 -      select PCI_DOMAINS if PCI
--      help
-         This enables support for the Broadcom BCM2835 SoC. This SoC is
-         use in the Raspberry Pi, and Roku 2 devices.
 -        Support for Cavium Networks CNS3XXX platform.
--
  config ARCH_CLPS711X
        bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
        select ARCH_REQUIRE_GPIOLIB

diff --cc arch/arm/Kconfig.debug
index 81022efe4c6e10609175a4bf9d4275d71be55ad3,a877d5135d2e664fd98d51c4b36d7f94d11113b4..52002db3fdbe4c7c913777aca2037c55050df4d3
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -593,7 -583,7 +597,8 @@@ endchoic
  
  config DEBUG_LL_INCLUDE
        string
+       default "debug/bcm2835.S" if DEBUG_BCM2835
 +      default "debug/cns3xxx.S" if DEBUG_CNS3XXX
        default "debug/icedcc.S" if DEBUG_ICEDCC
        default "debug/imx.S" if DEBUG_IMX1_UART || \
                                 DEBUG_IMX25_UART || \

diff --cc arch/arm/boot/dts/bcm2835.dtsi
index 7e0481e2441ac49b96d33ec1491414562a3d9935,3eb60f7aa1fe8b82cdb2482d8f0453ca89db9c7b..1b88ceae8f7450bd6abf7031a6d6c382e7789cb0
--- 1/arch/arm/boot/dts/bcm2835.dtsi
--- 2/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@@ -105,7 -115,14 +115,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>;
+               };
        };
  };