Commit fc2f669e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'bcm2835-soc-next-2015-12-28' of http://github.com/anholt/linux into next/soc 

Merge "BCM2835 SOC changes for 4.5" from Eric Anholt:

This pull request includes the bcm2835 changes for 4.5 targeting the
arm-soc next/soc branch.

* tag 'bcm2835-soc-next-2015-12-28' of http://github.com/anholt/linux:
  ARM: bcm2835: Add Kconfig support for bcm2836
  ARM: bcm2835: Add a compat string for bcm2836 machine probe
  dt-bindings: Add root properties for Raspberry Pi 2

Conflicts:
	arch/arm/mach-bcm/Kconfig
parents 2bc75dbf 5234c34e

Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ Raspberry Pi Model B+ 
Required root node properties:

compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";



Raspberry Pi 2 Model B

Required root node properties:

compatible = "raspberrypi,2-model-b", "brcm,bcm2836";



Raspberry Pi Compute Module

Required root node properties:

compatible = "raspberrypi,compute-module", "brcm,bcm2835";

arch/arm/Kconfig.debug

+8 −2
Original line number Diff line number Diff line
@@ -143,7 +143,12 @@ choice 


	config DEBUG_BCM2835

		bool "Kernel low-level debugging on BCM2835 PL011 UART"

		depends on ARCH_BCM2835

		depends on ARCH_BCM2835 && ARCH_MULTI_V6

		select DEBUG_UART_PL01X



	config DEBUG_BCM2836

		bool "Kernel low-level debugging on BCM2836 PL011 UART"

		depends on ARCH_BCM2835 && ARCH_MULTI_V7

		select DEBUG_UART_PL01X



	config DEBUG_BCM_5301X
@@ -1402,6 +1407,7 @@ config DEBUG_UART_PHYS 
	default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2

	default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3

	default 0x20201000 if DEBUG_BCM2835

	default 0x3f201000 if DEBUG_BCM2836

	default 0x3e000000 if DEBUG_BCM_KONA_UART

	default 0x4000e400 if DEBUG_LL_UART_EFM32

	default 0x40081000 if DEBUG_LPC18XX_UART0
@@ -1485,7 +1491,7 @@ config DEBUG_UART_VIRT 
	default 0xf0000be0 if ARCH_EBSA110

	default 0xf0010000 if DEBUG_ASM9260_UART

	default 0xf01fb000 if DEBUG_NOMADIK_UART

	default 0xf0201000 if DEBUG_BCM2835

	default 0xf0201000 if DEBUG_BCM2835 || DEBUG_BCM2836

	default 0xf1000300 if DEBUG_BCM_5301X

	default 0xf1002000 if DEBUG_MT8127_UART0

	default 0xf1006000 if DEBUG_MT6589_UART0

arch/arm/mach-bcm/Kconfig

+5 −4
Original line number Diff line number Diff line
@@ -136,17 +136,18 @@ comment "Other Architectures" 


config ARCH_BCM2835

	bool "Broadcom BCM2835 family"

	depends on ARCH_MULTI_V6

	depends on ARCH_MULTI_V6 || ARCH_MULTI_V7

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select ARM_ERRATA_411920

	select ARM_ERRATA_411920 if ARCH_MULTI_V6

	select ARM_TIMER_SP804

	select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7

	select CLKSRC_OF

	select PINCTRL

	select PINCTRL_BCM2835

	help

	  This enables support for the Broadcom BCM2835 SoC. This SoC is

	  used in the Raspberry Pi and Roku 2 devices.

	  This enables support for the Broadcom BCM2835 and BCM2836 SoCs.

	  This SoC is used in the Raspberry Pi and Roku 2 devices.



config ARCH_BCM_63XX

	bool "Broadcom BCM63xx DSL SoC"

arch/arm/mach-bcm/board_bcm2835.c

+5 −0
Original line number Diff line number Diff line
@@ -36,7 +36,12 @@ static void __init bcm2835_init(void) 
}



static const char * const bcm2835_compat[] = {

#ifdef CONFIG_ARCH_MULTI_V6

	"brcm,bcm2835",

#endif

#ifdef CONFIG_ARCH_MULTI_V7

	"brcm,bcm2836",

#endif

	NULL

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE