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