| 1 | --- a/arch/arm/mach-omap2/id.c |
| 2 | +++ b/arch/arm/mach-omap2/id.c |
| 3 | @@ -389,8 +389,10 @@ static void __init omap4_check_revision( |
| 4 | omap_revision = OMAP4430_REV_ES2_1; |
| 5 | break; |
| 6 | case 4: |
| 7 | - default: |
| 8 | omap_revision = OMAP4430_REV_ES2_2; |
| 9 | + case 6: |
| 10 | + default: |
| 11 | + omap_revision = OMAP4430_REV_ES2_3; |
| 12 | } |
| 13 | break; |
| 14 | case 0xb94e: |
| 15 | @@ -403,7 +405,7 @@ static void __init omap4_check_revision( |
| 16 | break; |
| 17 | default: |
| 18 | /* Unknown default to latest silicon rev as default */ |
| 19 | - omap_revision = OMAP4430_REV_ES2_2; |
| 20 | + omap_revision = OMAP4430_REV_ES2_3; |
| 21 | } |
| 22 | |
| 23 | pr_info("OMAP%04x ES%d.%d\n", omap_rev() >> 16, |
| 24 | --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c |
| 25 | +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c |
| 26 | @@ -2257,7 +2257,8 @@ static struct omap_hwmod_class omap44xx_ |
| 27 | }; |
| 28 | |
| 29 | static struct omap_i2c_dev_attr i2c_dev_attr = { |
| 30 | - .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE, |
| 31 | + .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE | |
| 32 | + OMAP_I2C_FLAG_RESET_REGS_POSTIDLE, |
| 33 | }; |
| 34 | |
| 35 | /* i2c1 */ |
| 36 | --- a/arch/arm/plat-omap/include/plat/cpu.h |
| 37 | +++ b/arch/arm/plat-omap/include/plat/cpu.h |
| 38 | @@ -391,6 +391,7 @@ IS_OMAP_TYPE(3517, 0x3517) |
| 39 | #define OMAP4430_REV_ES2_0 (OMAP443X_CLASS | (0x20 << 8)) |
| 40 | #define OMAP4430_REV_ES2_1 (OMAP443X_CLASS | (0x21 << 8)) |
| 41 | #define OMAP4430_REV_ES2_2 (OMAP443X_CLASS | (0x22 << 8)) |
| 42 | +#define OMAP4430_REV_ES2_3 (OMAP443X_CLASS | (0x23 << 8)) |
| 43 | |
| 44 | #define OMAP446X_CLASS 0x44600044 |
| 45 | #define OMAP4460_REV_ES1_0 (OMAP446X_CLASS | (0x10 << 8)) |
| 46 | |
