From: Tony Lindgren <tony@atomide.com>
Date: Sun, 10 Jul 2011 18:48:26 +0000 (-0700)
Subject: Merge branch 'cleanup-part-2' into devel-board
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=1ad920556f32a5a127397ca461d1a1faaf22c4e0;p=linux-edison.git

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

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

1ad920556f32a5a127397ca461d1a1faaf22c4e0
diff --cc arch/arm/mach-omap2/board-4430sdp.c
index f6efff5f165,933b25bb10d..a7c0b31fd08
--- a/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-rx51-peripherals.c
index 7d377542517,6140290721a..8946d7232f3
--- a/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,
  };