Commit 5d3a0a95 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/cleanup2' into HEAD 

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
	arch/arm/mach-bcmring/arch.c
	arch/arm/mach-tegra/devices.c
	arch/arm/mach-tegra/dma.c
parents 7e95c548 b98138e0

MAINTAINERS

+0 −16
Original line number Diff line number Diff line
@@ -657,22 +657,6 @@ W: http://www.linux4sam.org 
S:	Supported

F:	arch/arm/mach-at91/



ARM/BCMRING ARM ARCHITECTURE

M:	Jiandong Zheng <jdzheng@broadcom.com>

M:	Scott Branden <sbranden@broadcom.com>

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

S:	Maintained

F:	arch/arm/mach-bcmring



ARM/BCMRING MTD NAND DRIVER

M:	Jiandong Zheng <jdzheng@broadcom.com>

M:	Scott Branden <sbranden@broadcom.com>

L:	linux-mtd@lists.infradead.org

S:	Maintained

F:	drivers/mtd/nand/bcm_umi_nand.c

F:	drivers/mtd/nand/bcm_umi_bch.c

F:	drivers/mtd/nand/nand_bcm_umi.h



ARM/CALXEDA HIGHBANK ARCHITECTURE

M:	Rob Herring <rob.herring@calxeda.com>

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

arch/arm/Kconfig

+2 −14
Original line number Diff line number Diff line
@@ -364,18 +364,6 @@ config ARCH_BCM2835 
	  This enables support for the Broadcom BCM2835 SoC. This SoC is

	  use in the Raspberry Pi, and Roku 2 devices.



config ARCH_BCMRING

	bool "Broadcom BCMRING"

	depends on MMU

	select CPU_V6

	select ARM_AMBA

	select ARM_TIMER_SP804

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	help

	  Support for Broadcom's BCMRing platform.



config ARCH_HIGHBANK

	bool "Calxeda Highbank-based"

	select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -398,6 +386,8 @@ config ARCH_CLPS711X 
	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"

	select CPU_ARM720T

	select ARCH_USES_GETTIMEOFFSET

	select COMMON_CLK

	select CLKDEV_LOOKUP

	select NEED_MACH_MEMORY_H

	help

	  Support for Cirrus Logic 711x/721x/731x based boards.
@@ -1033,8 +1023,6 @@ source "arch/arm/mach-mvebu/Kconfig" 


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



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



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



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

arch/arm/Makefile

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

machine-$(CONFIG_ARCH_AT91)		:= at91

machine-$(CONFIG_ARCH_BCM2835)		:= bcm2835

machine-$(CONFIG_ARCH_BCMRING)		:= bcmring

machine-$(CONFIG_ARCH_CLPS711X)		:= clps711x

machine-$(CONFIG_ARCH_CNS3XXX)		:= cns3xxx

machine-$(CONFIG_ARCH_DAVINCI)		:= davinci

arch/arm/configs/bcmring_defconfig

deleted100644 → 0
+0 −79
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_EXPERT=y

CONFIG_KALLSYMS_EXTRA_PASS=y

# CONFIG_HOTPLUG is not set

# CONFIG_ELF_CORE is not set

# CONFIG_EPOLL is not set

# CONFIG_SIGNALFD is not set

# CONFIG_TIMERFD is not set

# CONFIG_EVENTFD is not set

# CONFIG_AIO is not set

CONFIG_PERF_EVENTS=y

# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_BCMRING=y

CONFIG_BCM_ZRELADDR=0x8000

CONFIG_CPU_32v6K=y

CONFIG_NO_HZ=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_UACCESS_WITH_MEMCPY=y

CONFIG_ZBOOT_ROM_TEXT=0x0e000000

CONFIG_ZBOOT_ROM_BSS=0x0ea00000

CONFIG_ZBOOT_ROM=y

CONFIG_NET=y

# CONFIG_WIRELESS is not set

CONFIG_MTD=y

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_GEOMETRY=y

# CONFIG_MTD_CFI_I2 is not set

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_VERIFY_WRITE=y

CONFIG_MTD_NAND_BCM_UMI=y

CONFIG_MTD_NAND_BCM_UMI_HWCS=y

# CONFIG_MISC_DEVICES is not set

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_CONSOLE_TRANSLATIONS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_LEGACY_PTY_COUNT=64

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_FILE_LOCKING is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

# CONFIG_PROC_PAGE_MONITOR is not set

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_SUMMARY=y

CONFIG_JFFS2_FS_XATTR=y

# CONFIG_JFFS2_FS_SECURITY is not set

# CONFIG_NETWORK_FILESYSTEMS is not set

# CONFIG_ENABLE_WARN_DEPRECATED is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_HEADERS_CHECK=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_ARM_UNWIND is not set

arch/arm/mach-bcmring/Kconfig

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
choice

	prompt "Processor selection in BCMRING family of devices"

	depends on ARCH_BCMRING

	default ARCH_BCM11107



config ARCH_FPGA11107

	bool "FPGA11107"



config ARCH_BCM11107

	bool "BCM11107"

endchoice



menu "BCMRING Options"

	depends on ARCH_BCMRING



config BCM_ZRELADDR

	hex "Compressed ZREL ADDR"



endmenu