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

Commit 32836e08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 's5p-fixes-for-linus' of... 

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: Suspend: Fix dependency of ARCH_SUSPEND_POSSIBLE
  ARM: SAMSUNG: Fix CPU idmask
  ARM: EXYNOS4: Fix addruart macro
  ARM: EXYNOS4: Fix smsc9215 irq polarity on SMDKC210
  ARM: EXYNOS4: Fix smsc9215 irq polarity on SMDKV310
  ARM: EXYNOS4: Fix build warning on regarding SATA_AHCI_PLATFORM
  ARM: S5PV210: Remove duplicated inclusion
  ARM: S5PV210: Fix security engine interrupt names
  ARM: S5P64X0: Fix iodesc array size for S5P6450
parents 036a9826 3e1d9874

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2009,6 +2009,7 @@ menu "Power management options" 
source "kernel/power/Kconfig"



config ARCH_SUSPEND_POSSIBLE

	depends on !ARCH_S5P64X0 && !ARCH_S5P6442

	def_bool y



endmenu

arch/arm/mach-exynos4/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ config EXYNOS4_MCT 
	help

	  Use MCT (Multi Core Timer) as kernel timers



config EXYNOS4_DEV_AHCI

	bool

	help

	  Compile in platform device definitions for AHCI



config EXYNOS4_DEV_PD

	bool

	help
@@ -134,9 +139,9 @@ config MACH_ARMLEX4210 
	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select EXYNOS4_DEV_AHCI

	select EXYNOS4_DEV_SYSMMU

	select EXYNOS4_SETUP_SDHCI

	select SATA_AHCI_PLATFORM

	help

	  Machine support for Samsung ARMLEX4210 based on EXYNOS4210

arch/arm/mach-exynos4/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ obj-$(CONFIG_MACH_NURI) += mach-nuri.o 
# device support



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
@@ -53,4 +54,3 @@ 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_SATA_AHCI_PLATFORM)	+= dev-ahci.o

arch/arm/mach-exynos4/include/mach/debug-macro.S

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
	 */



	.macro addruart, rp, rv

		ldreq	\rp, = S3C_PA_UART

		ldrne	\rv, = S3C_VA_UART

		ldr	\rp, = S3C_PA_UART

		ldr	\rv, = S3C_VA_UART

#if CONFIG_DEBUG_S3C_UART != 0

		add	\rp, \rp, #(0x10000 * CONFIG_DEBUG_S3C_UART)

		add	\rv, \rv, #(0x10000 * CONFIG_DEBUG_S3C_UART)

arch/arm/mach-exynos4/mach-smdkc210.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static struct resource smdkc210_smsc911x_resources[] = { 
};



static struct smsc911x_platform_config smsc9215_config = {

	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_HIGH,

	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,

	.irq_type	= SMSC911X_IRQ_TYPE_PUSH_PULL,

	.flags		= SMSC911X_USE_16BIT | SMSC911X_FORCE_INTERNAL_PHY,

	.phy_interface	= PHY_INTERFACE_MODE_MII,