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

Commit 1e09939b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'next-samsung-devel' of... 

Merge branch 'next-samsung-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/devel
parents 4d09a938 e8de616e

arch/arm/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -684,6 +684,7 @@ config ARCH_S3C2410 
	select GENERIC_GPIO

	select ARCH_HAS_CPUFREQ

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C if I2C

	help
@@ -701,6 +702,7 @@ config ARCH_S3C64XX 
	select CPU_V6

	select ARM_VIC

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select NO_IOPORT

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_HAS_CPUFREQ
@@ -725,6 +727,7 @@ config ARCH_S5P64X0 
	select CPU_V6

	select GENERIC_GPIO

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select GENERIC_CLOCKEVENTS

	select HAVE_SCHED_CLOCK
@@ -738,6 +741,7 @@ config ARCH_S5PC100 
	bool "Samsung S5PC100"

	select GENERIC_GPIO

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select CPU_V7

	select ARM_L1_CACHE_SHIFT_6

	select ARCH_USES_GETTIMEOFFSET
@@ -751,8 +755,10 @@ config ARCH_S5PV210 
	bool "Samsung S5PV210/S5PC110"

	select CPU_V7

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_HAS_HOLES_MEMORYMODEL

	select GENERIC_GPIO

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select ARM_L1_CACHE_SHIFT_6

	select ARCH_HAS_CPUFREQ

	select GENERIC_CLOCKEVENTS
@@ -767,8 +773,10 @@ config ARCH_EXYNOS4 
	bool "Samsung EXYNOS4"

	select CPU_V7

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_HAS_HOLES_MEMORYMODEL

	select GENERIC_GPIO

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select ARCH_HAS_CPUFREQ

	select GENERIC_CLOCKEVENTS

	select HAVE_S3C_RTC if RTC_CLASS

arch/arm/common/gic.c

+0 −6
Original line number Diff line number Diff line
@@ -38,12 +38,6 @@ static DEFINE_SPINLOCK(irq_controller_lock); 
/* Address of GIC 0 CPU interface */

void __iomem *gic_cpu_base_addr __read_mostly;



struct gic_chip_data {

	unsigned int irq_offset;

	void __iomem *dist_base;

	void __iomem *cpu_base;

};



/*

 * Supported arch specific GIC irq extension.

 * Default make them NULL.

arch/arm/include/asm/hardware/gic.h

+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,12 @@ void gic_secondary_init(unsigned int); 
void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);

void gic_raise_softirq(const struct cpumask *mask, unsigned int irq);

void gic_enable_ppi(unsigned int);



struct gic_chip_data {

	unsigned int irq_offset;

	void __iomem *dist_base;

	void __iomem *cpu_base;

};

#endif



#endif

arch/arm/mach-exynos4/Kconfig

+29 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ config CPU_EXYNOS4210 
	  Enable EXYNOS4210 CPU support



config EXYNOS4_MCT

	bool "Kernel timer support by MCT"

	bool

	default y

	help

	  Use MCT (Multi Core Timer) as kernel timers
@@ -25,6 +26,11 @@ config EXYNOS4_DEV_AHCI 
	help

	  Compile in platform device definitions for AHCI



config EXYNOS4_SETUP_FIMD0

	bool

	help

	  Common setup code for FIMD0.



config EXYNOS4_DEV_PD

	bool

	help
@@ -35,6 +41,11 @@ config EXYNOS4_DEV_SYSMMU 
	help

	  Common setup code for SYSTEM MMU in EXYNOS4



config EXYNOS4_DEV_DWMCI

	bool

	help

	  Compile in platform device definitions for DWMCI



config EXYNOS4_SETUP_I2C1

	bool

	help
@@ -103,6 +114,7 @@ menu "EXYNOS4 Machines" 
config MACH_SMDKC210

	bool "SMDKC210"

	select CPU_EXYNOS4210

	select S5P_DEV_FIMD0

	select S3C_DEV_RTC

	select S3C_DEV_WDT

	select S3C_DEV_I2C1
@@ -112,6 +124,7 @@ config MACH_SMDKC210 
	select S3C_DEV_HSMMC3

	select EXYNOS4_DEV_PD

	select EXYNOS4_DEV_SYSMMU

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_SDHCI

	help
@@ -120,6 +133,7 @@ config MACH_SMDKC210 
config MACH_SMDKV310

	bool "SMDKV310"

	select CPU_EXYNOS4210

	select S5P_DEV_FIMD0

	select S3C_DEV_RTC

	select S3C_DEV_WDT

	select S3C_DEV_I2C1
@@ -127,9 +141,11 @@ config MACH_SMDKV310 
	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select EXYNOS4_DEV_AHCI

	select SAMSUNG_DEV_KEYPAD

	select EXYNOS4_DEV_PD

	select EXYNOS4_DEV_SYSMMU

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_KEYPAD

	select EXYNOS4_SETUP_SDHCI
@@ -153,13 +169,22 @@ config MACH_ARMLEX4210 
config MACH_UNIVERSAL_C210

	bool "Mobile UNIVERSAL_C210 Board"

	select CPU_EXYNOS4210

	select S5P_GPIO_INT

	select S5P_DEV_FIMC0

	select S5P_DEV_FIMC1

	select S5P_DEV_FIMC2

	select S5P_DEV_FIMC3

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S3C_DEV_I2C1

	select S3C_DEV_I2C3

	select S3C_DEV_I2C5

	select S5P_DEV_MFC

	select S5P_DEV_ONENAND

	select EXYNOS4_DEV_PD

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_I2C3

	select EXYNOS4_SETUP_I2C5

	select EXYNOS4_SETUP_SDHCI

	help
@@ -176,13 +201,16 @@ config MACH_NURI 
	select S3C_DEV_I2C1

	select S3C_DEV_I2C3

	select S3C_DEV_I2C5

	select S5P_DEV_MFC

	select S5P_DEV_USB_EHCI

	select EXYNOS4_DEV_PD

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_I2C3

	select EXYNOS4_SETUP_I2C5

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select SAMSUNG_DEV_PWM

	select SAMSUNG_DEV_ADC

	help

	  Machine support for Samsung Mobile NURI Board.

arch/arm/mach-exynos4/Makefile

+4 −7
Original line number Diff line number Diff line
@@ -13,19 +13,14 @@ obj- := 
# Core support for EXYNOS4 system



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

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

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

obj-$(CONFIG_PM)		+= pm.o sleep.o

obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o

obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o



obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o



ifeq ($(CONFIG_EXYNOS4_MCT),y)

obj-y				+= mct.o

else

obj-y				+= time.o

obj-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o

endif

obj-$(CONFIG_EXYNOS4_MCT)	+= mct.o



obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o
@@ -43,8 +38,10 @@ obj-y += 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

obj-$(CONFIG_EXYNOS4_DEV_DWMCI)	+= dev-dwmci.o



obj-$(CONFIG_EXYNOS4_SETUP_FIMC)	+= setup-fimc.o

obj-$(CONFIG_EXYNOS4_SETUP_FIMD0)	+= setup-fimd0.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C1)	+= setup-i2c1.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C2)	+= setup-i2c2.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C3)	+= setup-i2c3.o