diff options
| author | Oleksandr Dmytryshyn <oleksandr.dmytryshyn@ti.com> | 2012-02-01 17:17:42 +0200 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-10-01 13:00:09 +0200 |
| commit | e8f2560fe290c0a4bfbc8131afdccfc8b0c16d03 (patch) | |
| tree | e7d4067308e4c71e571414448b5f6601a76c8d0a /drivers/mfd | |
| parent | 9b858a02a7e100c5342e21f23c926152c7b6f6bb (diff) | |
| download | kernel_samsung_tuna-e8f2560fe290c0a4bfbc8131afdccfc8b0c16d03.tar.gz kernel_samsung_tuna-e8f2560fe290c0a4bfbc8131afdccfc8b0c16d03.tar.bz2 kernel_samsung_tuna-e8f2560fe290c0a4bfbc8131afdccfc8b0c16d03.zip | |
OMAP4: MFD: Modifying operational code to adjust for the compilation issue
Modifying operational code to adjust for the compilation issue:
drivers/mfd/twl6030-poweroff.c:28: warning: "TWL6030_PHOENIX_DEV_ON"
redefined include/linux/i2c/twl.h:473: note: this is the location
of the previous definition drivers/mfd/twl6030-poweroff.c
Change-Id: Ifa344bbdcf1348024c9f06ee83ca802f7de40407
Signed-off-by: Oleksandr Dmytryshyn <oleksandr.dmytryshyn@ti.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl6030-poweroff.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mfd/twl6030-poweroff.c b/drivers/mfd/twl6030-poweroff.c index 776a2519662..3187806fcee 100644 --- a/drivers/mfd/twl6030-poweroff.c +++ b/drivers/mfd/twl6030-poweroff.c @@ -25,7 +25,6 @@ #include <linux/pm.h> #include <linux/i2c/twl.h> -#define TWL6030_PHOENIX_DEV_ON 0x25 #define APP_DEVOFF (1<<0) #define CON_DEVOFF (1<<1) #define MOD_DEVOFF (1<<2) @@ -35,7 +34,7 @@ void twl6030_poweroff(void) u8 val = 0; int err = 0; - err = twl_i2c_read_u8(TWL6030_MODULE_ID0, &val, + err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val, TWL6030_PHOENIX_DEV_ON); if (err) { pr_warning("I2C error %d reading PHOENIX_DEV_ON\n", err); @@ -44,7 +43,7 @@ void twl6030_poweroff(void) val |= APP_DEVOFF | CON_DEVOFF | MOD_DEVOFF; - err = twl_i2c_write_u8(TWL6030_MODULE_ID0, val, + err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, val, TWL6030_PHOENIX_DEV_ON); if (err) { |