From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Apr 2013 05:09:34 +0000 (+1100)
Subject: Merge remote-tracking branch 'bcm2835/for-next'
X-Git-Tag: next-20130404~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c3e50e5bd3d567cbbcec371d979dafc22ac71c3a;p=karo-tx-linux.git

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

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

c3e50e5bd3d567cbbcec371d979dafc22ac71c3a
diff --cc arch/arm/Kconfig
index d18db93c9d0a,0d3daa62e8a8..52f3e2340792
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -362,26 -362,17 +362,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 e880cd7380c0,a877d5135d2e..d212ae0a179e
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -594,7 -583,7 +598,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 7e0481e2441a,0db295ec8f62..f0052dccf9a8
--- a/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>;
+ 		};
  	};
  };