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

Commit 2192482e authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of... 

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
	arch/arm/Kconfig
parents 500b9fc9 a68fefe0

arch/arm/Kconfig

+32 −6
Original line number Diff line number Diff line
@@ -636,6 +636,7 @@ config ARCH_S3C2410 
	select ARCH_HAS_CPUFREQ

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	help

	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics

	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -665,6 +666,8 @@ config ARCH_S3C64XX 
	select S3C_DEV_NAND

	select USB_ARCH_HAS_OHCI

	select SAMSUNG_GPIOLIB_4BIT

	select HAVE_S3C2410_I2C

	select HAVE_S3C2410_WATCHDOG

	help

	  Samsung S3C64XX series based systems
@@ -673,7 +676,10 @@ config ARCH_S5P6440 
	select CPU_V6

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_S3C2410_WATCHDOG

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC

	help

	  Samsung S5P6440 CPU based systems
@@ -683,6 +689,7 @@ config ARCH_S5P6442 
	select GENERIC_GPIO

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_WATCHDOG

	help

	  Samsung S5P6442 CPU based systems
@@ -693,6 +700,9 @@ config ARCH_S5PC100 
	select CPU_V7

	select ARM_L1_CACHE_SHIFT_6

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC

	select HAVE_S3C2410_WATCHDOG

	help

	  Samsung S5PC100 series based systems
@@ -703,9 +713,21 @@ config ARCH_S5PV210 
	select HAVE_CLK

	select ARM_L1_CACHE_SHIFT_6

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC

	select HAVE_S3C2410_WATCHDOG

	help

	  Samsung S5PV210/S5PC110 series based systems



config ARCH_S5PV310

	bool "Samsung S5PV310/S5PC210"

	select CPU_V7

	select GENERIC_GPIO

	select HAVE_CLK

	select GENERIC_CLOCKEVENTS

	help

	  Samsung S5PV310 series based systems



config ARCH_SHARK

	bool "Shark"

	select CPU_SA110
@@ -907,6 +929,8 @@ source "arch/arm/mach-s5pc100/Kconfig" 


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



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



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



source "arch/arm/plat-stmp3xxx/Kconfig"
@@ -1098,10 +1122,11 @@ config SMP 
	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\

		 ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

		 ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_S5PV310)

	depends on GENERIC_CLOCKEVENTS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 ||\

			ARCH_S5PV310)

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If
@@ -1171,9 +1196,9 @@ config LOCAL_TIMERS 
	bool "Use local timer interrupts"

	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \

		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	default y

	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || ARCH_U8500)

		ARCH_S5PV310 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \

		ARCH_U8500 || ARCH_VEXPRESS)

	help

	  Enable support for local timers on SMP platforms, rather then the

	  legacy IPI broadcast method.  Local timers allows the system
@@ -1184,7 +1209,8 @@ source kernel/Kconfig.preempt 


config HZ

	int

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || \

		ARCH_S5P6442 || ARCH_S5PV210 || ARCH_S5PV310

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default AT91_TIMER_HZ if ARCH_AT91

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ machine-$(CONFIG_ARCH_S5P6440) := s5p6440 
machine-$(CONFIG_ARCH_S5P6442)		:= s5p6442

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

machine-$(CONFIG_ARCH_S5PV210)		:= s5pv210

machine-$(CONFIG_ARCH_S5PV310)		:= s5pv310

machine-$(CONFIG_ARCH_SA1100)		:= sa1100

machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile

arch/arm/configs/s5pc110_defconfig

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

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_KALLSYMS_ALL=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_S5PV210=y

CONFIG_S3C_LOWLEVEL_UART_PORT=1

CONFIG_MACH_SMDKC110=y

CONFIG_VMSPLIT_2G=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc"

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

# CONFIG_MISC_DEVICES is not set

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_SAMSUNG=y

CONFIG_SERIAL_SAMSUNG_CONSOLE=y

CONFIG_HW_RANDOM=y

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_INOTIFY=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_CRAMFS=y

CONFIG_ROMFS_FS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_BSD_DISKLABEL=y

CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_DEBUG_PREEMPT is not set

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_SPINLOCK_SLEEP=y

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_DEBUG_S3C_UART=1

CONFIG_CRC_CCITT=y

arch/arm/configs/s5pv210_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -7,6 +7,11 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_S5PV210=y

CONFIG_S3C_LOWLEVEL_UART_PORT=1

CONFIG_S3C_DEV_FB=y

CONFIG_S5PV210_SETUP_FB_24BPP=y

CONFIG_MACH_AQUILA=y

CONFIG_MACH_GONI=y

CONFIG_MACH_SMDKC110=y

CONFIG_MACH_SMDKV210=y

CONFIG_VMSPLIT_2G=y

CONFIG_PREEMPT=y

arch/arm/mach-s3c64xx/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -57,11 +57,21 @@ config S3C64XX_SETUP_I2C1 
	help

	  Common setup code for i2c bus 1.



config S3C64XX_SETUP_IDE

	bool

	help

	  Common setup code for S3C64XX IDE.



config S3C64XX_SETUP_FB_24BPP

	bool

	help

	  Common setup code for S3C64XX with an 24bpp RGB display helper.



config S3C64XX_SETUP_KEYPAD

	bool

	help

	  Common setup code for S3C64XX KEYPAD GPIO configurations



config S3C64XX_SETUP_SDHCI_GPIO

	bool

	help
@@ -95,15 +105,20 @@ config MACH_SMDK6410 
	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_I2C1

	select SAMSUNG_DEV_IDE

	select S3C_DEV_FB

	select S3C_DEV_RTC

	select SAMSUNG_DEV_TS

	select S3C_DEV_USB_HOST

	select S3C_DEV_USB_HSOTG

	select S3C_DEV_WDT

	select SAMSUNG_DEV_KEYPAD

	select HAVE_S3C2410_WATCHDOG

	select S3C64XX_SETUP_SDHCI

	select S3C64XX_SETUP_I2C1

	select S3C64XX_SETUP_IDE

	select S3C64XX_SETUP_FB_24BPP

	select S3C64XX_SETUP_KEYPAD

	help

	  Machine support for the Samsung SMDK6410