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

Pull ARM SoC board updates from Olof Johansson:
 "Board updates for 3.12.  Again, a bit of domain overlap with SoC and
  DT branches, but most of this is around legacy code and board support.
  We've found that platform maintainers have a hard time separating all
  of these out and might move towards fewer branches for next release.

   - Removal of a number of Marvell Kirkwood board files, since contents
     is now common and mostly configured via DT.
   - Device-tree updates for Marvell Dove, including irqchip and
     clocksource setup.
   - Defconfig updates.  Gotta go somewhere.  One new one for Renesas
     Lager.
   - New backlight drivers for backlights used on Renesas shmobile
     platforms.
   - Removal of Renesas leds driver.
   - Shuffling of some of the new Broadcom platforms to give room for
     others in the same mach directory.  More in 3.13"

* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
  mmc: sdhci-bcm-kona: Staticize sdhci_bcm_kona_card_event
  mmc: sdhci-bcm-kona: Remove unneeded version.h inclusion
  ARM: bcm: Make secure API call optional
  ARM: DT: binding fixup to align with vendor-prefixes.txt (drivers)
  ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-kona
  ARM: bcm: Rename board_bcm
  mmc: sdhci-bcm-kona: make linker-section warning go away
  ARM: tegra: defconfig updates
  ARM: dove: add initial DT file for Globalscale D2Plug
  ARM: dove: add GPIO IR receiver node to SolidRun CuBox
  ARM: dove: add common pinmux functions to DT
  ARM: dove: add cpu device tree node
  ARM: dove: update dove_defconfig with SI5351, PCI, and xHCI
  arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argument
  ARM: kirkwood: fix DT building and update defconfig
  ARM: kirkwood: Remove all remaining trace of DNS-320/325 platform code
  ARM: configs: disable DEBUG_LL in bcm_defconfig
  ARM: bcm281xx: Board specific reboot code
  ARM bcm281xx: Turn on socket & network support.
  ARM: bcm281xx: Turn on L2 cache.
  ...

3 files changed, 34 insertions, 70 deletions

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index a4f630f04ea3..65dd81baa7f6 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -30,6 +30,7 @@
 #include <linux/spi/mmc_spi.h>
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
+#include <linux/platform_data/gpio_backlight.h>
 #include <linux/sh_eth.h>
 #include <linux/sh_intc.h>
 #include <linux/videodev2.h>
@@ -302,7 +303,7 @@ static struct platform_device usbhs_device = {
         .resource       = usbhs_resources,
 };
 
-/* LCDC */
+/* LCDC and backlight */
 static const struct fb_videomode ecovec_lcd_modes[] = {
         {
                 .name           = "Panel",
@@ -333,13 +334,6 @@ static const struct fb_videomode ecovec_dvi_modes[] = {
         },
 };
 
-static int ecovec24_set_brightness(int brightness)
-{
-        gpio_set_value(GPIO_PTR1, brightness);
-
-        return 0;
-}
-
 static struct sh_mobile_lcdc_info lcdc_info = {
         .ch[0] = {
                 .interface_type = RGB18,
@@ -349,11 +343,6 @@ static struct sh_mobile_lcdc_info lcdc_info = {
                         .width = 152,
                         .height = 91,
                 },
-                .bl_info = {
-                        .name = "sh_mobile_lcdc_bl",
-                        .max_brightness = 1,
-                        .set_brightness = ecovec24_set_brightness,
-                },
         }
 };
 
@@ -379,6 +368,20 @@ static struct platform_device lcdc_device = {
         },
 };
 
+static struct gpio_backlight_platform_data gpio_backlight_data = {
+        .fbdev = &lcdc_device.dev,
+        .gpio = GPIO_PTR1,
+        .def_value = 1,
+        .name = "backlight",
+};
+
+static struct platform_device gpio_backlight_device = {
+        .name = "gpio-backlight",
+        .dev = {
+                .platform_data = &gpio_backlight_data,
+        },
+};
+
 /* CEU0 */
 static struct sh_mobile_ceu_info sh_mobile_ceu0_info = {
         .flags = SH_CEU_FLAG_USE_8BIT_BUS,
@@ -1048,6 +1051,7 @@ static struct platform_device *ecovec_devices[] __initdata = {
         &usb1_common_device,
         &usbhs_device,
         &lcdc_device,
+        &gpio_backlight_device,
         &ceu0_device,
         &ceu1_device,
         &keysc_device,
@@ -1238,11 +1242,9 @@ static int __init arch_setup(void)
 
         gpio_request(GPIO_PTE6, NULL);
         gpio_request(GPIO_PTU1, NULL);
-        gpio_request(GPIO_PTR1, NULL);
         gpio_request(GPIO_PTA2, NULL);
         gpio_direction_input(GPIO_PTE6);
         gpio_direction_output(GPIO_PTU1, 0);
-        gpio_direction_output(GPIO_PTR1, 0);
         gpio_direction_output(GPIO_PTA2, 0);
 
         /* I/O buffer drive ability is high */
@@ -1255,6 +1257,9 @@ static int __init arch_setup(void)
                 lcdc_info.ch[0].lcd_modes               = ecovec_dvi_modes;
                 lcdc_info.ch[0].num_modes               = ARRAY_SIZE(ecovec_dvi_modes);
 
+                /* No backlight */
+                gpio_backlight_data.fbdev = NULL;
+
                 gpio_set_value(GPIO_PTA2, 1);
                 gpio_set_value(GPIO_PTU1, 1);
         } else {
@@ -1264,8 +1269,6 @@ static int __init arch_setup(void)
                 lcdc_info.ch[0].lcd_modes               = ecovec_lcd_modes;
                 lcdc_info.ch[0].num_modes               = ARRAY_SIZE(ecovec_lcd_modes);
 
-                gpio_set_value(GPIO_PTR1, 1);
-
                 /* FIXME
                  *
                  * LCDDON control is needed for Panel,
diff --git a/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c b/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
index c62050332629..355a78a3b313 100644
--- a/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
+++ b/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
@@ -276,51 +276,3 @@ void kfr2r09_lcd_start(void *sohandle, struct sh_mobile_lcdc_sys_bus_ops *so)
 {
         write_memory_start(sohandle, so);
 }
-
-#define CTRL_CKSW       0x10
-#define CTRL_C10        0x20
-#define CTRL_CPSW       0x80
-#define MAIN_MLED4      0x40
-#define MAIN_MSW        0x80
-
-int kfr2r09_lcd_set_brightness(int brightness)
-{
-        struct i2c_adapter *a;
-        struct i2c_msg msg;
-        unsigned char buf[2];
-        int ret;
-
-        a = i2c_get_adapter(0);
-        if (!a)
-                return -ENODEV;
-
-        buf[0] = 0x00;
-        if (brightness)
-                buf[1] = CTRL_CPSW | CTRL_C10 | CTRL_CKSW;
-        else
-                buf[1] = 0;
-
-        msg.addr = 0x75;
-        msg.buf = buf;
-        msg.len = 2;
-        msg.flags = 0;
-        ret = i2c_transfer(a, &msg, 1);
-        if (ret != 1)
-                return -ENODEV;
-
-        buf[0] = 0x01;
-        if (brightness)
-                buf[1] = MAIN_MSW | MAIN_MLED4 | 0x0c;
-        else
-                buf[1] = 0;
-
-        msg.addr = 0x75;
-        msg.buf = buf;
-        msg.len = 2;
-        msg.flags = 0;
-        ret = i2c_transfer(a, &msg, 1);
-        if (ret != 1)
-                return -ENODEV;
-
-        return 0;
-}
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index ab502f12ef57..1df4398f8375 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -21,6 +21,7 @@
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
 #include <linux/i2c.h>
+#include <linux/platform_data/lv5207lp.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
 #include <linux/usb/r8a66597.h>
@@ -159,11 +160,6 @@ static struct sh_mobile_lcdc_info kfr2r09_sh_lcdc_info = {
                         .setup_sys = kfr2r09_lcd_setup,
                         .start_transfer = kfr2r09_lcd_start,
                 },
-                .bl_info = {
-                        .name = "sh_mobile_lcdc_bl",
-                        .max_brightness = 1,
-                        .set_brightness = kfr2r09_lcd_set_brightness,
-                },
                 .sys_bus_cfg = {
                         .ldmt2r = 0x07010904,
                         .ldmt3r = 0x14012914,
@@ -195,6 +191,17 @@ static struct platform_device kfr2r09_sh_lcdc_device = {
         },
 };
 
+static struct lv5207lp_platform_data kfr2r09_backlight_data = {
+        .fbdev = &kfr2r09_sh_lcdc_device.dev,
+        .def_value = 13,
+        .max_value = 13,
+};
+
+static struct i2c_board_info kfr2r09_backlight_board_info = {
+        I2C_BOARD_INFO("lv5207lp", 0x75),
+        .platform_data = &kfr2r09_backlight_data,
+};
+
 static struct r8a66597_platdata kfr2r09_usb0_gadget_data = {
         .on_chip = 1,
 };
@@ -627,6 +634,8 @@ static int __init kfr2r09_devices_setup(void)
         gpio_request(GPIO_FN_SDHI0CMD, NULL);
         gpio_request(GPIO_FN_SDHI0CLK, NULL);
 
+        i2c_register_board_info(0, &kfr2r09_backlight_board_info, 1);
+
         return platform_add_devices(kfr2r09_devices,
                                     ARRAY_SIZE(kfr2r09_devices));
 }