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

Commit 928a11ba authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'next/cleanup' into samsung/dt 



Conflicts:
	arch/arm/mach-exynos/common.c

The common.c file gets changes from rmk/stable-devel (part of
next/cleanup), rmk/restart, samsung/dt and follow-on branches
from the samsung tree.

Pulling it all together here hopefully avoids having to do
even more conflicting merge changesets in this one file. What
a mess!

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 237c78be 40ba95fd

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -5114,6 +5114,15 @@ L: linux-mtd@lists.infradead.org 
S:	Maintained

F:	drivers/mtd/devices/phram.c



PICOXCELL SUPPORT

M:	Jamie Iles <jamie@jamieiles.com>

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

T:	git git://github.com/jamieiles/linux-2.6-ji.git

S:	Supported

F:	arch/arm/mach-picoxcell

F:	drivers/*/picoxcell*

F:	drivers/*/*/picoxcell*



PIN CONTROL SUBSYSTEM

M:	Linus Walleij <linus.walleij@linaro.org>

S:	Maintained

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -658,6 +658,7 @@ config ARCH_PICOXCELL 
	select HAVE_SCHED_CLOCK

	select HAVE_TCM

	select NO_IOPORT

	select SPARSE_IRQ

	select USE_OF

	help

	  This enables support for systems based on the Picochip picoXcell
@@ -892,7 +893,6 @@ config ARCH_U300 
	select HAVE_MACH_CLKDEV

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select NEED_MACH_MEMORY_H

	help

	  Support for ST-Ericsson U300 series mobile platforms.

arch/arm/Kconfig.debug

+45 −0
Original line number Diff line number Diff line
@@ -100,6 +100,14 @@ choice 
		  Note that the system will appear to hang during boot if there

		  is nothing connected to read from the DCC.



	config AT91_DEBUG_LL_DBGU0

		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"

		depends on HAVE_AT91_DBGU0



	config AT91_DEBUG_LL_DBGU1

		bool "Kernel low-level debugging on 9263, 9g45 and cap9"

		depends on HAVE_AT91_DBGU1



	config DEBUG_FOOTBRIDGE_COM1

		bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"

		depends on FOOTBRIDGE
@@ -247,6 +255,43 @@ choice 
		  their output to the standard serial port on the RealView

		  PB1176 platform.



	config DEBUG_MSM_UART1

		bool "Kernel low-level debugging messages via MSM UART1"

		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the first serial port on MSM devices.



	config DEBUG_MSM_UART2

		bool "Kernel low-level debugging messages via MSM UART2"

		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the second serial port on MSM devices.



	config DEBUG_MSM_UART3

		bool "Kernel low-level debugging messages via MSM UART3"

		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the third serial port on MSM devices.



	config DEBUG_MSM8660_UART

		bool "Kernel low-level debugging messages via MSM 8660 UART"

		depends on ARCH_MSM8X60

		select MSM_HAS_DEBUG_UART_HS

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the serial port on MSM 8660 devices.



	config DEBUG_MSM8960_UART

		bool "Kernel low-level debugging messages via MSM 8960 UART"

		depends on ARCH_MSM8960

		select MSM_HAS_DEBUG_UART_HS

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the serial port on MSM 8960 devices.



endchoice



config EARLY_PRINTK

arch/arm/configs/pcontrol_g20_defconfig

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

CONFIG_CROSS_COMPILE="/opt/arm-2010q1/bin/arm-none-linux-gnueabi-"

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_TREE_PREEMPT_RCU=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_NAMESPACES=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_KALLSYMS is not set

# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

CONFIG_DEFAULT_DEADLINE=y

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91SAM9G20=y

CONFIG_MACH_PCONTROL_G20=y

CONFIG_AT91_PROGRAMMABLE_CLOCKS=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttyS0,115200 mem=128M mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) root=/dev/mmcblk0p1 rootwait rw"

CONFIG_VFP=y

CONFIG_BINFMT_MISC=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_VLAN_8021Q=y

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_COMPLEX_MAPPINGS=y

CONFIG_MTD_PHRAM=m

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_ATMEL_TCLIB=y

CONFIG_EEPROM_AT24=m

CONFIG_SCSI=m

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=m

CONFIG_SCSI_MULTI_LUN=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_MACVLAN=m

CONFIG_TUN=m

CONFIG_SMSC_PHY=m

CONFIG_BROADCOM_PHY=m

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

CONFIG_MACB=y

CONFIG_SMSC911X=m

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

CONFIG_PPP=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPP_MPPE=m

CONFIG_INPUT_POLLDEV=y

CONFIG_INPUT_SPARSEKMAP=y

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=m

CONFIG_INPUT_EVBUG=m

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_GPIO=m

CONFIG_KEYBOARD_MATRIX=m

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_UINPUT=m

CONFIG_INPUT_GPIO_ROTARY_ENCODER=m

# CONFIG_SERIO is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

CONFIG_SERIAL_MAX3100=m

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_R3964=m

CONFIG_I2C=m

CONFIG_I2C_CHARDEV=m

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_I2C_GPIO=m

CONFIG_SPI=y

CONFIG_SPI_ATMEL=m

CONFIG_SPI_SPIDEV=m

CONFIG_GPIO_SYSFS=y

CONFIG_W1=m

CONFIG_W1_MASTER_GPIO=m

CONFIG_W1_SLAVE_DS2431=m

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_AT91SAM9X_WATCHDOG=y

# CONFIG_MFD_SUPPORT is not set

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=m

CONFIG_USB_LIBUSUAL=y

CONFIG_USB_SERIAL=m

CONFIG_USB_SERIAL_GENERIC=y

CONFIG_USB_SERIAL_FTDI_SIO=m

CONFIG_USB_SERIAL_PL2303=m

CONFIG_USB_GADGET=y

CONFIG_USB_ZERO=m

CONFIG_USB_ETH=m

CONFIG_USB_FILE_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_USB_G_HID=m

CONFIG_MMC=y

CONFIG_MMC_UNSAFE_RESUME=y

CONFIG_MMC_ATMELMCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_AT91SAM9=y

CONFIG_AUXDISPLAY=y

CONFIG_UIO=y

CONFIG_UIO_PDRV=y

CONFIG_STAGING=y

# CONFIG_STAGING_EXCLUDE_BUILD is not set

CONFIG_IIO=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V4=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_15=y

CONFIG_NLS_UTF8=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_CRYPTO=y

CONFIG_CRYPTO_ANSI_CPRNG=y

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC_CCITT=y

arch/arm/mach-at91/Kconfig

+22 −2
Original line number Diff line number Diff line
@@ -3,6 +3,12 @@ if ARCH_AT91 
config HAVE_AT91_DATAFLASH_CARD

	bool



config HAVE_AT91_DBGU0

	bool



config HAVE_AT91_DBGU1

	bool



config HAVE_AT91_USART3

	bool
@@ -21,12 +27,14 @@ config ARCH_AT91RM9200 
	bool "AT91RM9200"

	select CPU_ARM920T

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_DBGU0

	select HAVE_AT91_USART3



config ARCH_AT91SAM9260

	bool "AT91SAM9260 or AT91SAM9XE"

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_DBGU0

	select HAVE_AT91_USART3

	select HAVE_AT91_USART4

	select HAVE_AT91_USART5
@@ -37,11 +45,13 @@ config ARCH_AT91SAM9261 
	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select HAVE_FB_ATMEL

	select HAVE_AT91_DBGU0



config ARCH_AT91SAM9G10

	bool "AT91SAM9G10"

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_DBGU0

	select HAVE_FB_ATMEL



config ARCH_AT91SAM9263
@@ -50,6 +60,7 @@ config ARCH_AT91SAM9263 
	select GENERIC_CLOCKEVENTS

	select HAVE_FB_ATMEL

	select HAVE_NET_MACB

	select HAVE_AT91_DBGU1



config ARCH_AT91SAM9RL

	bool "AT91SAM9RL"
@@ -57,11 +68,13 @@ config ARCH_AT91SAM9RL 
	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_USART3

	select HAVE_FB_ATMEL

	select HAVE_AT91_DBGU0



config ARCH_AT91SAM9G20

	bool "AT91SAM9G20"

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_DBGU0

	select HAVE_AT91_USART3

	select HAVE_AT91_USART4

	select HAVE_AT91_USART5
@@ -74,6 +87,7 @@ config ARCH_AT91SAM9G45 
	select HAVE_AT91_USART3

	select HAVE_FB_ATMEL

	select HAVE_NET_MACB

	select HAVE_AT91_DBGU1



config ARCH_AT91CAP9

	bool "AT91CAP9"
@@ -81,6 +95,7 @@ config ARCH_AT91CAP9 
	select GENERIC_CLOCKEVENTS

	select HAVE_FB_ATMEL

	select HAVE_NET_MACB

	select HAVE_AT91_DBGU1



config ARCH_AT91X40

	bool "AT91x40"
@@ -510,8 +525,13 @@ config AT91_TIMER_HZ 
choice

	prompt "Select a UART for early kernel messages"



config AT91_EARLY_DBGU

	bool "DBGU"

config AT91_EARLY_DBGU0

	bool "DBGU on rm9200, 9260/9g20, 9261/9g10 and 9rl"

	depends on HAVE_AT91_DBGU0



config AT91_EARLY_DBGU1

	bool "DBGU on 9263, 9g45 and cap9"

	depends on HAVE_AT91_DBGU1



config AT91_EARLY_USART0

	bool "USART0"