From e55f4b75911dac354520f3b099b8a1dd71f4bbf6 Mon Sep 17 00:00:00 2001 From: Alistair Buxton Date: Tue, 22 Sep 2009 10:05:30 +0100 Subject: [PATCH] --- yaml --- r: 172704 b: refs/heads/master c: f8631e7bba34d46d6ccea4cd90f7a0482770ff70 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/include/mach/uncompress.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0cda686cecb3..a2253a6307c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f73b4de93e06d18c28cb282761c8507bc476489 +refs/heads/master: f8631e7bba34d46d6ccea4cd90f7a0482770ff70 diff --git a/trunk/arch/arm/plat-omap/include/mach/uncompress.h b/trunk/arch/arm/plat-omap/include/mach/uncompress.h index 0814c5f210c3..ddf7b88dec4d 100644 --- a/trunk/arch/arm/plat-omap/include/mach/uncompress.h +++ b/trunk/arch/arm/plat-omap/include/mach/uncompress.h @@ -25,6 +25,7 @@ unsigned int system_rev; #define UART_OMAP_MDR1 0x08 /* mode definition register */ #define OMAP_ID_730 0x355F +#define OMAP_ID_850 0x362C #define ID_MASK 0x7fff #define check_port(base, shift) ((base[UART_OMAP_MDR1 << shift] & 7) == 0) #define omap_get_id() ((*(volatile unsigned int *)(0xfffed404)) >> 12) & ID_MASK @@ -53,7 +54,7 @@ static void putc(int c) /* MMU is not on, so cpu_is_omapXXXX() won't work here */ unsigned int omap_id = omap_get_id(); - if (omap_id == OMAP_ID_730) + if (omap_id == OMAP_ID_730 || omap_id == OMAP_ID_850) shift = 0; if (check_port(uart, shift))