Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88c260a1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/mc13783' into regulator-next

parents 08f09c63 6e044c3f

drivers/regulator/mc13783-regulator.c

+14 −14
Original line number Diff line number Diff line
@@ -258,34 +258,34 @@ static struct mc13xxx_regulator mc13783_regulators[] = { 


	MC13783_FIXED_DEFINE(REG, VAUDIO, REGULATORMODE0, mc13783_vaudio_val),

	MC13783_FIXED_DEFINE(REG, VIOHI, REGULATORMODE0, mc13783_viohi_val),

	MC13783_DEFINE_REGU(VIOLO, REGULATORMODE0, REGULATORSETTING0,	\

	MC13783_DEFINE_REGU(VIOLO, REGULATORMODE0, REGULATORSETTING0,

			    mc13783_violo_val),

	MC13783_DEFINE_REGU(VDIG, REGULATORMODE0, REGULATORSETTING0,	\

	MC13783_DEFINE_REGU(VDIG, REGULATORMODE0, REGULATORSETTING0,

			    mc13783_vdig_val),

	MC13783_DEFINE_REGU(VGEN, REGULATORMODE0, REGULATORSETTING0,	\

	MC13783_DEFINE_REGU(VGEN, REGULATORMODE0, REGULATORSETTING0,

			    mc13783_vgen_val),

	MC13783_DEFINE_REGU(VRFDIG, REGULATORMODE0, REGULATORSETTING0,	\

	MC13783_DEFINE_REGU(VRFDIG, REGULATORMODE0, REGULATORSETTING0,

			    mc13783_vrfdig_val),

	MC13783_DEFINE_REGU(VRFREF, REGULATORMODE0, REGULATORSETTING0,	\

	MC13783_DEFINE_REGU(VRFREF, REGULATORMODE0, REGULATORSETTING0,

			    mc13783_vrfref_val),

	MC13783_DEFINE_REGU(VRFCP, REGULATORMODE0, REGULATORSETTING0,	\

	MC13783_DEFINE_REGU(VRFCP, REGULATORMODE0, REGULATORSETTING0,

			    mc13783_vrfcp_val),

	MC13783_DEFINE_REGU(VSIM, REGULATORMODE1, REGULATORSETTING0,	\

	MC13783_DEFINE_REGU(VSIM, REGULATORMODE1, REGULATORSETTING0,

			    mc13783_vsim_val),

	MC13783_DEFINE_REGU(VESIM, REGULATORMODE1, REGULATORSETTING0,	\

	MC13783_DEFINE_REGU(VESIM, REGULATORMODE1, REGULATORSETTING0,

			    mc13783_vesim_val),

	MC13783_DEFINE_REGU(VCAM, REGULATORMODE1, REGULATORSETTING0,	\

	MC13783_DEFINE_REGU(VCAM, REGULATORMODE1, REGULATORSETTING0,

			    mc13783_vcam_val),

	MC13783_FIXED_DEFINE(REG, VRFBG, REGULATORMODE1, mc13783_vrfbg_val),

	MC13783_DEFINE_REGU(VVIB, REGULATORMODE1, REGULATORSETTING1,	\

	MC13783_DEFINE_REGU(VVIB, REGULATORMODE1, REGULATORSETTING1,

			    mc13783_vvib_val),

	MC13783_DEFINE_REGU(VRF1, REGULATORMODE1, REGULATORSETTING1,	\

	MC13783_DEFINE_REGU(VRF1, REGULATORMODE1, REGULATORSETTING1,

			    mc13783_vrf_val),

	MC13783_DEFINE_REGU(VRF2, REGULATORMODE1, REGULATORSETTING1,	\

	MC13783_DEFINE_REGU(VRF2, REGULATORMODE1, REGULATORSETTING1,

			    mc13783_vrf_val),

	MC13783_DEFINE_REGU(VMMC1, REGULATORMODE1, REGULATORSETTING1,	\

	MC13783_DEFINE_REGU(VMMC1, REGULATORMODE1, REGULATORSETTING1,

			    mc13783_vmmc_val),

	MC13783_DEFINE_REGU(VMMC2, REGULATORMODE1, REGULATORSETTING1,	\

	MC13783_DEFINE_REGU(VMMC2, REGULATORMODE1, REGULATORSETTING1,

			    mc13783_vmmc_val),

	MC13783_GPO_DEFINE(REG, GPO1, POWERMISC, mc13783_gpo_val),

	MC13783_GPO_DEFINE(REG, GPO2, POWERMISC, mc13783_gpo_val),