From 6a3c3cde3f799227dfc6221f526d8f9233729ed6 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Wed, 16 Nov 2016 16:45:42 +0800 Subject: MLK-13476 imx: 6sx: fix ECSPI5 base ECSPI5 redefined. Signed-off-by: Peng Fan --- arch/arm/include/asm/arch-mx6/imx-regs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index 40f8053..fc29fcd 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -151,7 +151,9 @@ #define MX6SL_UART5_BASE_ADDR (ATZ1_BASE_ADDR + 0x18000) #define MX6SLL_UART4_BASE_ADDR (ATZ1_BASE_ADDR + 0x18000) #define MX6UL_UART7_BASE_ADDR (ATZ1_BASE_ADDR + 0x18000) +#ifndef CONFIG_MX6SX #define ECSPI5_BASE_ADDR (ATZ1_BASE_ADDR + 0x18000) +#endif #define UART1_BASE (ATZ1_BASE_ADDR + 0x20000) -- cgit v1.1