Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Mar 2011 22:08:48 +0000 (15:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Mar 2011 22:08:48 +0000 (15:08 -0700)
* '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

arch/arm/Kconfig
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/Makefile
arch/arm/mach-exynos4/include/mach/debug-macro.S
arch/arm/mach-exynos4/mach-smdkc210.c
arch/arm/mach-exynos4/mach-smdkv310.c
arch/arm/mach-s5p64x0/cpu.c
arch/arm/mach-s5pv210/include/mach/irqs.h
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/arm/plat-s5p/cpu.c
arch/arm/plat-samsung/init.c

index 93d595a7477a174c41f5822372fef2700044261c..efe06e004714fbe5277fc84a9f2a63b6cce68e67 100644 (file)
@@ -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
index a021b5240bbad60d3d53f09a60ff4b1ade3e770f..e849f67be47da3bba5210d8d1f5b509d8c5a67b4 100644 (file)
@@ -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
 
index b8f0e7d82d7e5fed41fe5f470efa3879d0622ceb..9be104f63c0b9626bb3bc5b96835efffe8229ffe 100644 (file)
@@ -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
index 58bbd049a6c44ef494a1d25eb688dd92863f038e..a442ef861167866c638cde508d9ca3af87a9298b 100644 (file)
@@ -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)
index 25a256818122c0ae135544022bbb358f54942bfd..e645f7a955f0dd504788547fc9753fabbe0178ae 100644 (file)
@@ -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,
index 88e0275143be3e769888aaa48615ee9a1105904e..152676471b67d4fb7f219c3bedf1eaa5de560ca5 100644 (file)
@@ -127,7 +127,7 @@ static struct resource smdkv310_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,
index b8d02eb4cf30efeb5ed749eb755cd29d44461ed6..a5c00952ea35c71047c1362e29735179bd4ac261 100644 (file)
@@ -119,7 +119,7 @@ void __init s5p6450_map_io(void)
        s3c_adc_setname("s3c64xx-adc");
 
        iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));
-       iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6440_iodesc));
+       iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6450_iodesc));
 }
 
 /*
index 26710b35ef87184f5a4c66f295d00c93847e0508..b9f9ec33384d6cecc1633a90e9aabb3492d556b0 100644 (file)
@@ -99,9 +99,9 @@
 #define IRQ_TC                 IRQ_PENDN
 #define IRQ_KEYPAD             S5P_IRQ_VIC2(25)
 #define IRQ_CG                 S5P_IRQ_VIC2(26)
-#define IRQ_SEC                        S5P_IRQ_VIC2(27)
-#define IRQ_SECRX              S5P_IRQ_VIC2(28)
-#define IRQ_SECTX              S5P_IRQ_VIC2(29)
+#define IRQ_SSS_INT            S5P_IRQ_VIC2(27)
+#define IRQ_SSS_HASH           S5P_IRQ_VIC2(28)
+#define IRQ_PCM2               S5P_IRQ_VIC2(29)
 #define IRQ_SDMIRQ             S5P_IRQ_VIC2(30)
 #define IRQ_SDMFIQ             S5P_IRQ_VIC2(31)
 
index bc08ac42e7cc7bcd41b29d46cf7837656b236c9c..c6a9e86c2d5ced263e25e5580a2fc53b7115a469 100644 (file)
@@ -44,7 +44,6 @@
 #include <plat/keypad.h>
 #include <plat/pm.h>
 #include <plat/fb.h>
-#include <plat/gpio-cfg.h>
 #include <plat/s5p-time.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
index c3bfe9b13acf0c64c671e725395a8ba4d8ab423d..5cf5e721e6caf83234bd556936286a632961ff48 100644 (file)
@@ -39,7 +39,7 @@ static const char name_exynos4210[] = "EXYNOS4210";
 static struct cpu_table cpu_ids[] __initdata = {
        {
                .idcode         = 0x56440100,
-               .idmask         = 0xffffff00,
+               .idmask         = 0xfffff000,
                .map_io         = s5p6440_map_io,
                .init_clocks    = s5p6440_init_clocks,
                .init_uarts     = s5p6440_init_uarts,
@@ -47,7 +47,7 @@ static struct cpu_table cpu_ids[] __initdata = {
                .name           = name_s5p6440,
        }, {
                .idcode         = 0x36442000,
-               .idmask         = 0xffffff00,
+               .idmask         = 0xfffff000,
                .map_io         = s5p6442_map_io,
                .init_clocks    = s5p6442_init_clocks,
                .init_uarts     = s5p6442_init_uarts,
@@ -55,7 +55,7 @@ static struct cpu_table cpu_ids[] __initdata = {
                .name           = name_s5p6442,
        }, {
                .idcode         = 0x36450000,
-               .idmask         = 0xffffff00,
+               .idmask         = 0xfffff000,
                .map_io         = s5p6450_map_io,
                .init_clocks    = s5p6450_init_clocks,
                .init_uarts     = s5p6450_init_uarts,
@@ -79,7 +79,7 @@ static struct cpu_table cpu_ids[] __initdata = {
                .name           = name_s5pv210,
        }, {
                .idcode         = 0x43210000,
-               .idmask         = 0xfffff000,
+               .idmask         = 0xfffe0000,
                .map_io         = exynos4_map_io,
                .init_clocks    = exynos4_init_clocks,
                .init_uarts     = exynos4_init_uarts,
index 6790edfaca6f49aad661fb34cffafc4115dff9f6..79d10fca9090268b4e817cc299f2021634a27d17 100644 (file)
@@ -36,7 +36,7 @@ static struct cpu_table * __init s3c_lookup_cpu(unsigned long idcode,
                                                unsigned int count)
 {
        for (; count != 0; count--, tab++) {
-               if ((idcode & tab->idmask) == tab->idcode)
+               if ((idcode & tab->idmask) == (tab->idcode & tab->idmask))
                        return tab;
        }