Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21b9554e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

- BCM Mobile SMP support
- BRCM STB platform support

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

:
  MAINTAINERS: add entry for Broadcom ARM STB architecture
  ARM: brcmstb: select GISB arbiter and interrupt drivers
  ARM: brcmstb: add infrastructure for ARM-based Broadcom STB SoCs
  ARM: configs: enable SMP in bcm_defconfig
  ARM: add SMP support for Broadcom mobile SoCs

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5be42f33 2df94fd6

MAINTAINERS

+8 −0
Original line number Original line Diff line number Diff line
@@ -1978,6 +1978,14 @@ F: arch/arm/mach-bcm/bcm_5301x.c 
F:	arch/arm/boot/dts/bcm5301x.dtsi

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

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

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





BROADCOM BCM7XXX ARM ARCHITECTURE

M:	Marc Carino <marc.ceeeee@gmail.com>

M:	Brian Norris <computersforpeace@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-bcm/*brcmstb*

F:	arch/arm/boot/dts/bcm7*.dts*



BROADCOM TG3 GIGABIT ETHERNET DRIVER

BROADCOM TG3 GIGABIT ETHERNET DRIVER

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

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

M:	Michael Chan <mchan@broadcom.com>

M:	Michael Chan <mchan@broadcom.com>

arch/arm/configs/bcm_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_ARCH_BCM=y

CONFIG_ARCH_BCM=y

CONFIG_ARCH_BCM_MOBILE=y

CONFIG_ARCH_BCM_MOBILE=y

CONFIG_ARM_THUMBEE=y

CONFIG_ARM_THUMBEE=y

CONFIG_SMP=y

CONFIG_PREEMPT=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_AEABI=y

# CONFIG_COMPACTION is not set

# CONFIG_COMPACTION is not set

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ CONFIG_MACH_DOVE=y 
CONFIG_ARCH_BCM=y

CONFIG_ARCH_BCM=y

CONFIG_ARCH_BCM_MOBILE=y

CONFIG_ARCH_BCM_MOBILE=y

CONFIG_ARCH_BCM_5301X=y

CONFIG_ARCH_BCM_5301X=y

CONFIG_ARCH_BRCMSTB=y

CONFIG_ARCH_BERLIN=y

CONFIG_ARCH_BERLIN=y

CONFIG_MACH_BERLIN_BG2=y

CONFIG_MACH_BERLIN_BG2=y

CONFIG_MACH_BERLIN_BG2CD=y

CONFIG_MACH_BERLIN_BG2CD=y

arch/arm/mach-bcm/Kconfig

+31 −3
Original line number Original line Diff line number Diff line
@@ -9,7 +9,6 @@ config ARCH_BCM_MOBILE 
	bool "Broadcom Mobile SoC Support" if ARCH_MULTI_V7

	bool "Broadcom Mobile SoC Support" if ARCH_MULTI_V7

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select ARM_ERRATA_754322

	select ARM_ERRATA_754322

	select ARM_ERRATA_764369 if SMP

	select ARM_ERRATA_775420

	select ARM_ERRATA_775420

	select ARM_GIC

	select ARM_GIC

	select GPIO_BCM_KONA

	select GPIO_BCM_KONA
@@ -26,16 +25,18 @@ menu "Broadcom Mobile SoC Selection" 
config ARCH_BCM_281XX

config ARCH_BCM_281XX

	bool "Broadcom BCM281XX SoC family"

	bool "Broadcom BCM281XX SoC family"

	default y

	default y

	select HAVE_SMP

	help

	help

	  Enable support for the the BCM281XX family, which includes

	  Enable support for the BCM281XX family, which includes

	  BCM11130, BCM11140, BCM11351, BCM28145 and BCM28155

	  BCM11130, BCM11140, BCM11351, BCM28145 and BCM28155

	  variants.

	  variants.





config ARCH_BCM_21664

config ARCH_BCM_21664

	bool "Broadcom BCM21664 SoC family"

	bool "Broadcom BCM21664 SoC family"

	default y

	default y

	select HAVE_SMP

	help

	help

	  Enable support for the the BCM21664 family, which includes

	  Enable support for the BCM21664 family, which includes

	  BCM21663 and BCM21664 variants.

	  BCM21663 and BCM21664 variants.





config ARCH_BCM_MOBILE_L2_CACHE

config ARCH_BCM_MOBILE_L2_CACHE
@@ -49,6 +50,17 @@ config ARCH_BCM_MOBILE_SMC 
	bool

	bool

	depends on ARCH_BCM_281XX || ARCH_BCM_21664

	depends on ARCH_BCM_281XX || ARCH_BCM_21664





config ARCH_BCM_MOBILE_SMP

	bool "Broadcom mobile SoC SMP support"

	depends on (ARCH_BCM_281XX || ARCH_BCM_21664) && SMP

	default y

	select HAVE_ARM_SCU

	select ARM_ERRATA_764369

	help

	  SMP support for the BCM281XX and BCM21664 SoC families.

	  Provided as an option so SMP support for SoCs of this type

	  can be disabled for an SMP-enabled kernel.



endmenu

endmenu





endif

endif
@@ -87,4 +99,20 @@ config ARCH_BCM_5301X 
	  different SoC or with the older BCM47XX and BCM53XX based

	  different SoC or with the older BCM47XX and BCM53XX based

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

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





config ARCH_BRCMSTB

	bool "Broadcom BCM7XXX based boards" if ARCH_MULTI_V7

	depends on MMU

	select ARM_GIC

	select MIGHT_HAVE_PCI

	select HAVE_SMP

	select HAVE_ARM_ARCH_TIMER

	select BRCMSTB_GISB_ARB

	select BRCMSTB_L2_IRQ

	help

	  Say Y if you intend to run the kernel on a Broadcom ARM-based STB

	  chipset.



	  This enables support for Broadcom ARM-based set-top box chipsets,

	  including the 7445 family of chips.



endif
 
endif

arch/arm/mach-bcm/Makefile

+8 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,9 @@ obj-$(CONFIG_ARCH_BCM_281XX) += board_bcm281xx.o 
# BCM21664

# BCM21664

obj-$(CONFIG_ARCH_BCM_21664)	+= board_bcm21664.o

obj-$(CONFIG_ARCH_BCM_21664)	+= board_bcm21664.o





# BCM281XX and BCM21664 SMP support

obj-$(CONFIG_ARCH_BCM_MOBILE_SMP) += kona_smp.o



# BCM281XX and BCM21664 L2 cache control

# BCM281XX and BCM21664 L2 cache control

obj-$(CONFIG_ARCH_BCM_MOBILE_L2_CACHE) += kona_l2_cache.o

obj-$(CONFIG_ARCH_BCM_MOBILE_L2_CACHE) += kona_l2_cache.o
@@ -30,3 +33,8 @@ obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o 




# BCM5301X

# BCM5301X

obj-$(CONFIG_ARCH_BCM_5301X)	+= bcm_5301x.o

obj-$(CONFIG_ARCH_BCM_5301X)	+= bcm_5301x.o



ifeq ($(CONFIG_ARCH_BRCMSTB),y)

obj-y				+= brcmstb.o

obj-$(CONFIG_SMP)		+= headsmp-brcmstb.o platsmp-brcmstb.o

endif