>>From:
linux-omap-owner@vger.kernel.org [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of
>>felipe.balbi@nokia.com
>>Sent: Wednesday, August 18, 2010 11:50 AM
>>To: Samuel Ortiz
>>Cc: linux-kernel@vger.kernel.org; linux-omap@vger.kernel.org; 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@nokia.com>
>>
>>use the new definitions on twl header for code
>>consistency.
>>
>>Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
>>---
>> 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);