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

Commit 0daba17d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'bcm2835-for-3.15-soc' of... 

Merge tag 'bcm2835-for-3.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/cleanup

Merge "ARM: bcm2835: consolidate into mach-bcm/" from Stephen Warren:

This pull request consists of a single patch which moves files from
arch/arm/mach-bcm2835 into mach-bcm, thus consolidating them with
support for other Broadcom chips.

* tag 'bcm2835-for-3.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi

:
  ARM: bcm2835: Move to mach-bcm directory

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 50776b6c d30fe627

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1883,7 +1883,7 @@ M: Stephen Warren <swarren@wwwdotorg.org> 
L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git

S:	Maintained

F:	arch/arm/mach-bcm2835/

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

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

F:	arch/arm/configs/bcm2835_defconfig

F:	drivers/*/*bcm2835*

arch/arm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -943,8 +943,6 @@ source "arch/arm/mach-at91/Kconfig" 


source "arch/arm/mach-bcm/Kconfig"



source "arch/arm/mach-bcm2835/Kconfig"



source "arch/arm/mach-berlin/Kconfig"



source "arch/arm/mach-clps711x/Kconfig"

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 
# by CONFIG_* macro name.

machine-$(CONFIG_ARCH_AT91)		+= at91

machine-$(CONFIG_ARCH_BCM)		+= bcm

machine-$(CONFIG_ARCH_BCM2835)		+= bcm2835

machine-$(CONFIG_ARCH_BERLIN)		+= berlin

machine-$(CONFIG_ARCH_CLPS711X)		+= clps711x

machine-$(CONFIG_ARCH_CNS3XXX)		+= cns3xxx

arch/arm/configs/bcm2835_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ CONFIG_OPROFILE=y 
CONFIG_JUMP_LABEL=y

CONFIG_ARCH_MULTI_V6=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_BCM=y

CONFIG_ARCH_BCM2835=y

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_AEABI=y

arch/arm/mach-bcm/Kconfig

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

	  BCM28155 variants.



config ARCH_BCM2835

	bool "Broadcom BCM2835 family" if ARCH_MULTI_V6

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select ARM_ERRATA_411920

	select ARM_TIMER_SP804

	select CLKDEV_LOOKUP

	select CLKSRC_OF

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	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.



endmenu



endif