diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-11-13 03:28:54 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-11-21 10:08:06 -0500 |
commit | d640e757949e2991215838c0edbfd6afc37e5b06 (patch) | |
tree | 74e14d487280bc3213e5eb219e0929882fab8bc9 /drivers/mfd | |
parent | 6fbc6420b730f32d0088103da0877981da67df39 (diff) |
mfd: twl-core: Change TWL4030_MODULE_* ids to TWL_MODULE_*
To facilitate upcoming cleanup in twl stack.
No functional changes.
Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/twl-core.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index f857097aca5c..43c7b4c92940 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c | |||
@@ -1077,8 +1077,8 @@ static inline int __init protect_pm_master(void) | |||
1077 | { | 1077 | { |
1078 | int e = 0; | 1078 | int e = 0; |
1079 | 1079 | ||
1080 | e = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0, | 1080 | e = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, 0, |
1081 | TWL4030_PM_MASTER_PROTECT_KEY); | 1081 | TWL4030_PM_MASTER_PROTECT_KEY); |
1082 | return e; | 1082 | return e; |
1083 | } | 1083 | } |
1084 | 1084 | ||
@@ -1086,12 +1086,10 @@ static inline int __init unprotect_pm_master(void) | |||
1086 | { | 1086 | { |
1087 | int e = 0; | 1087 | int e = 0; |
1088 | 1088 | ||
1089 | e |= twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, | 1089 | e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, TWL4030_PM_MASTER_KEY_CFG1, |
1090 | TWL4030_PM_MASTER_KEY_CFG1, | 1090 | TWL4030_PM_MASTER_PROTECT_KEY); |
1091 | TWL4030_PM_MASTER_PROTECT_KEY); | 1091 | e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, TWL4030_PM_MASTER_KEY_CFG2, |
1092 | e |= twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, | 1092 | TWL4030_PM_MASTER_PROTECT_KEY); |
1093 | TWL4030_PM_MASTER_KEY_CFG2, | ||
1094 | TWL4030_PM_MASTER_PROTECT_KEY); | ||
1095 | 1093 | ||
1096 | return e; | 1094 | return e; |
1097 | } | 1095 | } |