--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@@ -572,75 -395,10 +509,62 @@@ static struct regulator_init_data sdp44
  	},
  };
  
 +static struct regulator_init_data sdp4430_vana = {
 +	.constraints = {
 +		.min_uV			= 2100000,
 +		.max_uV			= 2100000,
 +		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 +					| REGULATOR_MODE_STANDBY,
 +		.valid_ops_mask	 = REGULATOR_CHANGE_MODE
 +					| REGULATOR_CHANGE_STATUS,
 +	},
 +};
 +
 +static struct regulator_init_data sdp4430_vcxio = {
 +	.constraints = {
 +		.min_uV			= 1800000,
 +		.max_uV			= 1800000,
 +		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 +					| REGULATOR_MODE_STANDBY,
 +		.valid_ops_mask	 = REGULATOR_CHANGE_MODE
 +					| REGULATOR_CHANGE_STATUS,
 +	},
 +};
 +
 +static struct regulator_init_data sdp4430_vdac = {
 +	.constraints = {
 +		.min_uV			= 1800000,
 +		.max_uV			= 1800000,
 +		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 +					| REGULATOR_MODE_STANDBY,
 +		.valid_ops_mask	 = REGULATOR_CHANGE_MODE
 +					| REGULATOR_CHANGE_STATUS,
 +	},
 +};
 +
 +static struct regulator_init_data sdp4430_vusb = {
 +	.constraints = {
 +		.min_uV			= 3300000,
 +		.max_uV			= 3300000,
 +		.apply_uV		= true,
 +		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 +					| REGULATOR_MODE_STANDBY,
 +		.valid_ops_mask	 =	REGULATOR_CHANGE_MODE
 +					| REGULATOR_CHANGE_STATUS,
 +	},
 +};
 +
 +static struct regulator_init_data sdp4430_clk32kg = {
 +	.constraints = {
 +		.valid_ops_mask		= REGULATOR_CHANGE_STATUS,
 +		.always_on		= true,
 +	},
 +};
 +
  static struct twl4030_platform_data sdp4430_twldata = {
- 	.irq_base	= TWL6030_IRQ_BASE,
- 	.irq_end	= TWL6030_IRQ_END,
- 
  	/* Regulators */
- 	.vmmc		= &sdp4430_vmmc,
- 	.vpp		= &sdp4430_vpp,
  	.vusim		= &sdp4430_vusim,
- 	.vana		= &sdp4430_vana,
- 	.vcxio		= &sdp4430_vcxio,
- 	.vdac		= &sdp4430_vdac,
- 	.vusb		= &sdp4430_vusb,
  	.vaux1		= &sdp4430_vaux1,
- 	.vaux2		= &sdp4430_vaux2,
- 	.vaux3		= &sdp4430_vaux3,
- 	.clk32kg	= &sdp4430_clk32kg,
- 	.usb		= &omap4_usbphy_data
  };
  
  static struct i2c_board_info __initdata sdp4430_i2c_3_boardinfo[] = {
--- 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,
  };