>>-----Original Message----- >>From: linux-omap-owner@xxxxxxxxxxxxxxx [mailto:linux-omap-owner@xxxxxxxxxxxxxxx] On Behalf Of >>felipe.balbi@xxxxxxxxx >>Sent: Wednesday, August 18, 2010 11:50 AM >>To: Samuel Ortiz >>Cc: linux-kernel@xxxxxxxxxxxxxxx; linux-omap@xxxxxxxxxxxxxxx; Tony Lindgren; Andrew Morton; Felipe >>Balbi >>Subject: [PATCH 2/4] mfd: twl-core: switch over to defines in twl.h >> >>From: Felipe Balbi <felipe.balbi@xxxxxxxxx> >> >>use the new definitions on twl header for code >>consistency. >> >>Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx> >>--- >> drivers/mfd/twl-core.c | 21 +++++++++------------ >> 1 files changed, 9 insertions(+), 12 deletions(-) >> >>diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c >>index 720e099..9689ecf 100644 >>--- a/drivers/mfd/twl-core.c >>+++ b/drivers/mfd/twl-core.c >>@@ -202,12 +202,6 @@ >> >> /* Few power values */ >> #define R_CFG_BOOT 0x05 >>-#define R_PROTECT_KEY 0x0E >>- >>-/* access control values for R_PROTECT_KEY */ >>-#define KEY_UNLOCK1 0xce >>-#define KEY_UNLOCK2 0xec >>-#define KEY_LOCK 0x00 >> >> /* some fields in R_CFG_BOOT */ >> #define HFCLK_FREQ_19p2_MHZ (1 << 0) >>@@ -846,8 +840,8 @@ static inline int __init protect_pm_master(void) >> { >> int e = 0; >> >>- e = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, KEY_LOCK, >>- R_PROTECT_KEY); >>+ e = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0, >>+ TWL4030_PM_MASTER_PROTECT_KEY); Hello Felipe, R_PROTECT_KEY offset is 0xE where as the new TWL4030_PM_MASTER_PROTECT_KEY is defined as 0xd. I have not checked the trm to see which is correct. But I hope this is a conscious change. Else we will end up breaking the functionality. Also if this is a conscious change may be you should mention it in the patch description. This comment applies to all other places where R_PROTECT_KEY has been replaced with TWL4030_PM_MASTER_PROTECT_KEY in this patch as well as in patch 3/4 and patch 4/4. Regards Thara >> return e; >> } >> >>@@ -855,10 +849,13 @@ static inline int __init unprotect_pm_master(void) >> { >> int e = 0; >> >>- e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, KEY_UNLOCK1, >>- R_PROTECT_KEY); >>- e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, KEY_UNLOCK2, >>- R_PROTECT_KEY); >>+ e |= twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, >>+ TWL4030_PM_MASTER_KEY_CFG1, >>+ TWL4030_PM_MASTER_PROTECT_KEY); >>+ e |= twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, >>+ TWL4030_PM_MASTER_KEY_CFG2, >>+ TWL4030_PM_MASTER_PROTECT_KEY); >>+ >> return e; >> } >> >>-- >>1.7.2.1.6.g61bf12 >> >>-- >>To unsubscribe from this list: send the line "unsubscribe linux-omap" in >>the body of a message to majordomo@xxxxxxxxxxxxxxx >>More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
