| Message ID | 1327315877-6483-2-git-send-email-paolo.pisati@canonical.com |
|---|---|
| State | New |
| Headers | show |
Seems like this should be a SAUCE patch ? It also looks like it could be a partial backport of Linus 55035c1524b5b48ac7d267167c4895f7831897ad. If so it ought to have correct attribution. rtg
It looks reasonable. Just having the same thoughts as Tim on the attributional side. Having a proper reference in the patch itself helps a lot later if you get asked about it. -Stefan
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 01/23/2012 02:51 PM, Stefan Bader wrote: > It looks reasonable. Just having the same thoughts as Tim on the > attributional side. Having a proper reference in the patch itself > helps a lot later if you get asked about it. i got the patch from TI and i didn't bother checking if it was upstreamed yet, anyway, i'll send a new one. - -- bye, p. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJPHWriAAoJEJdscTmfuQbQEE8P/iO8CzZBC0jJHjZimWv2OppD KEnjxVbAkt+KTLqDU2egvH0PHbqdhSzcMpzn0YAJigEbRyUrIYgsRYU5EGBWEdIl RAlXDVR7SwX25SKzJ1QkFV8E5pMFzPSNUtz2lPNXftz0TAuydjCPqh4zZkzp+2dF MxMkSFHwZcXUXOZ9rRj43dXJwn2K5TDOdE1x2OF3dGOUmacI0ym0YtsiJUw8qnCp 0EG2CnRikXLVDjhlqRHq08umvEurF1UkX9KIHG9KdSVoNaXPYSiFK9+DNwZAIs5d tLu+SMMekuEphPe3bpYwXIDY0kt+MTfJGebkwNgp3p/pN4tzcsFHkFDF3v/1Kdf1 KSsDsp2xbjskMXz2Uqe0TZK30nuDJPexD+3tVOSp9hYWF0tlYizAYdInOSR1p4IG VOwNoHy4DisGkHKqW+OcmIQlClVhq3yUlGByLxFgQMK6NCAqKPhhGHHdj9n8CthO EbN3RQNoe4aXT1xBPt/YKSQdgMjEapHmtIl8LsAgq18IJaycI/HVKUu/akZ50QLO zccwk0uB4iHCC3tA6x19D8MuFgEQ74Ub/7Ci+3/b2P6xjasgvoYBdQXr5IUDBYTG n9sia+YI7KOyO27S9fzDppl2JIrUm6AvJnhRZ3whjR1WsDB4RGlToGpqBRMO1yyl gKO7FvlLUauiS0YAVBBF =bbKO -----END PGP SIGNATURE-----
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index fb63c92..847786a 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -402,9 +402,13 @@ static void __init omap4_check_revision(void) omap_chip.oc |= CHIP_IS_OMAP4430ES2_1; break; case 4: - default: omap_revision = OMAP4430_REV_ES2_2; omap_chip.oc |= CHIP_IS_OMAP4430ES2_2; + break; + case 6: + default: + omap_revision = OMAP4430_REV_ES2_3; + omap_chip.oc |= CHIP_IS_OMAP4430ES2_3; } break; case 0xb94e: @@ -422,8 +426,8 @@ static void __init omap4_check_revision(void) break; default: /* Unknown default to latest silicon rev as default */ - omap_revision = OMAP4430_REV_ES2_2; - omap_chip.oc |= CHIP_IS_OMAP4430ES2_2; + omap_revision = OMAP4430_REV_ES2_3; + omap_chip.oc |= CHIP_IS_OMAP4430ES2_3; } pr_info("OMAP%04x ES%d.%d\n", omap_rev() >> 16, diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index d8a1602..263d4fa 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -414,6 +414,7 @@ IS_OMAP_TYPE(3517, 0x3517) #define OMAP4430_REV_ES2_0 (OMAP443X_CLASS | (0x20 << 8)) #define OMAP4430_REV_ES2_1 (OMAP443X_CLASS | (0x21 << 8)) #define OMAP4430_REV_ES2_2 (OMAP443X_CLASS | (0x22 << 8)) +#define OMAP4430_REV_ES2_3 (OMAP443X_CLASS | (0x23 << 8)) #define OMAP446X_CLASS 0x44600044 #define OMAP4460_REV_ES1_0 (OMAP446X_CLASS | (0x10 << 8)) @@ -447,16 +448,18 @@ IS_OMAP_TYPE(3517, 0x3517) #define CHIP_IS_OMAP4430ES2 (1 << 11) #define CHIP_IS_OMAP4430ES2_1 (1 << 12) #define CHIP_IS_OMAP4430ES2_2 (1 << 13) -#define CHIP_IS_TI816X (1 << 14) -#define CHIP_IS_OMAP4460ES1_0 (1 << 15) -#define CHIP_IS_OMAP4460ES1_1 (1 << 16) +#define CHIP_IS_OMAP4430ES2_3 (1 << 14) +#define CHIP_IS_TI816X (1 << 15) +#define CHIP_IS_OMAP4460ES1_0 (1 << 16) +#define CHIP_IS_OMAP4460ES1_1 (1 << 17) #define CHIP_IS_OMAP24XX (CHIP_IS_OMAP2420 | CHIP_IS_OMAP2430) #define CHIP_IS_OMAP443X (CHIP_IS_OMAP4430ES1 | \ CHIP_IS_OMAP4430ES2 | \ CHIP_IS_OMAP4430ES2_1 | \ - CHIP_IS_OMAP4430ES2_2) + CHIP_IS_OMAP4430ES2_2 | \ + CHIP_IS_OMAP4430ES2_3) #define CHIP_IS_OMAP446X (CHIP_IS_OMAP4460ES1_0 | \ CHIP_IS_OMAP4460ES1_1)