@ -274,25 +274,25 @@ static struct mc13xxx_regulator mc13892_regulators[] = {
MC13892_SW_DEFINE ( SW4 , SWITCHERS3 , SWITCHERS3 , mc13892_sw ) ,
MC13892_SW_DEFINE ( SW4 , SWITCHERS3 , SWITCHERS3 , mc13892_sw ) ,
MC13892_FIXED_DEFINE ( SWBST , SWITCHERS5 , mc13892_swbst ) ,
MC13892_FIXED_DEFINE ( SWBST , SWITCHERS5 , mc13892_swbst ) ,
MC13892_FIXED_DEFINE ( VIOHI , REGULATORMODE0 , mc13892_viohi ) ,
MC13892_FIXED_DEFINE ( VIOHI , REGULATORMODE0 , mc13892_viohi ) ,
MC13892_DEFINE_REGU ( VPLL , REGULATORMODE0 , REGULATORSETTING0 , \
MC13892_DEFINE_REGU ( VPLL , REGULATORMODE0 , REGULATORSETTING0 ,
mc13892_vpll ) ,
mc13892_vpll ) ,
MC13892_DEFINE_REGU ( VDIG , REGULATORMODE0 , REGULATORSETTING0 , \
MC13892_DEFINE_REGU ( VDIG , REGULATORMODE0 , REGULATORSETTING0 ,
mc13892_vdig ) ,
mc13892_vdig ) ,
MC13892_DEFINE_REGU ( VSD , REGULATORMODE1 , REGULATORSETTING1 , \
MC13892_DEFINE_REGU ( VSD , REGULATORMODE1 , REGULATORSETTING1 ,
mc13892_vsd ) ,
mc13892_vsd ) ,
MC13892_DEFINE_REGU ( VUSB2 , REGULATORMODE0 , REGULATORSETTING0 , \
MC13892_DEFINE_REGU ( VUSB2 , REGULATORMODE0 , REGULATORSETTING0 ,
mc13892_vusb2 ) ,
mc13892_vusb2 ) ,
MC13892_DEFINE_REGU ( VVIDEO , REGULATORMODE1 , REGULATORSETTING1 , \
MC13892_DEFINE_REGU ( VVIDEO , REGULATORMODE1 , REGULATORSETTING1 ,
mc13892_vvideo ) ,
mc13892_vvideo ) ,
MC13892_DEFINE_REGU ( VAUDIO , REGULATORMODE1 , REGULATORSETTING1 , \
MC13892_DEFINE_REGU ( VAUDIO , REGULATORMODE1 , REGULATORSETTING1 ,
mc13892_vaudio ) ,
mc13892_vaudio ) ,
MC13892_DEFINE_REGU ( VCAM , REGULATORMODE1 , REGULATORSETTING0 , \
MC13892_DEFINE_REGU ( VCAM , REGULATORMODE1 , REGULATORSETTING0 ,
mc13892_vcam ) ,
mc13892_vcam ) ,
MC13892_DEFINE_REGU ( VGEN1 , REGULATORMODE0 , REGULATORSETTING0 , \
MC13892_DEFINE_REGU ( VGEN1 , REGULATORMODE0 , REGULATORSETTING0 ,
mc13892_vgen1 ) ,
mc13892_vgen1 ) ,
MC13892_DEFINE_REGU ( VGEN2 , REGULATORMODE0 , REGULATORSETTING0 , \
MC13892_DEFINE_REGU ( VGEN2 , REGULATORMODE0 , REGULATORSETTING0 ,
mc13892_vgen2 ) ,
mc13892_vgen2 ) ,
MC13892_DEFINE_REGU ( VGEN3 , REGULATORMODE1 , REGULATORSETTING0 , \
MC13892_DEFINE_REGU ( VGEN3 , REGULATORMODE1 , REGULATORSETTING0 ,
mc13892_vgen3 ) ,
mc13892_vgen3 ) ,
MC13892_FIXED_DEFINE ( VUSB , USB1 , mc13892_vusb ) ,
MC13892_FIXED_DEFINE ( VUSB , USB1 , mc13892_vusb ) ,
MC13892_GPO_DEFINE ( GPO1 , POWERMISC , mc13892_gpo ) ,
MC13892_GPO_DEFINE ( GPO1 , POWERMISC , mc13892_gpo ) ,
@ -476,8 +476,8 @@ static int mc13892_sw_regulator_set_voltage_sel(struct regulator_dev *rdev,
}
}
mc13xxx_lock ( priv - > mc13xxx ) ;
mc13xxx_lock ( priv - > mc13xxx ) ;
ret = mc13xxx_reg_rmw ( priv - > mc13xxx , mc13892_regulators [ id ] . vsel_reg , mask ,
ret = mc13xxx_reg_rmw ( priv - > mc13xxx , mc13892_regulators [ id ] . vsel_reg ,
reg_value ) ;
mask , reg_value ) ;
mc13xxx_unlock ( priv - > mc13xxx ) ;
mc13xxx_unlock ( priv - > mc13xxx ) ;
return ret ;
return ret ;