Commit 534baf55 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next/move' of git://git.linaro.org/people/arnd/arm-soc 

* 'next/move' of git://git.linaro.org/people/arnd/arm-soc:
  ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos
  ARM: EXYNOS4: convert MCT to percpu interrupt API
  ARM: SAMSUNG: Add clk enable/disable of pwm
  ARM: SAMSUNG: Fix compile error due to kfree
parents ddf8a0d3 83014579

arch/arm/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -837,8 +837,8 @@ config ARCH_S5PV210 
	help

	  Samsung S5PV210/S5PC110 series based systems



config ARCH_EXYNOS4

	bool "Samsung EXYNOS4"

config ARCH_EXYNOS

	bool "SAMSUNG EXYNOS"

	select CPU_V7

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_HAS_HOLES_MEMORYMODEL
@@ -852,7 +852,7 @@ config ARCH_EXYNOS4 
	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select NEED_MACH_MEMORY_H

	help

	  Samsung EXYNOS4 series based systems

	  Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)



config ARCH_SHARK

	bool "Shark"
@@ -1079,7 +1079,7 @@ source "arch/arm/mach-s5pc100/Kconfig" 


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



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

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



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

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx 
machine-$(CONFIG_ARCH_S5P64X0)		:= s5p64x0

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

machine-$(CONFIG_ARCH_S5PV210)		:= s5pv210

machine-$(CONFIG_ARCH_EXYNOS4)		:= exynos4

machine-$(CONFIG_ARCH_EXYNOS4)		:= exynos

machine-$(CONFIG_ARCH_SA1100)		:= sa1100

machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile

arch/arm/configs/exynos4_defconfig

+2 −7
Original line number Diff line number Diff line
@@ -4,19 +4,18 @@ CONFIG_KALLSYMS_ALL=y 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_EXYNOS4=y

CONFIG_ARCH_EXYNOS=y

CONFIG_S3C_LOWLEVEL_UART_PORT=1

CONFIG_MACH_SMDKC210=y

CONFIG_MACH_SMDKV310=y

CONFIG_MACH_ARMLEX4210=y

CONFIG_MACH_UNIVERSAL_C210=y

CONFIG_MACH_NURI=y

CONFIG_MACH_ORIGEN=y

CONFIG_MACH_SMDK4412=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_HOTPLUG_CPU=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
@@ -61,13 +60,9 @@ CONFIG_DETECT_HUNG_TASK=y 
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/mach-exynos4/Kconfig→arch/arm/mach-exynos/Kconfig

+31 −11
Original line number Diff line number Diff line 
# arch/arm/mach-exynos4/Kconfig

# arch/arm/mach-exynos/Kconfig

#

# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

#		http://www.samsung.com/
@@ -7,10 +7,27 @@ 


# Configuration options for the EXYNOS4



if ARCH_EXYNOS4

if ARCH_EXYNOS



menu "SAMSUNG EXYNOS SoCs Support"



choice

	prompt "EXYNOS System Type"

	default ARCH_EXYNOS4



config ARCH_EXYNOS4

	bool "SAMSUNG EXYNOS4"

	help

	  Samsung EXYNOS4 SoCs based systems



endchoice



comment "EXYNOS SoCs"



config CPU_EXYNOS4210

	bool

	bool "SAMSUNG EXYNOS4210"

	default y

	depends on ARCH_EXYNOS4

	select SAMSUNG_DMADEV

	select ARM_CPU_SUSPEND if PM

	select S5P_PM if PM
@@ -19,15 +36,18 @@ config CPU_EXYNOS4210 
	  Enable EXYNOS4210 CPU support



config SOC_EXYNOS4212

	bool

	select ARM_CPU_SUSPEND if PM

	bool "SAMSUNG EXYNOS4212"

	default y

	depends on ARCH_EXYNOS4

	select S5P_PM if PM

	select S5P_SLEEP if PM

	help

	  Enable EXYNOS4212 SoC support



config SOC_EXYNOS4412

	bool

	bool "SAMSUNG EXYNOS4412"

	default y

	depends on ARCH_EXYNOS4

	help

	  Enable EXYNOS4412 SoC support
@@ -125,7 +145,7 @@ config EXYNOS4_SETUP_USB_PHY 


# machine support



menu "EXYNOS4 Machines"

if ARCH_EXYNOS4



comment "EXYNOS4210 Boards"
@@ -305,12 +325,11 @@ config MACH_SMDK4412 
	select MACH_SMDK4212

	help

	  Machine support for Samsung SMDK4412

endif



endmenu



comment "Configuration for HSMMC bus width"

if ARCH_EXYNOS4



menu "Use 8-bit bus width"

comment "Configuration for HSMMC 8-bit bus width"



config EXYNOS4_SDHCI_CH0_8BIT

	bool "Channel 0 with 8-bit bus"
@@ -323,6 +342,7 @@ config EXYNOS4_SDHCI_CH2_8BIT 
	help

	  Support HSMMC Channel 2 8-bit bus.

	  If selected, Channel 3 is disabled.

endif



endmenu

arch/arm/mach-exynos4/Makefile→arch/arm/mach-exynos/Makefile

+5 −6
Original line number Diff line number Diff line 
# arch/arm/mach-exynos4/Makefile

# arch/arm/mach-exynos/Makefile

#

# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

#		http://www.samsung.com/
@@ -12,8 +12,8 @@ obj- := 


# Core support for EXYNOS4 system



obj-$(CONFIG_ARCH_EXYNOS4)	+= cpu.o init.o clock.o irq-combiner.o

obj-$(CONFIG_ARCH_EXYNOS4)	+= setup-i2c0.o irq-eint.o dma.o pmu.o

obj-$(CONFIG_ARCH_EXYNOS4)	+= cpu.o init.o clock.o irq-combiner.o setup-i2c0.o

obj-$(CONFIG_ARCH_EXYNOS4)	+= irq-eint.o dma.o pmu.o

obj-$(CONFIG_CPU_EXYNOS4210)	+= clock-exynos4210.o

obj-$(CONFIG_SOC_EXYNOS4212)	+= clock-exynos4212.o

obj-$(CONFIG_PM)		+= pm.o
@@ -39,7 +39,7 @@ obj-$(CONFIG_MACH_SMDK4412) += mach-smdk4x12.o 


# device support



obj-y					+= dev-audio.o

obj-$(CONFIG_ARCH_EXYNOS4)		+= dev-audio.o

obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-ahci.o

obj-$(CONFIG_EXYNOS4_DEV_PD)		+= dev-pd.o

obj-$(CONFIG_EXYNOS4_DEV_SYSMMU)	+= dev-sysmmu.o
@@ -57,5 +57,4 @@ obj-$(CONFIG_EXYNOS4_SETUP_I2C7) += setup-i2c7.o 
obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)	+= setup-keypad.o

obj-$(CONFIG_EXYNOS4_SETUP_SDHCI)	+= setup-sdhci.o

obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o



obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)	+= setup-usb-phy.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE