Change the register name definitions for mc13783
Subsystems (5)
PATCH 1/1 Change the register name definitions for mc13783
This patch is resend based on git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git #for-next. No other changes.
PATCH 1/1 Change the register name definitions for mc13783
From: Yong Shen <[email protected]>
To make mc13783 and mc13892 share code, the register names should be changed to fit the new macro definitions in the comming patch.
--- arch/arm/mach-imx/mach-pcm038.c | 4 +- arch/arm/mach-mx3/mach-mx31_3ds.c | 4 +- arch/arm/mach-mx3/mach-mx31moboard.c | 4 +- drivers/regulator/mc13783-regulator.c | 30 +++++++------- include/linux/mfd/mc13783.h | 67 +++++++++++++++++---------------- 5 files changed, 55 insertions(+), 54 deletions(-)
arch/arm/mach-imx/mach-pcm038.c +2 -2
@@ -258,10 +258,10 @@ static struct regulator_init_data cam_data = {static struct mc13783_regulator_init_data pcm038_regulators[] = { { - .id =MC13783_REGU_VCAM , + .id =MC13783_REG_VCAM , .init_data = &cam_data, }, { - .id =MC13783_REGU_VMMC1 , + .id =MC13783_REG_VMMC1 , .init_data = &sdhc1_data, }, };
arch/arm/mach-mx3/mach-mx31_3ds.c +2 -2
@@ -117,10 +117,10 @@ static struct regulator_init_data pwgtx_init = {static struct mc13783_regulator_init_data mx31_3ds_regulators[] = { { - .id =MC13783_REGU_PWGT1SPI ,/* Power Gate for ARM core. */ + .id =MC13783_REG_PWGT1SPI ,/* Power Gate for ARM core. */ .init_data = &pwgtx_init, }, { - .id =MC13783_REGU_PWGT2SPI ,/* Power Gate for L2 Cache. */ + .id =MC13783_REG_PWGT2SPI ,/* Power Gate for L2 Cache. */ .init_data = &pwgtx_init, }, };
arch/arm/mach-mx3/mach-mx31moboard.c +2 -2
@@ -218,11 +218,11 @@ static struct regulator_init_data cam_vreg_data = {static struct mc13783_regulator_init_data moboard_regulators[] = { { - .id =MC13783_REGU_VMMC1 , + .id =MC13783_REG_VMMC1 , .init_data = &sdhc_vreg_data, }, { - .id =MC13783_REGU_VCAM , + .id =MC13783_REG_VCAM , .init_data = &cam_vreg_data, }, };
drivers/regulator/mc13783-regulator.c +15 -15
@@ -228,15 +228,15 @@ static struct regulator_ops mc13783_gpo_regulator_ops; }#define MC13783_DEFINE_SW (_name, _reg, _vsel_reg, _voltages) \ - MC13783_DEFINE(SW, _name, _reg, _vsel_reg, _voltages) + MC13783_DEFINE(REG, _name, _reg, _vsel_reg, _voltages)#define MC13783_DEFINE_REGU (_name, _reg, _vsel_reg, _voltages) \ - MC13783_DEFINE(REGU, _name, _reg, _vsel_reg, _voltages) + MC13783_DEFINE(REG, _name, _reg, _vsel_reg, _voltages)static struct mc13783_regulator mc13783_regulators[] = {MC13783_DEFINE_SW (SW3 ,SWITCHERS5 ,SWITCHERS5 , mc13783_sw3_val), -MC13783_FIXED_DEFINE (REGU ,VAUDIO ,REGULATORMODE0 , mc13783_vaudio_val), -MC13783_FIXED_DEFINE (REGU ,VIOHI ,REGULATORMODE0 , mc13783_viohi_val), +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_violo_val), MC13783_DEFINE_REGU(VDIG, REGULATORMODE0, REGULATORSETTING0, \
@@ -255,7 +255,7 @@ static struct mc13783_regulator mc13783_regulators[] = { mc13783_vesim_val),MC13783_DEFINE_REGU (VCAM ,REGULATORMODE1 ,REGULATORSETTING0 , \ mc13783_vcam_val), -MC13783_FIXED_DEFINE (REGU ,VRFBG ,REGULATORMODE1 , mc13783_vrfbg_val), +MC13783_FIXED_DEFINE (REG ,VRFBG ,REGULATORMODE1 , mc13783_vrfbg_val),MC13783_DEFINE_REGU (VVIB ,REGULATORMODE1 ,REGULATORSETTING1 , \ mc13783_vvib_val), MC13783_DEFINE_REGU(VRF1, REGULATORMODE1, REGULATORSETTING1, \
@@ -266,12 +266,12 @@ static struct mc13783_regulator mc13783_regulators[] = { mc13783_vmmc_val),MC13783_DEFINE_REGU (VMMC2 ,REGULATORMODE1 ,REGULATORSETTING1 , \mc13783_vmmc_val ), -MC13783_GPO_DEFINE (REGU ,GPO1 ,POWERMISC ,mc13783_gpo_val ), -MC13783_GPO_DEFINE (REGU ,GPO2 ,POWERMISC ,mc13783_gpo_val ), -MC13783_GPO_DEFINE (REGU ,GPO3 ,POWERMISC ,mc13783_gpo_val ), -MC13783_GPO_DEFINE (REGU ,GPO4 ,POWERMISC ,mc13783_gpo_val ), -MC13783_GPO_DEFINE (REGU ,PWGT1SPI ,POWERMISC ,mc13783_pwgtdrv_val ), - MC13783_GPO_DEFINE(REGU, PWGT2SPI, POWERMISC, mc13783_pwgtdrv_val), +MC13783_GPO_DEFINE (REG ,GPO1 ,POWERMISC ,mc13783_gpo_val ), +MC13783_GPO_DEFINE (REG ,GPO2 ,POWERMISC ,mc13783_gpo_val ), +MC13783_GPO_DEFINE (REG ,GPO3 ,POWERMISC ,mc13783_gpo_val ), +MC13783_GPO_DEFINE (REG ,GPO4 ,POWERMISC ,mc13783_gpo_val ), +MC13783_GPO_DEFINE (REG ,PWGT1SPI ,POWERMISC ,mc13783_pwgtdrv_val ), + MC13783_GPO_DEFINE(REG, PWGT2SPI, POWERMISC, mc13783_pwgtdrv_val), };struct mc13783_regulator_priv {
@@ -508,8 +508,8 @@ static int mc13783_gpo_regulator_enable(struct regulator_dev *rdev)dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id);/* Power Gate enable value is 0 */ -if (id ==MC13783_REGU_PWGT1SPI || - id ==MC13783_REGU_PWGT2SPI ) +if (id ==MC13783_REG_PWGT1SPI || + id ==MC13783_REG_PWGT2SPI ) en_val =0 ;mc13783_lock (priv->mc13783);
@@ -530,8 +530,8 @@ static int mc13783_gpo_regulator_disable(struct regulator_dev *rdev)dev_dbg (rdev_get_dev (rdev),"%s id: %d\n" , __func__, id);/* Power Gate disable value is 1 */ -if (id ==MC13783_REGU_PWGT1SPI || - id ==MC13783_REGU_PWGT2SPI ) +if (id ==MC13783_REG_PWGT1SPI || + id ==MC13783_REG_PWGT2SPI ) dis_val = mc13783_regulators[id].enable_bit;mc13783_lock (priv->mc13783);
include/linux/mfd/mc13783.h +34 -33
77 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 1/1 Change the register name definitions for mc13783
Hi Yong,
Quoted 8 lines · yong.shen at freescale.com
From: Yong Shen <[email protected]>
To make mc13783 and mc13892 share code, the register names should be changed to fit the new macro definitions in the comming patch.
Signed-off-by Yong Shen <[email protected]>Acked-by Sascha Hauer <[email protected]>Acked-by Mark Brown <[email protected]>
You can add my:
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
PATCH 1/1 Change the register name definitions for mc13783
Hi Liam,
Could you please also add "Acked-by: Samuel Ortiz <[email protected]>" to this patch for Samuel?
Thanks
Yong
Quoted 22 lines · Samuel Ortiz
Hi Yong,
Quoted 8 lines · yong.shen at freescale.com
From: Yong Shen <[email protected]>
To make mc13783 and mc13892 share code, the register names should be changed to fit the new macro definitions in the comming patch.
Signed-off-by Yong Shen <[email protected]>Acked-by Sascha Hauer <[email protected]>Acked-by Mark Brown <[email protected]>You can add my:
Acked-by Samuel Ortiz <[email protected]>Cheers,
Samuel.--
Intel Open Source Technology Centre
http://oss.intel.com/
PATCH 1/1 Change the register name definitions for mc13783
Quoted 5 lines · Yong Shen
Hi Liam,
Could you please also add "Acked-by: Samuel Ortiz <[email protected]>" to this patch for Samuel?
Yong, please stop echoing other messages in this thread. This makes it harder for everyone to follow the discussion.
I do read all my mail and will take action later today.
Thanks
Liam
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk