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
  ...

2 files changed, 25 insertions, 21 deletions

diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index 208eef1c0485..f309bf975202 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -97,9 +97,9 @@ static unsigned long hx4700_pin_config[] __initdata = {
 
         /* BTUART */
         GPIO42_BTUART_RXD,
-        GPIO43_BTUART_TXD,
+        GPIO43_BTUART_TXD_LPM_LOW,
         GPIO44_BTUART_CTS,
-        GPIO45_BTUART_RTS,
+        GPIO45_BTUART_RTS_LPM_LOW,
 
         /* PWM 1 (Backlight) */
         GPIO17_PWM1_OUT,
@@ -245,6 +245,21 @@ static u16 asic3_gpio_config[] = {
         ASIC3_GPIOD15_nPIOW,
 };
 
+static struct asic3_led asic3_leds[ASIC3_NUM_LEDS] = {
+        [0] = {
+                .name = "hx4700:amber",
+                .default_trigger = "ds2760-battery.0-charging-blink-full-solid",
+        },
+        [1] = {
+                .name = "hx4700:green",
+                .default_trigger = "unused",
+        },
+        [2] = {
+                .name = "hx4700:blue",
+                .default_trigger = "hx4700-radio",
+        },
+};
+
 static struct resource asic3_resources[] = {
         /* GPIO part */
         [0] = {
@@ -275,6 +290,7 @@ static struct asic3_platform_data asic3_platform_data = {
         .gpio_config_num = ARRAY_SIZE(asic3_gpio_config),
         .irq_base        = IRQ_BOARD_START,
         .gpio_base       = HX4700_ASIC3_GPIO_BASE,
+        .leds            = asic3_leds,
 };
 
 static struct platform_device asic3 = {
@@ -705,10 +721,9 @@ static void hx4700_set_vpp(struct platform_device *pdev, int vpp)
         gpio_set_value(GPIO91_HX4700_FLASH_VPEN, vpp);
 }
 
-static struct resource strataflash_resource = {
-        .start = PXA_CS0_PHYS,
-        .end   = PXA_CS0_PHYS + SZ_128M - 1,
-        .flags = IORESOURCE_MEM,
+static struct resource strataflash_resource[] = {
+        [0] = DEFINE_RES_MEM(PXA_CS0_PHYS, SZ_64M),
+        [1] = DEFINE_RES_MEM(PXA_CS0_PHYS + SZ_64M, SZ_64M),
 };
 
 static struct physmap_flash_data strataflash_data = {
@@ -719,8 +734,8 @@ static struct physmap_flash_data strataflash_data = {
 static struct platform_device strataflash = {
         .name          = "physmap-flash",
         .id            = -1,
-        .resource      = &strataflash_resource,
-        .num_resources = 1,
+        .resource      = strataflash_resource,
+        .num_resources = ARRAY_SIZE(strataflash_resource),
         .dev = {
                 .platform_data = &strataflash_data,
         },
@@ -788,17 +803,6 @@ static struct platform_device audio = {
 
 
 /*
- * PCMCIA
- */
-
-static struct platform_device pcmcia = {
-        .name = "hx4700-pcmcia",
-        .dev  = {
-                .parent = &asic3.dev,
-        },
-};
-
-/*
  * Platform devices
  */
 
@@ -814,7 +818,6 @@ static struct platform_device *devices[] __initdata = {
         &power_supply,
         &strataflash,
         &audio,
-        &pcmcia,
 };
 
 static struct gpio global_gpios[] = {
@@ -830,7 +833,6 @@ static struct gpio global_gpios[] = {
         { GPIO32_HX4700_RS232_ON,         GPIOF_OUT_INIT_HIGH, "RS232_ON" },
         { GPIO71_HX4700_ASIC3_nRESET,     GPIOF_OUT_INIT_HIGH, "ASIC3_nRESET" },
         { GPIO82_HX4700_EUART_RESET,      GPIOF_OUT_INIT_HIGH, "EUART_RESET" },
-        { GPIO105_HX4700_nIR_ON,          GPIOF_OUT_INIT_HIGH, "nIR_EN" },
 };
 
 static void __init hx4700_init(void)
diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
index ec0f0b0b6744..a65867209aa0 100644
--- a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
+++ b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
@@ -158,7 +158,9 @@
 #define GPIO44_BTUART_CTS       MFP_CFG_IN(GPIO44, AF1)
 #define GPIO42_BTUART_RXD       MFP_CFG_IN(GPIO42, AF1)
 #define GPIO45_BTUART_RTS       MFP_CFG_OUT(GPIO45, AF2, DRIVE_HIGH)
+#define GPIO45_BTUART_RTS_LPM_LOW       MFP_CFG_OUT(GPIO45, AF2, DRIVE_LOW)
 #define GPIO43_BTUART_TXD       MFP_CFG_OUT(GPIO43, AF2, DRIVE_HIGH)
+#define GPIO43_BTUART_TXD_LPM_LOW       MFP_CFG_OUT(GPIO43, AF2, DRIVE_LOW)
 
 /* STUART */
 #define GPIO46_STUART_RXD       MFP_CFG_IN(GPIO46, AF2)