Commit 07cb1ec1 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'armsoc/for-3.15/soc-2' of git://github.com/broadcom/mach-bcm into next/soc 

Merge "ARM: mach-bcm soc updates" from Matt Porter:

- add BCM5301x support
- remove GENERIC_TIME

* tag 'armsoc/for-3.15/soc-2' of git://github.com/broadcom/mach-bcm

:
  ARM: BCM5301X: workaround suppress fault
  ARM: BCM5301X: add early debugging support
  ARM: BCM5301X: initial support for the BCM5301X/BCM470X SoCs with ARM CPU
  ARM: mach-bcm: Remove GENERIC_TIME

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 42dc836d fdf4850c

Documentation/devicetree/bindings/arm/bcm4708.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
Broadcom BCM4708 device tree bindings

-------------------------------------------



Boards with the BCM4708 SoC shall have the following properties:



Required root node property:



compatible = "brcm,bcm4708";

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -1889,6 +1889,14 @@ F: arch/arm/boot/dts/bcm2835* 
F:	arch/arm/configs/bcm2835_defconfig

F:	drivers/*/*bcm2835*



BROADCOM BCM5301X ARM ARCHICTURE

M:	Hauke Mehrtens <hauke@hauke-m.de>

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	arch/arm/mach-bcm/bcm_5301x.c

F:	arch/arm/boot/dts/bcm5301x.dtsi

F:	arch/arm/boot/dts/bcm470*



BROADCOM TG3 GIGABIT ETHERNET DRIVER

M:	Nithin Nayak Sujir <nsujir@broadcom.com>

M:	Michael Chan <mchan@broadcom.com>

arch/arm/Kconfig.debug

+7 −0
Original line number Diff line number Diff line
@@ -106,6 +106,11 @@ choice 
		depends on ARCH_BCM2835

		select DEBUG_UART_PL01X



	config DEBUG_BCM_5301X

		bool "Kernel low-level debugging on BCM5301X UART1"

		depends on ARCH_BCM_5301X

		select DEBUG_UART_PL01X



	config DEBUG_BCM_KONA_UART

		bool "Kernel low-level debugging messages via BCM KONA UART"

		depends on ARCH_BCM
@@ -1023,6 +1028,7 @@ config DEBUG_UART_PHYS 
	default 0x101f1000 if ARCH_VERSATILE

	default 0x101fb000 if DEBUG_NOMADIK_UART

	default 0x16000000 if ARCH_INTEGRATOR

	default 0x18000300 if DEBUG_BCM_5301X

	default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1

	default 0x20060000 if DEBUG_RK29_UART0

	default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
@@ -1071,6 +1077,7 @@ config DEBUG_UART_VIRT 
	default 0xf0009000 if DEBUG_CNS3XXX

	default 0xf01fb000 if DEBUG_NOMADIK_UART

	default 0xf0201000 if DEBUG_BCM2835

	default 0xf1000300 if DEBUG_BCM_5301X

	default 0xf11f1000 if ARCH_VERSATILE

	default 0xf1600000 if ARCH_INTEGRATOR

	default 0xf1c28000 if DEBUG_SUNXI_UART0

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ CONFIG_ARCH_MVEBU=y 
CONFIG_MACH_ARMADA_370=y

CONFIG_MACH_ARMADA_XP=y

CONFIG_ARCH_BCM=y

CONFIG_ARCH_BCM_5301X=y

CONFIG_ARCH_BCM_MOBILE=y

CONFIG_ARCH_BERLIN=y

CONFIG_MACH_BERLIN_BG2=y

arch/arm/mach-bcm/Kconfig

+26 −0
Original line number Diff line number Diff line
@@ -27,6 +27,32 @@ config ARCH_BCM_MOBILE 
	  BCM11130, BCM11140, BCM11351, BCM28145 and

	  BCM28155 variants.



config ARCH_BCM_5301X

	bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7

	depends on MMU

	select ARM_GIC

	select CACHE_L2X0

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_SMP

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select ARM_GLOBAL_TIMER

	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK

	select MIGHT_HAVE_PCI

	help

	  Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores.



	  This is a network SoC line mostly used in home routers and

	  wifi access points, it's internal name is Northstar.

	  This inclused the following SoC: BCM53010, BCM53011, BCM53012,

	  BCM53014, BCM53015, BCM53016, BCM53017, BCM53018, BCM4707,

	  BCM4708 and BCM4709.



	  Do not confuse this with the BCM4760 which is a totally

	  different SoC or with the older BCM47XX and BCM53XX based

	  network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx



endmenu



endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE