diff options
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/twl4030-power.c | 2 | ||||
| -rw-r--r-- | include/linux/i2c/twl.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index bbcb6775a6a3..01ee0a15ef88 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
| @@ -730,7 +730,7 @@ static struct twl4030_resconfig twl4030_rconfig[] __initdata = { | |||
| 730 | { .resource = RES_RESET, .devgroup = -1, | 730 | { .resource = RES_RESET, .devgroup = -1, |
| 731 | .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1 | 731 | .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1 |
| 732 | }, | 732 | }, |
| 733 | { .resource = RES_Main_Ref, .devgroup = -1, | 733 | { .resource = RES_MAIN_REF, .devgroup = -1, |
| 734 | .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1 | 734 | .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1 |
| 735 | }, | 735 | }, |
| 736 | { 0, 0}, | 736 | { 0, 0}, |
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c index 8373d79323cc..8162e435c9ff 100644 --- a/drivers/mfd/twl4030-power.c +++ b/drivers/mfd/twl4030-power.c | |||
| @@ -120,7 +120,7 @@ static u8 res_config_addrs[] = { | |||
| 120 | [RES_HFCLKOUT] = 0x8b, | 120 | [RES_HFCLKOUT] = 0x8b, |
| 121 | [RES_32KCLKOUT] = 0x8e, | 121 | [RES_32KCLKOUT] = 0x8e, |
| 122 | [RES_RESET] = 0x91, | 122 | [RES_RESET] = 0x91, |
| 123 | [RES_Main_Ref] = 0x94, | 123 | [RES_MAIN_REF] = 0x94, |
| 124 | }; | 124 | }; |
| 125 | 125 | ||
| 126 | static int __init twl4030_write_script_byte(u8 address, u8 byte) | 126 | static int __init twl4030_write_script_byte(u8 address, u8 byte) |
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 0c0d1ae79981..4ebd7c32bc59 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h | |||
| @@ -501,7 +501,7 @@ static inline int twl6030_mmc_card_detect(struct device *dev, int slot) | |||
| 501 | #define RES_32KCLKOUT 26 | 501 | #define RES_32KCLKOUT 26 |
| 502 | #define RES_RESET 27 | 502 | #define RES_RESET 27 |
| 503 | /* Power Reference */ | 503 | /* Power Reference */ |
| 504 | #define RES_Main_Ref 28 | 504 | #define RES_MAIN_REF 28 |
| 505 | 505 | ||
| 506 | #define TOTAL_RESOURCES 28 | 506 | #define TOTAL_RESOURCES 28 |
| 507 | /* | 507 | /* |
