Merge branch 'cleanup-part-2' into devel-board

Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-rx51-peripherals.c

diff --cc arch/arm/mach-omap2/board-4430sdp.c
index f6efff5,933b25b..a7c0b31
--- 1/arch/arm/mach-omap2/board-4430sdp.c
--- 2/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@@ -411,41 -324,6 +403,37 @@@ static struct regulator_consumer_suppl
        REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),
  };
  
- static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {
-       REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
- };
- 
 +static struct regulator_consumer_supply omap4_sdp4430_vmmc5_supply = {
 +      .supply = "vmmc",
 +      .dev_name = "omap_hsmmc.4",
 +};
 +
 +static struct regulator_init_data sdp4430_vmmc5 = {
 +      .constraints = {
 +              .valid_ops_mask = REGULATOR_CHANGE_STATUS,
 +      },
 +      .num_consumer_supplies = 1,
 +      .consumer_supplies = &omap4_sdp4430_vmmc5_supply,
 +};
 +
 +static struct fixed_voltage_config sdp4430_vwlan = {
 +      .supply_name            = "vwl1271",
 +      .microvolts             = 1800000, /* 1.8V */
 +      .gpio                   = GPIO_WIFI_PMENA,
 +      .startup_delay          = 70000, /* 70msec */
 +      .enable_high            = 1,
 +      .enabled_at_boot        = 0,
 +      .init_data              = &sdp4430_vmmc5,
 +};
 +
 +static struct platform_device omap_vwlan_device = {
 +      .name           = "reg-fixed-voltage",
 +      .id             = 1,
 +      .dev = {
 +              .platform_data = &sdp4430_vwlan,
 +      },
 +};
 +
  static int omap4_twl6030_hsmmc_late_init(struct device *dev)
  {
        int ret = 0;

diff --cc arch/arm/mach-omap2/board-cm-t35.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge

diff --cc arch/arm/mach-omap2/board-overo.c
Simple merge

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index 7d37754,6140290..8946d72
--- 1/arch/arm/mach-omap2/board-rx51-peripherals.c
--- 2/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -916,13 -761,7 +884,12 @@@ static struct twl4030_platform_data rx5
        .vaux2                  = &rx51_vaux2,
        .vaux4                  = &rx51_vaux4,
        .vmmc1                  = &rx51_vmmc1,
 +      .vpll1                  = &rx51_vpll1,
 +      .vpll2                  = &rx51_vpll2,
        .vsim                   = &rx51_vsim,
-       .vdac                   = &rx51_vdac,
 +      .vintana1               = &rx51_vintana1,
 +      .vintana2               = &rx51_vintana2,
 +      .vintdig                = &rx51_vintdig,
        .vio                    = &rx51_vio,
  };