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

Pull ARM SoC board updates from Olof Johansson:
 "This branch contains a set of various board updates for ARM platforms.

  A few shmobile platforms that are stale have been removed, some
  defconfig updates for various boards selecting new features such as
  pinctrl subsystem support, and various updates enabling peripherals,
  etc."

Fix up conflicts mostly as per Olof.

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (58 commits)
  ARM: S3C64XX: Add dummy supplies for Glenfarclas LDOs
  ARM: S3C64XX: Add registration of WM2200 Bells device on Cragganmore
  ARM: kirkwood: Add Plat'Home OpenBlocks A6 support
  ARM: Dove: update defconfig
  ARM: Kirkwood: update defconfig for new boards
  arm: orion5x: add DT related options in defconfig
  arm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree
  arm: orion5x: basic Device Tree support
  arm: orion5x: mechanical defconfig update
  ARM: kirkwood: Add support for the MPL CEC4
  arm: kirkwood: add support for ZyXEL NSA310
  ARM: Kirkwood: new board USI Topkick
  ARM: kirkwood: use gpio-fan DT binding on lsxl
  ARM: Kirkwood: add Netspace boards to defconfig
  ARM: kirkwood: DT board setup for Network Space Mini v2
  ARM: kirkwood: DT board setup for Network Space Lite v2
  ARM: kirkwood: DT board setup for Network Space v2 and parents
  leds: leds-ns2: add device tree binding
  ARM: Kirkwood: Enable the second I2C bus
  ARM: mmp: select pinctrl driver
  ...

3 files changed, 164 insertions, 28 deletions

diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 63e7ae3ee9e6..131c86284711 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -294,6 +294,7 @@ config MACH_WLF_CRAGG_6410
         select S3C64XX_SETUP_SDHCI
         select S3C64XX_SETUP_SPI
         select S3C64XX_SETUP_USB_PHY
+        select S3C_DEV_FB
         select S3C_DEV_HSMMC
         select S3C_DEV_HSMMC1
         select S3C_DEV_HSMMC2
@@ -304,6 +305,7 @@ config MACH_WLF_CRAGG_6410
         select S3C_DEV_WDT
         select SAMSUNG_DEV_ADC
         select SAMSUNG_DEV_KEYPAD
+        select SAMSUNG_DEV_PWM
         select SAMSUNG_GPIO_EXTRA128
         help
           Machine support for the Wolfson Cragganmore S3C6410 variant.
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index 4e3fe57674c8..c6d8dba90623 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -20,6 +20,8 @@
 
 #include <linux/regulator/machine.h>
 
+#include <sound/wm0010.h>
+#include <sound/wm2200.h>
 #include <sound/wm5100.h>
 #include <sound/wm8996.h>
 #include <sound/wm8962.h>
@@ -33,14 +35,34 @@ static struct s3c64xx_spi_csinfo wm0010_spi_csinfo = {
         .line = S3C64XX_GPC(3),
 };
 
+static struct wm0010_pdata wm0010_pdata = {
+        .gpio_reset = S3C64XX_GPN(6),
+        .reset_active_high = 1, /* Active high for Glenfarclas Rev 2 */
+};
+
 static struct spi_board_info wm1253_devs[] = {
         [0] = {
                 .modalias       = "wm0010",
+                .max_speed_hz   = 26 * 1000 * 1000,
                 .bus_num        = 0,
                 .chip_select    = 0,
                 .mode           = SPI_MODE_0,
                 .irq            = S3C_EINT(5),
                 .controller_data = &wm0010_spi_csinfo,
+                .platform_data = &wm0010_pdata,
+        },
+};
+
+static struct spi_board_info balblair_devs[] = {
+        [0] = {
+                .modalias       = "wm0010",
+                .max_speed_hz   = 26 * 1000 * 1000,
+                .bus_num        = 0,
+                .chip_select    = 0,
+                .mode           = SPI_MODE_0,
+                .irq            = S3C_EINT(4),
+                .controller_data = &wm0010_spi_csinfo,
+                .platform_data = &wm0010_pdata,
         },
 };
 
@@ -166,12 +188,13 @@ static struct regulator_init_data wm8994_ldo2 = {
 
 static struct wm8994_pdata wm8994_pdata = {
         .gpio_base = CODEC_GPIO_BASE,
+        .micb2_delay = 150,
         .gpio_defaults = {
                 0x3,          /* IRQ out, active high, CMOS */
         },
         .ldo = {
-                 { .init_data = &wm8994_ldo1, },
-                 { .init_data = &wm8994_ldo2, },
+                 { .enable = S3C64XX_GPN(6), .init_data = &wm8994_ldo1, },
+                 { .enable = S3C64XX_GPN(4), .init_data = &wm8994_ldo2, },
         },
 };
 
@@ -182,7 +205,7 @@ static const struct i2c_board_info wm1277_devs[] = {
         },
 };
 
-static struct arizona_pdata wm5102_pdata = {
+static struct arizona_pdata wm5102_reva_pdata = {
         .ldoena = S3C64XX_GPN(7),
         .gpio_base = CODEC_GPIO_BASE,
         .irq_active_high = true,
@@ -193,64 +216,131 @@ static struct arizona_pdata wm5102_pdata = {
         },
 };
 
-static struct s3c64xx_spi_csinfo wm5102_spi_csinfo = {
+static struct s3c64xx_spi_csinfo codec_spi_csinfo = {
         .line = S3C64XX_GPN(5),
 };
 
+static struct spi_board_info wm5102_reva_spi_devs[] = {
+        [0] = {
+                .modalias       = "wm5102",
+                .max_speed_hz   = 10 * 1000 * 1000,
+                .bus_num        = 0,
+                .chip_select    = 1,
+                .mode           = SPI_MODE_0,
+                .irq            = GLENFARCLAS_PMIC_IRQ_BASE +
+                                  WM831X_IRQ_GPIO_2,
+                .controller_data = &codec_spi_csinfo,
+                .platform_data = &wm5102_reva_pdata,
+        },
+};
+
+static struct arizona_pdata wm5102_pdata = {
+        .ldoena = S3C64XX_GPN(7),
+        .gpio_base = CODEC_GPIO_BASE,
+        .irq_active_high = true,
+        .micd_pol_gpio = CODEC_GPIO_BASE + 2,
+        .gpio_defaults = {
+                [2] = 0x10000, /* AIF3TXLRCLK */
+                [3] = 0x4,     /* OPCLK */
+        },
+};
+
 static struct spi_board_info wm5102_spi_devs[] = {
         [0] = {
                 .modalias       = "wm5102",
                 .max_speed_hz   = 10 * 1000 * 1000,
                 .bus_num        = 0,
-                .chip_select    = 0,
+                .chip_select    = 1,
                 .mode           = SPI_MODE_0,
                 .irq            = GLENFARCLAS_PMIC_IRQ_BASE +
                                   WM831X_IRQ_GPIO_2,
-                .controller_data = &wm5102_spi_csinfo,
+                .controller_data = &codec_spi_csinfo,
                 .platform_data = &wm5102_pdata,
         },
 };
 
+static struct spi_board_info wm5110_spi_devs[] = {
+        [0] = {
+                .modalias       = "wm5110",
+                .max_speed_hz   = 10 * 1000 * 1000,
+                .bus_num        = 0,
+                .chip_select    = 1,
+                .mode           = SPI_MODE_0,
+                .irq            = GLENFARCLAS_PMIC_IRQ_BASE +
+                                  WM831X_IRQ_GPIO_2,
+                .controller_data = &codec_spi_csinfo,
+                .platform_data = &wm5102_reva_pdata,
+        },
+};
+
 static const struct i2c_board_info wm6230_i2c_devs[] = {
         { I2C_BOARD_INFO("wm9081", 0x6c),
           .platform_data = &wm9081_pdata, },
 };
 
+static struct wm2200_pdata wm2200_pdata = {
+        .ldo_ena = S3C64XX_GPN(7),
+        .gpio_defaults = {
+                [2] = 0x0005,  /* GPIO3 24.576MHz output clock */
+        },
+};
+
+static const struct i2c_board_info wm2200_i2c[] = {
+        { I2C_BOARD_INFO("wm2200", 0x3a),
+          .platform_data = &wm2200_pdata, },
+};
+
 static __devinitdata const struct {
         u8 id;
+        u8 rev;
         const char *name;
         const struct i2c_board_info *i2c_devs;
         int num_i2c_devs;
         const struct spi_board_info *spi_devs;
         int num_spi_devs;
 } gf_mods[] = {
-        { .id = 0x01, .name = "1250-EV1 Springbank" },
-        { .id = 0x02, .name = "1251-EV1 Jura" },
-        { .id = 0x03, .name = "1252-EV1 Glenlivet" },
-        { .id = 0x11, .name = "6249-EV2 Glenfarclas", },
-        { .id = 0x14, .name = "6271-EV1 Lochnagar" },
-        { .id = 0x15, .name = "6320-EV1 Bells",
+        { .id = 0x01, .rev = 0xff, .name = "1250-EV1 Springbank" },
+        { .id = 0x02, .rev = 0xff, .name = "1251-EV1 Jura" },
+        { .id = 0x03, .rev = 0xff, .name = "1252-EV1 Glenlivet" },
+        { .id = 0x06, .rev = 0xff, .name = "WM8997-6721-CS96-EV1 Lapraoig" },
+        { .id = 0x07, .rev = 0xff, .name = "WM5110-6271 Deanston",
+          .spi_devs = wm5110_spi_devs,
+          .num_spi_devs = ARRAY_SIZE(wm5110_spi_devs) },
+        { .id = 0x08, .rev = 0xff, .name = "WM8903-6102 Tamdhu" },
+        { .id = 0x09, .rev = 0xff, .name = "WM1811A-6305 Adelphi" },
+        { .id = 0x0a, .rev = 0xff, .name = "WM8996-6272 Blackadder" },
+        { .id = 0x0b, .rev = 0xff, .name = "WM8994-6235 Benromach" },
+        { .id = 0x11, .rev = 0xff, .name = "6249-EV2 Glenfarclas", },
+        { .id = 0x14, .rev = 0xff, .name = "6271-EV1 Lochnagar" },
+        { .id = 0x15, .rev = 0xff, .name = "6320-EV1 Bells",
           .i2c_devs = wm6230_i2c_devs,
           .num_i2c_devs = ARRAY_SIZE(wm6230_i2c_devs) },
-        { .id = 0x21, .name = "1275-EV1 Mortlach" },
-        { .id = 0x25, .name = "1274-EV1 Glencadam" },
-        { .id = 0x31, .name = "1253-EV1 Tomatin",
+        { .id = 0x21, .rev = 0xff, .name = "1275-EV1 Mortlach" },
+        { .id = 0x25, .rev = 0xff, .name = "1274-EV1 Glencadam" },
+        { .id = 0x31, .rev = 0xff, .name = "1253-EV1 Tomatin",
           .spi_devs = wm1253_devs, .num_spi_devs = ARRAY_SIZE(wm1253_devs) },
-        { .id = 0x32, .name = "XXXX-EV1 Caol Illa" },
-        { .id = 0x33, .name = "XXXX-EV1 Oban" },
-        { .id = 0x34, .name = "WM0010-6320-CS42 Balblair" },
-        { .id = 0x39, .name = "1254-EV1 Dallas Dhu",
+        { .id = 0x32, .rev = 0xff, .name = "XXXX-EV1 Caol Illa" },
+        { .id = 0x33, .rev = 0xff, .name = "XXXX-EV1 Oban" },
+        { .id = 0x34, .rev = 0xff, .name = "WM0010-6320-CS42 Balblair",
+          .spi_devs = balblair_devs,
+          .num_spi_devs = ARRAY_SIZE(balblair_devs) },
+        { .id = 0x39, .rev = 0xff, .name = "1254-EV1 Dallas Dhu",
           .i2c_devs = wm1254_devs, .num_i2c_devs = ARRAY_SIZE(wm1254_devs) },
-        { .id = 0x3a, .name = "1259-EV1 Tobermory",
+        { .id = 0x3a, .rev = 0xff, .name = "1259-EV1 Tobermory",
           .i2c_devs = wm1259_devs, .num_i2c_devs = ARRAY_SIZE(wm1259_devs) },
-        { .id = 0x3b, .name = "1255-EV1 Kilchoman",
+        { .id = 0x3b, .rev = 0xff, .name = "1255-EV1 Kilchoman",
           .i2c_devs = wm1255_devs, .num_i2c_devs = ARRAY_SIZE(wm1255_devs) },
-        { .id = 0x3c, .name = "1273-EV1 Longmorn" },
-        { .id = 0x3d, .name = "1277-EV1 Littlemill",
+        { .id = 0x3c, .rev = 0xff, .name = "1273-EV1 Longmorn" },
+        { .id = 0x3d, .rev = 0xff, .name = "1277-EV1 Littlemill",
           .i2c_devs = wm1277_devs, .num_i2c_devs = ARRAY_SIZE(wm1277_devs) },
-        { .id = 0x3e, .name = "WM5102-6271-EV1-CS127 Amrut",
+        { .id = 0x3e, .rev = 0, .name = "WM5102-6271-EV1-CS127 Amrut",
+          .spi_devs = wm5102_reva_spi_devs,
+          .num_spi_devs = ARRAY_SIZE(wm5102_reva_spi_devs) },
+        { .id = 0x3e, .rev = -1, .name = "WM5102-6271-EV1-CS127 Amrut",
           .spi_devs = wm5102_spi_devs,
           .num_spi_devs = ARRAY_SIZE(wm5102_spi_devs) },
+        { .id = 0x3f, .rev = -1, .name = "WM2200-6271-CS90-M-REV1",
+          .i2c_devs = wm2200_i2c, .num_i2c_devs = ARRAY_SIZE(wm2200_i2c) },
 };
 
 static __devinit int wlf_gf_module_probe(struct i2c_client *i2c,
@@ -267,7 +357,8 @@ static __devinit int wlf_gf_module_probe(struct i2c_client *i2c,
         id = (ret & 0xfe) >> 2;
         rev = ret & 0x3;
         for (i = 0; i < ARRAY_SIZE(gf_mods); i++)
-                if (id == gf_mods[i].id)
+                if (id == gf_mods[i].id && (gf_mods[i].rev == 0xff ||
+                                            rev == gf_mods[i].rev))
                         break;
 
         if (i < ARRAY_SIZE(gf_mods)) {
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 13b7eaa45fd0..701f421de1a8 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -287,16 +287,21 @@ static struct platform_device littlemill_device = {
         .id             = -1,
 };
 
-static struct platform_device bells_wm5102_device = {
+static struct platform_device bells_wm2200_device = {
         .name           = "bells",
         .id             = 0,
 };
 
-static struct platform_device bells_wm5110_device = {
+static struct platform_device bells_wm5102_device = {
         .name           = "bells",
         .id             = 1,
 };
 
+static struct platform_device bells_wm5110_device = {
+        .name           = "bells",
+        .id             = 2,
+};
+
 static struct regulator_consumer_supply wallvdd_consumers[] = {
         REGULATOR_SUPPLY("SPKVDD", "1-001a"),
         REGULATOR_SUPPLY("SPKVDD1", "1-001a"),
@@ -304,6 +309,13 @@ static struct regulator_consumer_supply wallvdd_consumers[] = {
         REGULATOR_SUPPLY("SPKVDDL", "1-001a"),
         REGULATOR_SUPPLY("SPKVDDR", "1-001a"),
 
+        REGULATOR_SUPPLY("SPKVDDL", "spi0.1"),
+        REGULATOR_SUPPLY("SPKVDDR", "spi0.1"),
+        REGULATOR_SUPPLY("SPKVDDL", "wm5102-codec"),
+        REGULATOR_SUPPLY("SPKVDDR", "wm5102-codec"),
+        REGULATOR_SUPPLY("SPKVDDL", "wm5110-codec"),
+        REGULATOR_SUPPLY("SPKVDDR", "wm5110-codec"),
+
         REGULATOR_SUPPLY("DC1VDD", "0-0034"),
         REGULATOR_SUPPLY("DC2VDD", "0-0034"),
         REGULATOR_SUPPLY("DC3VDD", "0-0034"),
@@ -321,6 +333,16 @@ static struct regulator_consumer_supply wallvdd_consumers[] = {
         REGULATOR_SUPPLY("DC1VDD", "1-0034"),
         REGULATOR_SUPPLY("DC2VDD", "1-0034"),
         REGULATOR_SUPPLY("DC3VDD", "1-0034"),
+        REGULATOR_SUPPLY("LDO1VDD", "1-0034"),
+        REGULATOR_SUPPLY("LDO2VDD", "1-0034"),
+        REGULATOR_SUPPLY("LDO4VDD", "1-0034"),
+        REGULATOR_SUPPLY("LDO5VDD", "1-0034"),
+        REGULATOR_SUPPLY("LDO6VDD", "1-0034"),
+        REGULATOR_SUPPLY("LDO7VDD", "1-0034"),
+        REGULATOR_SUPPLY("LDO8VDD", "1-0034"),
+        REGULATOR_SUPPLY("LDO9VDD", "1-0034"),
+        REGULATOR_SUPPLY("LDO10VDD", "1-0034"),
+        REGULATOR_SUPPLY("LDO11VDD", "1-0034"),
 };
 
 static struct regulator_init_data wallvdd_data = {
@@ -369,6 +391,7 @@ static struct platform_device *crag6410_devices[] __initdata = {
         &tobermory_device,
         &littlemill_device,
         &lowland_device,
+        &bells_wm2200_device,
         &bells_wm5102_device,
         &bells_wm5110_device,
         &wallvdd_device,
@@ -597,6 +620,7 @@ static struct s3c2410_platform_i2c i2c0_pdata = {
 static struct regulator_consumer_supply pvdd_1v2_consumers[] __devinitdata = {
         REGULATOR_SUPPLY("DCVDD", "spi0.0"),
         REGULATOR_SUPPLY("AVDD", "spi0.0"),
+        REGULATOR_SUPPLY("AVDD", "spi0.1"),
 };
 
 static struct regulator_init_data pvdd_1v2 __devinitdata = {
@@ -621,6 +645,24 @@ static struct regulator_consumer_supply pvdd_1v8_consumers[] __devinitdata = {
         REGULATOR_SUPPLY("DCVDD", "1-001a"),
         REGULATOR_SUPPLY("AVDD", "1-001a"),
         REGULATOR_SUPPLY("DBVDD", "spi0.0"),
+
+        REGULATOR_SUPPLY("DBVDD", "1-003a"),
+        REGULATOR_SUPPLY("LDOVDD", "1-003a"),
+        REGULATOR_SUPPLY("CPVDD", "1-003a"),
+        REGULATOR_SUPPLY("AVDD", "1-003a"),
+        REGULATOR_SUPPLY("DBVDD1", "spi0.1"),
+        REGULATOR_SUPPLY("DBVDD2", "spi0.1"),
+        REGULATOR_SUPPLY("DBVDD3", "spi0.1"),
+        REGULATOR_SUPPLY("LDOVDD", "spi0.1"),
+        REGULATOR_SUPPLY("CPVDD", "spi0.1"),
+
+        REGULATOR_SUPPLY("DBVDD2", "wm5102-codec"),
+        REGULATOR_SUPPLY("DBVDD3", "wm5102-codec"),
+        REGULATOR_SUPPLY("CPVDD", "wm5102-codec"),
+
+        REGULATOR_SUPPLY("DBVDD2", "wm5110-codec"),
+        REGULATOR_SUPPLY("DBVDD3", "wm5110-codec"),
+        REGULATOR_SUPPLY("CPVDD", "wm5110-codec"),
 };
 
 static struct regulator_init_data pvdd_1v8 __devinitdata = {
@@ -685,6 +727,7 @@ static struct i2c_board_info i2c_devs1[] __devinitdata = {
           .irq = S3C_EINT(0),
           .platform_data = &glenfarclas_pmic_pdata },
 
+        { I2C_BOARD_INFO("wlf-gf-module", 0x20) },
         { I2C_BOARD_INFO("wlf-gf-module", 0x22) },
         { I2C_BOARD_INFO("wlf-gf-module", 0x24) },
         { I2C_BOARD_INFO("wlf-gf-module", 0x25) },
@@ -810,7 +853,7 @@ static void __init crag6410_machine_init(void)
         i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
 
         samsung_keypad_set_platdata(&crag6410_keypad_data);
-        s3c64xx_spi0_set_platdata(NULL, 0, 1);
+        s3c64xx_spi0_set_platdata(NULL, 0, 2);
 
         platform_add_devices(crag6410_devices, ARRAY_SIZE(crag6410_devices));