diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
tree | daada742542518b02d7db7c5d32e715eaa5f166d /arch/arm/plat-omap/include/plat/uncompress.h | |
parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) |
Merge branch 'master' into fixes
Diffstat (limited to 'arch/arm/plat-omap/include/plat/uncompress.h')
-rw-r--r-- | arch/arm/plat-omap/include/plat/uncompress.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h index 2f472e989ec..6ee90495ca4 100644 --- a/arch/arm/plat-omap/include/plat/uncompress.h +++ b/arch/arm/plat-omap/include/plat/uncompress.h | |||
@@ -99,9 +99,9 @@ static inline void flush(void) | |||
99 | #define DEBUG_LL_ZOOM(mach) \ | 99 | #define DEBUG_LL_ZOOM(mach) \ |
100 | _DEBUG_LL_ENTRY(mach, ZOOM_UART_BASE, ZOOM_PORT_SHIFT, ZOOM_UART) | 100 | _DEBUG_LL_ENTRY(mach, ZOOM_UART_BASE, ZOOM_PORT_SHIFT, ZOOM_UART) |
101 | 101 | ||
102 | #define DEBUG_LL_TI816X(p, mach) \ | 102 | #define DEBUG_LL_TI81XX(p, mach) \ |
103 | _DEBUG_LL_ENTRY(mach, TI816X_UART##p##_BASE, OMAP_PORT_SHIFT, \ | 103 | _DEBUG_LL_ENTRY(mach, TI81XX_UART##p##_BASE, OMAP_PORT_SHIFT, \ |
104 | TI816XUART##p) | 104 | TI81XXUART##p) |
105 | 105 | ||
106 | static inline void __arch_decomp_setup(unsigned long arch_id) | 106 | static inline void __arch_decomp_setup(unsigned long arch_id) |
107 | { | 107 | { |
@@ -177,7 +177,10 @@ static inline void __arch_decomp_setup(unsigned long arch_id) | |||
177 | DEBUG_LL_ZOOM(omap_zoom3); | 177 | DEBUG_LL_ZOOM(omap_zoom3); |
178 | 178 | ||
179 | /* TI8168 base boards using UART3 */ | 179 | /* TI8168 base boards using UART3 */ |
180 | DEBUG_LL_TI816X(3, ti8168evm); | 180 | DEBUG_LL_TI81XX(3, ti8168evm); |
181 | |||
182 | /* TI8148 base boards using UART1 */ | ||
183 | DEBUG_LL_TI81XX(1, ti8148evm); | ||
181 | 184 | ||
182 | } while (0); | 185 | } while (0); |
183 | } | 186 | } |