Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull "ARM: board specific updates" from Arnd Bergmann/Olof Johansson:
 "These changes are all specific to one board only.  We're trying to
  keep the number of board files low, but generally board level updates
  are ok on platforms that are working on moving towards DT based
  probing, which will eventually lead to removing them.

  The board-ams-delta.c board file gets a conflict between the removal
  of ams_delta_config and the addition of a lot of other data.  The
  Kconfig file has two changes in the same line, and in exynos, the
  power domain cleanup conflicts with the addition of the image sensor
  device.

  Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  [olof: Amended a fix for a mismerge to board-omap4panda.c]
  Signed-off-by: Olof Johansson <olof@lixom.net>"

Fixed up some fairly trivial conflicts manually.

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (82 commits)
  i.MX35-PDK: Add Camera support
  ARM : mx35: 3ds-board: add framebuffer device
  pxa/hx4700: Remove pcmcia platform_device structure
  ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%
  ARM: pxa/hx4700: Remove unwanted request for GPIO105
  ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board
  ARM: EXYNOS: Register JPEG on nuri
  ARM: EXYNOS: Register JPEG on universal_c210
  ARM: S5PV210: Enable JPEG on SMDKV210
  ARM: S5PV210: Add JPEG board definition
  ARM: EXYNOS: Enable JPEG on Origen
  ARM: EXYNOS: Enable JPEG on SMDKV310
  ARM: EXYNOS: Add __init attribute to universal_camera_init()
  ARM: EXYNOS: Add __init attribute to nuri_camera_init()
  ARM: S5PV210: Enable FIMC on SMDKC110
  ARM: S5PV210: Enable FIMC on SMDKV210
  ARM: S5PV210: Enable MFC on SMDKC110
  ARM: S5PV210: Enable MFC on SMDKV210
  ARM: EXYNOS: Enable G2D on SMDKV310
  ARM: tegra: update defconfig
  ...

1 files changed, 269 insertions, 45 deletions

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index 83eac744ddb9..c1b681ef4cba 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -11,6 +11,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/basic_mmio_gpio.h>
 #include <linux/gpio.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -18,6 +19,9 @@
 #include <linux/interrupt.h>
 #include <linux/leds.h>
 #include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/serial_8250.h>
 #include <linux/export.h>
 #include <linux/omapfb.h>
@@ -43,9 +47,6 @@
 #include "iomap.h"
 #include "common.h"
 
-static u8 ams_delta_latch1_reg;
-static u16 ams_delta_latch2_reg;
-
 static const unsigned int ams_delta_keymap[] = {
         KEY(0, 0, KEY_F1),              /* Advert    */
 
@@ -124,54 +125,188 @@ static const unsigned int ams_delta_keymap[] = {
         KEY(7, 3, KEY_LEFTCTRL),        /* Vol down  */
 };
 
-void ams_delta_latch1_write(u8 mask, u8 value)
-{
-        ams_delta_latch1_reg &= ~mask;
-        ams_delta_latch1_reg |= value;
-        *(volatile __u8 *) AMS_DELTA_LATCH1_VIRT = ams_delta_latch1_reg;
-}
-
-void ams_delta_latch2_write(u16 mask, u16 value)
-{
-        ams_delta_latch2_reg &= ~mask;
-        ams_delta_latch2_reg |= value;
-        *(volatile __u16 *) AMS_DELTA_LATCH2_VIRT = ams_delta_latch2_reg;
-}
+#define LATCH1_PHYS     0x01000000
+#define LATCH1_VIRT     0xEA000000
+#define MODEM_PHYS      0x04000000
+#define MODEM_VIRT      0xEB000000
+#define LATCH2_PHYS     0x08000000
+#define LATCH2_VIRT     0xEC000000
 
 static struct map_desc ams_delta_io_desc[] __initdata = {
         /* AMS_DELTA_LATCH1 */
         {
-                .virtual        = AMS_DELTA_LATCH1_VIRT,
-                .pfn            = __phys_to_pfn(AMS_DELTA_LATCH1_PHYS),
+                .virtual        = LATCH1_VIRT,
+                .pfn            = __phys_to_pfn(LATCH1_PHYS),
                 .length         = 0x01000000,
                 .type           = MT_DEVICE
         },
         /* AMS_DELTA_LATCH2 */
         {
-                .virtual        = AMS_DELTA_LATCH2_VIRT,
-                .pfn            = __phys_to_pfn(AMS_DELTA_LATCH2_PHYS),
+                .virtual        = LATCH2_VIRT,
+                .pfn            = __phys_to_pfn(LATCH2_PHYS),
                 .length         = 0x01000000,
                 .type           = MT_DEVICE
         },
         /* AMS_DELTA_MODEM */
         {
-                .virtual        = AMS_DELTA_MODEM_VIRT,
-                .pfn            = __phys_to_pfn(AMS_DELTA_MODEM_PHYS),
+                .virtual        = MODEM_VIRT,
+                .pfn            = __phys_to_pfn(MODEM_PHYS),
                 .length         = 0x01000000,
                 .type           = MT_DEVICE
         }
 };
 
-static struct omap_lcd_config ams_delta_lcd_config = {
+static struct omap_lcd_config ams_delta_lcd_config __initdata = {
         .ctrl_name      = "internal",
 };
 
-static struct omap_usb_config ams_delta_usb_config __initdata = {
+static struct omap_usb_config ams_delta_usb_config = {
         .register_host  = 1,
         .hmc_mode       = 16,
         .pins[0]        = 2,
 };
 
+#define LATCH1_GPIO_BASE        232
+#define LATCH1_NGPIO            8
+
+static struct resource latch1_resources[] = {
+        [0] = {
+                .name   = "dat",
+                .start  = LATCH1_PHYS,
+                .end    = LATCH1_PHYS + (LATCH1_NGPIO - 1) / 8,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct bgpio_pdata latch1_pdata = {
+        .base   = LATCH1_GPIO_BASE,
+        .ngpio  = LATCH1_NGPIO,
+};
+
+static struct platform_device latch1_gpio_device = {
+        .name           = "basic-mmio-gpio",
+        .id             = 0,
+        .resource       = latch1_resources,
+        .num_resources  = ARRAY_SIZE(latch1_resources),
+        .dev            = {
+                .platform_data  = &latch1_pdata,
+        },
+};
+
+static struct resource latch2_resources[] = {
+        [0] = {
+                .name   = "dat",
+                .start  = LATCH2_PHYS,
+                .end    = LATCH2_PHYS + (AMS_DELTA_LATCH2_NGPIO - 1) / 8,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct bgpio_pdata latch2_pdata = {
+        .base   = AMS_DELTA_LATCH2_GPIO_BASE,
+        .ngpio  = AMS_DELTA_LATCH2_NGPIO,
+};
+
+static struct platform_device latch2_gpio_device = {
+        .name           = "basic-mmio-gpio",
+        .id             = 1,
+        .resource       = latch2_resources,
+        .num_resources  = ARRAY_SIZE(latch2_resources),
+        .dev            = {
+                .platform_data  = &latch2_pdata,
+        },
+};
+
+static const struct gpio latch_gpios[] __initconst = {
+        {
+                .gpio   = LATCH1_GPIO_BASE + 6,
+                .flags  = GPIOF_OUT_INIT_LOW,
+                .label  = "dockit1",
+        },
+        {
+                .gpio   = LATCH1_GPIO_BASE + 7,
+                .flags  = GPIOF_OUT_INIT_LOW,
+                .label  = "dockit2",
+        },
+        {
+                .gpio   = AMS_DELTA_GPIO_PIN_SCARD_RSTIN,
+                .flags  = GPIOF_OUT_INIT_LOW,
+                .label  = "scard_rstin",
+        },
+        {
+                .gpio   = AMS_DELTA_GPIO_PIN_SCARD_CMDVCC,
+                .flags  = GPIOF_OUT_INIT_LOW,
+                .label  = "scard_cmdvcc",
+        },
+        {
+                .gpio   = AMS_DELTA_GPIO_PIN_MODEM_CODEC,
+                .flags  = GPIOF_OUT_INIT_LOW,
+                .label  = "modem_codec",
+        },
+        {
+                .gpio   = AMS_DELTA_LATCH2_GPIO_BASE + 14,
+                .flags  = GPIOF_OUT_INIT_LOW,
+                .label  = "hookflash1",
+        },
+        {
+                .gpio   = AMS_DELTA_LATCH2_GPIO_BASE + 15,
+                .flags  = GPIOF_OUT_INIT_LOW,
+                .label  = "hookflash2",
+        },
+};
+
+static struct regulator_consumer_supply modem_nreset_consumers[] = {
+        REGULATOR_SUPPLY("RESET#", "serial8250.1"),
+        REGULATOR_SUPPLY("POR", "cx20442-codec"),
+};
+
+static struct regulator_init_data modem_nreset_data = {
+        .constraints            = {
+                .valid_ops_mask         = REGULATOR_CHANGE_STATUS,
+                .boot_on                = 1,
+        },
+        .num_consumer_supplies  = ARRAY_SIZE(modem_nreset_consumers),
+        .consumer_supplies      = modem_nreset_consumers,
+};
+
+static struct fixed_voltage_config modem_nreset_config = {
+        .supply_name            = "modem_nreset",
+        .microvolts             = 3300000,
+        .gpio                   = AMS_DELTA_GPIO_PIN_MODEM_NRESET,
+        .startup_delay          = 25000,
+        .enable_high            = 1,
+        .enabled_at_boot        = 1,
+        .init_data              = &modem_nreset_data,
+};
+
+static struct platform_device modem_nreset_device = {
+        .name   = "reg-fixed-voltage",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &modem_nreset_config,
+        },
+};
+
+struct modem_private_data {
+        struct regulator *regulator;
+};
+
+static struct modem_private_data modem_priv;
+
+void ams_delta_latch_write(int base, int ngpio, u16 mask, u16 value)
+{
+        int bit = 0;
+        u16 bitpos = 1 << bit;
+
+        for (; bit < ngpio; bit++, bitpos = bitpos << 1) {
+                if (!(mask & bitpos))
+                        continue;
+                else
+                        gpio_set_value(base + bit, (value & bitpos) != 0);
+        }
+}
+EXPORT_SYMBOL(ams_delta_latch_write);
+
 static struct resource ams_delta_nand_resources[] = {
         [0] = {
                 .start  = OMAP1_MPUIO_BASE,
@@ -201,7 +336,7 @@ static const struct matrix_keymap_data ams_delta_keymap_data = {
         .keymap_size    = ARRAY_SIZE(ams_delta_keymap),
 };
 
-static struct omap_kp_platform_data ams_delta_kp_data __initdata = {
+static struct omap_kp_platform_data ams_delta_kp_data = {
         .rows           = 8,
         .cols           = 8,
         .keymap_data    = &ams_delta_keymap_data,
@@ -223,9 +358,45 @@ static struct platform_device ams_delta_lcd_device = {
         .id     = -1,
 };
 
-static struct platform_device ams_delta_led_device = {
-        .name   = "ams-delta-led",
-        .id     = -1
+static const struct gpio_led gpio_leds[] __initconst = {
+        {
+                .name            = "camera",
+                .gpio            = LATCH1_GPIO_BASE + 0,
+                .default_state   = LEDS_GPIO_DEFSTATE_OFF,
+#ifdef CONFIG_LEDS_TRIGGERS
+                .default_trigger = "ams_delta_camera",
+#endif
+        },
+        {
+                .name            = "advert",
+                .gpio            = LATCH1_GPIO_BASE + 1,
+                .default_state   = LEDS_GPIO_DEFSTATE_OFF,
+        },
+        {
+                .name            = "email",
+                .gpio            = LATCH1_GPIO_BASE + 2,
+                .default_state   = LEDS_GPIO_DEFSTATE_OFF,
+        },
+        {
+                .name            = "handsfree",
+                .gpio            = LATCH1_GPIO_BASE + 3,
+                .default_state   = LEDS_GPIO_DEFSTATE_OFF,
+        },
+        {
+                .name            = "voicemail",
+                .gpio            = LATCH1_GPIO_BASE + 4,
+                .default_state   = LEDS_GPIO_DEFSTATE_OFF,
+        },
+        {
+                .name            = "voice",
+                .gpio            = LATCH1_GPIO_BASE + 5,
+                .default_state   = LEDS_GPIO_DEFSTATE_OFF,
+        },
+};
+
+static const struct gpio_led_platform_data leds_pdata __initconst = {
+        .leds           = gpio_leds,
+        .num_leds       = ARRAY_SIZE(gpio_leds),
 };
 
 static struct i2c_board_info ams_delta_camera_board_info[] = {
@@ -274,13 +445,17 @@ static struct omap1_cam_platform_data ams_delta_camera_platform_data = {
 };
 
 static struct platform_device *ams_delta_devices[] __initdata = {
-        &ams_delta_nand_device,
+        &latch1_gpio_device,
+        &latch2_gpio_device,
         &ams_delta_kp_device,
-        &ams_delta_lcd_device,
-        &ams_delta_led_device,
         &ams_delta_camera_device,
 };
 
+static struct platform_device *late_devices[] __initdata = {
+        &ams_delta_nand_device,
+        &ams_delta_lcd_device,
+};
+
 static void __init ams_delta_init(void)
 {
         /* mux pins for uarts */
@@ -304,15 +479,13 @@ static void __init ams_delta_init(void)
         omap_serial_init();
         omap_register_i2c_bus(1, 100, NULL, 0);
 
-        /* Clear latch2 (NAND, LCD, modem enable) */
-        ams_delta_latch2_write(~0, 0);
-
         omap1_usb_init(&ams_delta_usb_config);
         omap1_set_camera_info(&ams_delta_camera_platform_data);
 #ifdef CONFIG_LEDS_TRIGGERS
         led_trigger_register_simple("ams_delta_camera",
                         &ams_delta_camera_led_trigger);
 #endif
+        gpio_led_register_device(-1, &leds_pdata);
         platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));
 
         ams_delta_init_fiq();
@@ -322,16 +495,34 @@ static void __init ams_delta_init(void)
         omapfb_set_lcd_config(&ams_delta_lcd_config);
 }
 
+static void modem_pm(struct uart_port *port, unsigned int state, unsigned old)
+{
+        struct modem_private_data *priv = port->private_data;
+
+        if (IS_ERR(priv->regulator))
+                return;
+
+        if (state == old)
+                return;
+
+        if (state == 0)
+                regulator_enable(priv->regulator);
+        else if (old == 0)
+                regulator_disable(priv->regulator);
+}
+
 static struct plat_serial8250_port ams_delta_modem_ports[] = {
         {
-                .membase        = IOMEM(AMS_DELTA_MODEM_VIRT),
-                .mapbase        = AMS_DELTA_MODEM_PHYS,
+                .membase        = IOMEM(MODEM_VIRT),
+                .mapbase        = MODEM_PHYS,
                 .irq            = -EINVAL, /* changed later */
                 .flags          = UPF_BOOT_AUTOCONF,
                 .irqflags       = IRQF_TRIGGER_RISING,
                 .iotype         = UPIO_MEM,
                 .regshift       = 1,
                 .uartclk        = BASE_BAUD * 16,
+                .pm             = modem_pm,
+                .private_data   = &modem_priv,
         },
         { },
 };
@@ -344,13 +535,27 @@ static struct platform_device ams_delta_modem_device = {
         },
 };
 
-static int __init ams_delta_modem_init(void)
+static int __init late_init(void)
 {
         int err;
 
         if (!machine_is_ams_delta())
                 return -ENODEV;
 
+        err = gpio_request_array(latch_gpios, ARRAY_SIZE(latch_gpios));
+        if (err) {
+                pr_err("Couldn't take over latch1/latch2 GPIO pins\n");
+                return err;
+        }
+
+        platform_add_devices(late_devices, ARRAY_SIZE(late_devices));
+
+        err = platform_device_register(&modem_nreset_device);
+        if (err) {
+                pr_err("Couldn't register the modem regulator device\n");
+                return err;
+        }
+
         omap_cfg_reg(M14_1510_GPIO2);
         ams_delta_modem_ports[0].irq =
                         gpio_to_irq(AMS_DELTA_GPIO_PIN_MODEM_IRQ);
@@ -362,13 +567,35 @@ static int __init ams_delta_modem_init(void)
         }
         gpio_direction_input(AMS_DELTA_GPIO_PIN_MODEM_IRQ);
 
-        ams_delta_latch2_write(
-                AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC,
-                AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC);
+        /* Initialize the modem_nreset regulator consumer before use */
+        modem_priv.regulator = ERR_PTR(-ENODEV);
+
+        ams_delta_latch2_write(AMS_DELTA_LATCH2_MODEM_CODEC,
+                        AMS_DELTA_LATCH2_MODEM_CODEC);
+
+        err = platform_device_register(&ams_delta_modem_device);
+        if (err)
+                goto gpio_free;
 
-        return platform_device_register(&ams_delta_modem_device);
+        /*
+         * Once the modem device is registered, the modem_nreset
+         * regulator can be requested on behalf of that device.
+         */
+        modem_priv.regulator = regulator_get(&ams_delta_modem_device.dev,
+                        "RESET#");
+        if (IS_ERR(modem_priv.regulator)) {
+                err = PTR_ERR(modem_priv.regulator);
+                goto unregister;
+        }
+        return 0;
+
+unregister:
+        platform_device_unregister(&ams_delta_modem_device);
+gpio_free:
+        gpio_free(AMS_DELTA_GPIO_PIN_MODEM_IRQ);
+        return err;
 }
-arch_initcall(ams_delta_modem_init);
+late_initcall(late_init);
 
 static void __init ams_delta_map_io(void)
 {
@@ -387,6 +614,3 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)")
         .timer          = &omap1_timer,
         .restart        = omap1_restart,
 MACHINE_END
-
-EXPORT_SYMBOL(ams_delta_latch1_write);
-EXPORT_SYMBOL(ams_delta_latch2_write);