diff options
| author | Colin Cross <ccross@android.com> | 2011-08-15 17:37:58 -0700 |
|---|---|---|
| committer | Vikram Pandita <vikram.pandita@ti.com> | 2011-08-16 14:06:04 -0700 |
| commit | 532a322ff1019e4764bd7cfaa4373cc46d6e02c2 (patch) | |
| tree | 7e70bcada8374cf10ab757766b083058f17a0625 /arch/arm/mach-omap2/pm.h | |
| parent | 5ada9e23694fafc634d1b0e031758744822da86f (diff) | |
| download | kernel_samsung_tuna-532a322ff1019e4764bd7cfaa4373cc46d6e02c2.zip kernel_samsung_tuna-532a322ff1019e4764bd7cfaa4373cc46d6e02c2.tar.gz kernel_samsung_tuna-532a322ff1019e4764bd7cfaa4373cc46d6e02c2.tar.bz2 | |
ARM: omap4: Increase chip id size to 32 bits
The new flag required for 4460 ES1.1 will pass the 16 bit
size of omap_chip_id.oc.
Change-Id: Ie2bd9a18224dd3872b902ca5743d2b2d50ab86b4
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm.h')
| -rw-r--r-- | arch/arm/mach-omap2/pm.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index c22b41d..314999b 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h @@ -163,19 +163,19 @@ static inline int omap_pmic_register_data(struct omap_pmic_map *map) extern void omap_pmic_data_init(void); extern int omap_pmic_update(struct omap_pmic_map *tmp_map, char *name, - u16 old_chip_id, u16 new_chip_id); + u32 old_chip_id, u32 new_chip_id); #ifdef CONFIG_TWL4030_CORE extern int omap_twl_init(void); extern int omap3_twl_set_sr_bit(bool enable); -extern int omap_twl_pmic_update(char *name, u16 old_chip_id, u16 new_chip_id); +extern int omap_twl_pmic_update(char *name, u32 old_chip_id, u32 new_chip_id); #else static inline int omap_twl_init(void) { return -EINVAL; } -static inline int omap_twl_pmic_update(char *name, u16 old_chip_id, - u16 new_chip_id) +static inline int omap_twl_pmic_update(char *name, u32 old_chip_id, + u32 new_chip_id) { return -EINVAL; } @@ -186,7 +186,7 @@ extern int omap_tps6236x_board_setup(bool use_62361, int gpio_vsel0, int gpio_vsel1, int pull0, int pull1); extern int omap_tps6236x_init(void); -extern int omap_tps6236x_update(char *name, u16 old_chip_id, u16 new_chip_id); +extern int omap_tps6236x_update(char *name, u32 old_chip_id, u32 new_chip_id); #else static inline int omap_tps6236x_board_setup(bool use_62361, int gpio_vsel0, int gpio_vsel1, int pull0, int pull1) @@ -197,8 +197,8 @@ static inline int omap_tps6236x_init(void) { return -EINVAL; } -static inline int omap_tps6236x_update(char *name, u16 old_chip_id, - u16 new_chip_id) +static inline int omap_tps6236x_update(char *name, u32 old_chip_id, + u32 new_chip_id) { return -EINVAL; } |