Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)
  ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
  ARM: 6324/1: cam60: move cam60_spi_devices to .init.data
  ARM: 6322/1: imx/pca100: Fix name of spi platform data
  ARM: 6321/1: fix syntax error in main Kconfig file
  ARM: 6297/1: move U300 timer to dynamic clock lookup
  ARM: 6296/1: clock U300 intcon and timer properly
  ARM: 6295/1: fix U300 apb_pclk split
  ARM: 6306/1: fix inverted MMC card detect in U300
  ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID
  ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
  ARM: 6292/1: coresight: add ETM management registers
  ARM: 6288/1: ftrace: document mcount formats
  ARM: 6287/1: ftrace: clean up mcount assembly indentation
  ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR"
  ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE
  ARM: 6280/1: imx: Fix build failure when including <mach/gpio.h> without <linux/spinlock.h>
  ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
  ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
  ARM: S5PV210: Override FIMC driver name on Aquila board
  ARM: S5PC100: enable FIMC on SMDKC100
  ...

Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to
different subsystem 'setname' calls, and trivial port types in
include/linux/serial_core.h

1 files changed, 398 insertions, 19 deletions

diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index 881fe89eefd2..0dda8012d6b2 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -13,6 +13,12 @@
 #include <linux/init.h>
 #include <linux/serial_core.h>
 #include <linux/fb.h>
+#include <linux/i2c.h>
+#include <linux/i2c-gpio.h>
+#include <linux/mfd/max8998.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
+#include <linux/gpio.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -23,54 +29,63 @@
 #include <mach/regs-clock.h>
 #include <mach/regs-fb.h>
 
+#include <plat/gpio-cfg.h>
 #include <plat/regs-serial.h>
 #include <plat/s5pv210.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/fb.h>
+#include <plat/fimc-core.h>
+#include <plat/sdhci.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
-#define S5PV210_UCON_DEFAULT    (S3C2410_UCON_TXILEVEL |        \
+#define AQUILA_UCON_DEFAULT     (S3C2410_UCON_TXILEVEL |        \
                                  S3C2410_UCON_RXILEVEL |        \
                                  S3C2410_UCON_TXIRQMODE |       \
                                  S3C2410_UCON_RXIRQMODE |       \
                                  S3C2410_UCON_RXFIFO_TOI |      \
                                  S3C2443_UCON_RXERR_IRQEN)
 
-#define S5PV210_ULCON_DEFAULT   S3C2410_LCON_CS8
+#define AQUILA_ULCON_DEFAULT    S3C2410_LCON_CS8
 
-#define S5PV210_UFCON_DEFAULT   (S3C2410_UFCON_FIFOMODE |       \
-                                 S5PV210_UFCON_TXTRIG4 |        \
-                                 S5PV210_UFCON_RXTRIG4)
+#define AQUILA_UFCON_DEFAULT    S3C2410_UFCON_FIFOMODE
 
-static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = {
+static struct s3c2410_uartcfg aquila_uartcfgs[] __initdata = {
         [0] = {
                 .hwport         = 0,
                 .flags          = 0,
-                .ucon           = S5PV210_UCON_DEFAULT,
-                .ulcon          = S5PV210_ULCON_DEFAULT,
-                .ufcon          = S5PV210_UFCON_DEFAULT,
+                .ucon           = AQUILA_UCON_DEFAULT,
+                .ulcon          = AQUILA_ULCON_DEFAULT,
+                /*
+                 * Actually UART0 can support 256 bytes fifo, but aquila board
+                 * supports 128 bytes fifo because of initial chip bug
+                 */
+                .ufcon          = AQUILA_UFCON_DEFAULT |
+                        S5PV210_UFCON_TXTRIG128 | S5PV210_UFCON_RXTRIG128,
         },
         [1] = {
                 .hwport         = 1,
                 .flags          = 0,
-                .ucon           = S5PV210_UCON_DEFAULT,
-                .ulcon          = S5PV210_ULCON_DEFAULT,
-                .ufcon          = S5PV210_UFCON_DEFAULT,
+                .ucon           = AQUILA_UCON_DEFAULT,
+                .ulcon          = AQUILA_ULCON_DEFAULT,
+                .ufcon          = AQUILA_UFCON_DEFAULT |
+                        S5PV210_UFCON_TXTRIG64 | S5PV210_UFCON_RXTRIG64,
         },
         [2] = {
                 .hwport         = 2,
                 .flags          = 0,
-                .ucon           = S5PV210_UCON_DEFAULT,
-                .ulcon          = S5PV210_ULCON_DEFAULT,
-                .ufcon          = S5PV210_UFCON_DEFAULT,
+                .ucon           = AQUILA_UCON_DEFAULT,
+                .ulcon          = AQUILA_ULCON_DEFAULT,
+                .ufcon          = AQUILA_UFCON_DEFAULT |
+                        S5PV210_UFCON_TXTRIG16 | S5PV210_UFCON_RXTRIG16,
         },
         [3] = {
                 .hwport         = 3,
                 .flags          = 0,
-                .ucon           = S5PV210_UCON_DEFAULT,
-                .ulcon          = S5PV210_ULCON_DEFAULT,
-                .ufcon          = S5PV210_UFCON_DEFAULT,
+                .ucon           = AQUILA_UCON_DEFAULT,
+                .ulcon          = AQUILA_ULCON_DEFAULT,
+                .ufcon          = AQUILA_UFCON_DEFAULT |
+                        S5PV210_UFCON_TXTRIG16 | S5PV210_UFCON_RXTRIG16,
         },
 };
 
@@ -114,19 +129,383 @@ static struct s3c_fb_platdata aquila_lcd_pdata __initdata = {
         .setup_gpio     = s5pv210_fb_gpio_setup_24bpp,
 };
 
+/* MAX8998 regulators */
+#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
+
+static struct regulator_init_data aquila_ldo2_data = {
+        .constraints    = {
+                .name           = "VALIVE_1.1V",
+                .min_uV         = 1100000,
+                .max_uV         = 1100000,
+                .apply_uV       = 1,
+                .always_on      = 1,
+                .state_mem      = {
+                        .enabled = 1,
+                },
+        },
+};
+
+static struct regulator_init_data aquila_ldo3_data = {
+        .constraints    = {
+                .name           = "VUSB/MIPI_1.1V",
+                .min_uV         = 1100000,
+                .max_uV         = 1100000,
+                .apply_uV       = 1,
+                .always_on      = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo4_data = {
+        .constraints    = {
+                .name           = "VDAC_3.3V",
+                .min_uV         = 3300000,
+                .max_uV         = 3300000,
+                .apply_uV       = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo5_data = {
+        .constraints    = {
+                .name           = "VTF_2.8V",
+                .min_uV         = 2800000,
+                .max_uV         = 2800000,
+                .apply_uV       = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo6_data = {
+        .constraints    = {
+                .name           = "VCC_3.3V",
+                .min_uV         = 3300000,
+                .max_uV         = 3300000,
+                .apply_uV       = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo7_data = {
+        .constraints    = {
+                .name           = "VCC_3.0V",
+                .min_uV         = 3000000,
+                .max_uV         = 3000000,
+                .apply_uV       = 1,
+                .boot_on        = 1,
+                .always_on      = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo8_data = {
+        .constraints    = {
+                .name           = "VUSB/VADC_3.3V",
+                .min_uV         = 3300000,
+                .max_uV         = 3300000,
+                .apply_uV       = 1,
+                .always_on      = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo9_data = {
+        .constraints    = {
+                .name           = "VCC/VCAM_2.8V",
+                .min_uV         = 2800000,
+                .max_uV         = 2800000,
+                .apply_uV       = 1,
+                .always_on      = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo10_data = {
+        .constraints    = {
+                .name           = "VPLL_1.1V",
+                .min_uV         = 1100000,
+                .max_uV         = 1100000,
+                .apply_uV       = 1,
+                .boot_on        = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo11_data = {
+        .constraints    = {
+                .name           = "CAM_IO_2.8V",
+                .min_uV         = 2800000,
+                .max_uV         = 2800000,
+                .apply_uV       = 1,
+                .always_on      = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo12_data = {
+        .constraints    = {
+                .name           = "CAM_ISP_1.2V",
+                .min_uV         = 1200000,
+                .max_uV         = 1200000,
+                .apply_uV       = 1,
+                .always_on      = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo13_data = {
+        .constraints    = {
+                .name           = "CAM_A_2.8V",
+                .min_uV         = 2800000,
+                .max_uV         = 2800000,
+                .apply_uV       = 1,
+                .always_on      = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo14_data = {
+        .constraints    = {
+                .name           = "CAM_CIF_1.8V",
+                .min_uV         = 1800000,
+                .max_uV         = 1800000,
+                .apply_uV       = 1,
+                .always_on      = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo15_data = {
+        .constraints    = {
+                .name           = "CAM_AF_3.3V",
+                .min_uV         = 3300000,
+                .max_uV         = 3300000,
+                .apply_uV       = 1,
+                .always_on      = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo16_data = {
+        .constraints    = {
+                .name           = "VMIPI_1.8V",
+                .min_uV         = 1800000,
+                .max_uV         = 1800000,
+                .apply_uV       = 1,
+                .always_on      = 1,
+        },
+};
+
+static struct regulator_init_data aquila_ldo17_data = {
+        .constraints    = {
+                .name           = "CAM_8M_1.8V",
+                .min_uV         = 1800000,
+                .max_uV         = 1800000,
+                .apply_uV       = 1,
+                .always_on      = 1,
+        },
+};
+
+/* BUCK */
+static struct regulator_consumer_supply buck1_consumer[] = {
+        {       .supply = "vddarm", },
+};
+
+static struct regulator_consumer_supply buck2_consumer[] = {
+        {       .supply = "vddint", },
+};
+
+static struct regulator_init_data aquila_buck1_data = {
+        .constraints    = {
+                .name           = "VARM_1.2V",
+                .min_uV         = 1200000,
+                .max_uV         = 1200000,
+                .apply_uV       = 1,
+                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                  REGULATOR_CHANGE_STATUS,
+        },
+        .num_consumer_supplies  = ARRAY_SIZE(buck1_consumer),
+        .consumer_supplies      = buck1_consumer,
+};
+
+static struct regulator_init_data aquila_buck2_data = {
+        .constraints    = {
+                .name           = "VINT_1.2V",
+                .min_uV         = 1200000,
+                .max_uV         = 1200000,
+                .apply_uV       = 1,
+                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                  REGULATOR_CHANGE_STATUS,
+        },
+        .num_consumer_supplies  = ARRAY_SIZE(buck2_consumer),
+        .consumer_supplies      = buck2_consumer,
+};
+
+static struct regulator_init_data aquila_buck3_data = {
+        .constraints    = {
+                .name           = "VCC_1.8V",
+                .min_uV         = 1800000,
+                .max_uV         = 1800000,
+                .apply_uV       = 1,
+                .state_mem      = {
+                        .enabled = 1,
+                },
+        },
+};
+
+static struct regulator_init_data aquila_buck4_data = {
+        .constraints    = {
+                .name           = "CAM_CORE_1.2V",
+                .min_uV         = 1200000,
+                .max_uV         = 1200000,
+                .apply_uV       = 1,
+                .always_on      = 1,
+        },
+};
+
+static struct max8998_regulator_data aquila_regulators[] = {
+        { MAX8998_LDO2,  &aquila_ldo2_data },
+        { MAX8998_LDO3,  &aquila_ldo3_data },
+        { MAX8998_LDO4,  &aquila_ldo4_data },
+        { MAX8998_LDO5,  &aquila_ldo5_data },
+        { MAX8998_LDO6,  &aquila_ldo6_data },
+        { MAX8998_LDO7,  &aquila_ldo7_data },
+        { MAX8998_LDO8,  &aquila_ldo8_data },
+        { MAX8998_LDO9,  &aquila_ldo9_data },
+        { MAX8998_LDO10, &aquila_ldo10_data },
+        { MAX8998_LDO11, &aquila_ldo11_data },
+        { MAX8998_LDO12, &aquila_ldo12_data },
+        { MAX8998_LDO13, &aquila_ldo13_data },
+        { MAX8998_LDO14, &aquila_ldo14_data },
+        { MAX8998_LDO15, &aquila_ldo15_data },
+        { MAX8998_LDO16, &aquila_ldo16_data },
+        { MAX8998_LDO17, &aquila_ldo17_data },
+        { MAX8998_BUCK1, &aquila_buck1_data },
+        { MAX8998_BUCK2, &aquila_buck2_data },
+        { MAX8998_BUCK3, &aquila_buck3_data },
+        { MAX8998_BUCK4, &aquila_buck4_data },
+};
+
+static struct max8998_platform_data aquila_max8998_pdata = {
+        .num_regulators = ARRAY_SIZE(aquila_regulators),
+        .regulators     = aquila_regulators,
+};
+#endif
+
+/* GPIO I2C PMIC */
+#define AP_I2C_GPIO_PMIC_BUS_4  4
+static struct i2c_gpio_platform_data aquila_i2c_gpio_pmic_data = {
+        .sda_pin        = S5PV210_GPJ4(0),      /* XMSMCSN */
+        .scl_pin        = S5PV210_GPJ4(3),      /* XMSMIRQN */
+};
+
+static struct platform_device aquila_i2c_gpio_pmic = {
+        .name           = "i2c-gpio",
+        .id             = AP_I2C_GPIO_PMIC_BUS_4,
+        .dev            = {
+                .platform_data = &aquila_i2c_gpio_pmic_data,
+        },
+};
+
+static struct i2c_board_info i2c_gpio_pmic_devs[] __initdata = {
+#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
+        {
+                /* 0xCC when SRAD = 0 */
+                I2C_BOARD_INFO("max8998", 0xCC >> 1),
+                .platform_data = &aquila_max8998_pdata,
+        },
+#endif
+};
+
+/* PMIC Power button */
+static struct gpio_keys_button aquila_gpio_keys_table[] = {
+        {
+                .code           = KEY_POWER,
+                .gpio           = S5PV210_GPH2(6),
+                .desc           = "gpio-keys: KEY_POWER",
+                .type           = EV_KEY,
+                .active_low     = 1,
+                .wakeup         = 1,
+                .debounce_interval = 1,
+        },
+};
+
+static struct gpio_keys_platform_data aquila_gpio_keys_data = {
+        .buttons        = aquila_gpio_keys_table,
+        .nbuttons       = ARRAY_SIZE(aquila_gpio_keys_table),
+};
+
+static struct platform_device aquila_device_gpiokeys = {
+        .name = "gpio-keys",
+        .dev = {
+                .platform_data = &aquila_gpio_keys_data,
+        },
+};
+
+static void __init aquila_pmic_init(void)
+{
+        /* AP_PMIC_IRQ: EINT7 */
+        s3c_gpio_cfgpin(S5PV210_GPH0(7), S3C_GPIO_SFN(0xf));
+        s3c_gpio_setpull(S5PV210_GPH0(7), S3C_GPIO_PULL_UP);
+
+        /* nPower: EINT22 */
+        s3c_gpio_cfgpin(S5PV210_GPH2(6), S3C_GPIO_SFN(0xf));
+        s3c_gpio_setpull(S5PV210_GPH2(6), S3C_GPIO_PULL_UP);
+}
+
+/* MoviNAND */
+static struct s3c_sdhci_platdata aquila_hsmmc0_data __initdata = {
+        .max_width              = 4,
+        .cd_type                = S3C_SDHCI_CD_PERMANENT,
+};
+
+/* Wireless LAN */
+static struct s3c_sdhci_platdata aquila_hsmmc1_data __initdata = {
+        .max_width              = 4,
+        .cd_type                = S3C_SDHCI_CD_EXTERNAL,
+        /* ext_cd_{init,cleanup} callbacks will be added later */
+};
+
+/* External Flash */
+#define AQUILA_EXT_FLASH_EN     S5PV210_MP05(4)
+#define AQUILA_EXT_FLASH_CD     S5PV210_GPH3(4)
+static struct s3c_sdhci_platdata aquila_hsmmc2_data __initdata = {
+        .max_width              = 4,
+        .cd_type                = S3C_SDHCI_CD_GPIO,
+        .ext_cd_gpio            = AQUILA_EXT_FLASH_CD,
+        .ext_cd_gpio_invert     = 1,
+};
+
+static void aquila_setup_sdhci(void)
+{
+        gpio_request(AQUILA_EXT_FLASH_EN, "FLASH_EN");
+        gpio_direction_output(AQUILA_EXT_FLASH_EN, 1);
+
+        s3c_sdhci0_set_platdata(&aquila_hsmmc0_data);
+        s3c_sdhci1_set_platdata(&aquila_hsmmc1_data);
+        s3c_sdhci2_set_platdata(&aquila_hsmmc2_data);
+};
+
 static struct platform_device *aquila_devices[] __initdata = {
+        &aquila_i2c_gpio_pmic,
+        &aquila_device_gpiokeys,
         &s3c_device_fb,
+        &s5pc110_device_onenand,
+        &s3c_device_hsmmc0,
+        &s3c_device_hsmmc1,
+        &s3c_device_hsmmc2,
+        &s5p_device_fimc0,
+        &s5p_device_fimc1,
+        &s5p_device_fimc2,
 };
 
 static void __init aquila_map_io(void)
 {
         s5p_init_io(NULL, 0, S5P_VA_CHIPID);
         s3c24xx_init_clocks(24000000);
-        s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs));
+        s3c24xx_init_uarts(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs));
 }
 
 static void __init aquila_machine_init(void)
 {
+        /* PMIC */
+        aquila_pmic_init();
+        i2c_register_board_info(AP_I2C_GPIO_PMIC_BUS_4, i2c_gpio_pmic_devs,
+                        ARRAY_SIZE(i2c_gpio_pmic_devs));
+        /* SDHCI */
+        aquila_setup_sdhci();
+
+        s3c_fimc_setname(0, "s5p-fimc");
+        s3c_fimc_setname(1, "s5p-fimc");
+        s3c_fimc_setname(2, "s5p-fimc");
+
         /* FB */
         s3c_fb_set_platdata(&aquila_lcd_pdata);