ccxmx53: fix problem with RS485 TXIDR GPIO config

Signed-off-by: Pedro Perez de Heredia <pedro.perez@digi.com>

3 files changed, 27 insertions, 23 deletions

diff --git a/arch/arm/mach-mx5/board-ccwmx51.h b/arch/arm/mach-mx5/board-ccwmx51.h
index 480c1952190c..92586533f97f 100644
--- a/arch/arm/mach-mx5/board-ccwmx51.h
+++ b/arch/arm/mach-mx5/board-ccwmx51.h
@@ -14,6 +14,14 @@
 
 #include "board-ccwmx5x.h"
 
+/* UARTs RS485 direction GPIOs */
+#define UART1_RS485_TXDIR_GPIO	IOMUX_TO_GPIO(MX51_PIN_UART1_CTS)
+#define UART1_RS485_TXDIR_LVL	0
+#define UART2_RS485_TXDIR_GPIO	IOMUX_TO_GPIO(MX51_PIN_USBH1_DATA0)
+#define UART2_RS485_TXDIR_LVL	0
+#define UART3_RS485_TXDIR_GPIO	IOMUX_TO_GPIO(MX51_PIN_KEY_COL5)
+#define UART3_RS485_TXDIR_LVL	0
+
 /* Second touch interface configuration */
 #ifdef CONFIG_CCWMX5X_SECOND_TOUCH
 #ifdef CONFIG_JSCCWMX51_V1
diff --git a/arch/arm/mach-mx5/board-ccwmx53.h b/arch/arm/mach-mx5/board-ccwmx53.h
index 62427472bc60..89d894299403 100644
--- a/arch/arm/mach-mx5/board-ccwmx53.h
+++ b/arch/arm/mach-mx5/board-ccwmx53.h
@@ -15,6 +15,18 @@
 #include "board-ccwmx5x.h"
 #include "devices_ccwmx53.h"	/* MX53_GPIO(port,pin) */
 
+/* UARTs RS485 direction GPIOs */
+#define UART1_RS485_TXDIR_GPIO	MX53_GPIO(7, 4)
+#define UART1_RS485_TXDIR_LVL	0
+#define UART2_RS485_TXDIR_GPIO	MX53_GPIO(7, 2)
+#define UART2_RS485_TXDIR_LVL	0
+#define UART3_RS485_TXDIR_GPIO	MX53_GPIO(7, 7)
+#define UART3_RS485_TXDIR_LVL	0
+#define UART4_RS485_TXDIR_GPIO	-1
+#define UART4_RS485_TXDIR_LVL	0
+#define UART5_RS485_TXDIR_GPIO	-1
+#define UART5_RS485_TXDIR_LVL	0
+
 /* AD9389 interrupt */
 #define AD9389_GPIO_IRQ		MX53_GPIO(5,2)		/* GPIO_5_2 */
 #define AD9389_IRQ_PAD		MX53_PAD_EIM_A25__GPIO5_2
diff --git a/arch/arm/mach-mx5/serial.c b/arch/arm/mach-mx5/serial.c
index 092fdbc0a729..50b9ac8dd9ae 100644
--- a/arch/arm/mach-mx5/serial.c
+++ b/arch/arm/mach-mx5/serial.c
@@ -24,22 +24,6 @@
 #include <mach/mxc_uart.h>
 #include "serial.h"
 
-#if defined(CONFIG_MACH_CCWMX53JS) || defined(CONFIG_MACH_CCMX53JS)
-#include <mach/iomux-mx53.h>
-
-#define RS485_TX0 	MX53_PAD_EIM_D19__UART1_CTS
-#define RS485_TX1	MX53_PAD_EIM_D28__UART2_CTS
-#define RS485_TX2	MX53_PAD_EIM_D23__UART3_CTS
-#define RS485_TX3	MX53_PAD_CSI0_DAT17__UART4_CTS
-#define RS485_TX4	MX53_PAD_CSI0_DAT19__UART5_CTS
-#elif defined(CONFIG_MACH_CCWMX51JS) || defined(CONFIG_MACH_CCMX51JS)
-#define RS485_TX0 	MX51_PIN_UART1_CTS
-#define RS485_TX1	MX51_PIN_USBH1_DATA0
-#define RS485_TX2	MX51_PIN_KEY_COL5
-#endif
-
-
-
 #if defined(CONFIG_SERIAL_MXC) || defined(CONFIG_SERIAL_MXC_MODULE)
 
 /*!
@@ -61,7 +45,7 @@ static uart_mxc_port mxc_ports[] = {
 	       .mode = UART1_MODE,
 	       .ir_mode = UART1_IR,
 	       .rs485_txdir_lvl = UART1_RS485_TXDIR_LVL,
-	       .rs485_txdir_gpio = IOMUX_TO_GPIO(RS485_TX0),
+	       .rs485_txdir_gpio = UART1_RS485_TXDIR_GPIO,
 	       .enabled = UART1_ENABLED,
 	       .cts_threshold = UART1_UCR4_CTSTL,
 	       .dma_enabled = UART1_DMA_ENABLE,
@@ -83,7 +67,7 @@ static uart_mxc_port mxc_ports[] = {
 	       .mode = UART2_MODE,
 	       .ir_mode = UART2_IR,
 	       .rs485_txdir_lvl = UART2_RS485_TXDIR_LVL,
-	       .rs485_txdir_gpio = IOMUX_TO_GPIO(RS485_TX1),
+	       .rs485_txdir_gpio = UART2_RS485_TXDIR_GPIO,
 	       .enabled = UART2_ENABLED,
 	       .cts_threshold = UART2_UCR4_CTSTL,
 	       .dma_enabled = UART2_DMA_ENABLED,
@@ -105,7 +89,7 @@ static uart_mxc_port mxc_ports[] = {
 	       .mode = UART3_MODE,
 	       .ir_mode = UART3_IR,
                .rs485_txdir_lvl = UART3_RS485_TXDIR_LVL,
-	       .rs485_txdir_gpio = IOMUX_TO_GPIO(RS485_TX2),
+	       .rs485_txdir_gpio = UART3_RS485_TXDIR_GPIO,
 	       .enabled = UART3_ENABLED,
 	       .cts_threshold = UART3_UCR4_CTSTL,
 	       .dma_enabled = UART3_DMA_ENABLED,
@@ -127,8 +111,8 @@ static uart_mxc_port mxc_ports[] = {
 	       .ints_muxed = 1,
 	       .mode = UART4_MODE,
 	       .ir_mode = NO_IRDA,
-           .rs485_txdir_lvl = UART4_RS485_TXDIR_LVL,
-	       .rs485_txdir_gpio = IOMUX_TO_GPIO(RS485_TX3),
+	       .rs485_txdir_lvl = UART4_RS485_TXDIR_LVL,
+	       .rs485_txdir_gpio = UART4_RS485_TXDIR_GPIO,
 	       .enabled = 1,
 	       .cts_threshold = UART4_UCR4_CTSTL,
 	       .dma_enabled = UART4_DMA_ENABLE,
@@ -150,8 +134,8 @@ static uart_mxc_port mxc_ports[] = {
 	       .ints_muxed = 1,
 	       .mode = UART5_MODE,
 	       .ir_mode = NO_IRDA,
-           .rs485_txdir_lvl = UART5_RS485_TXDIR_LVL,
-	       .rs485_txdir_gpio = IOMUX_TO_GPIO(RS485_TX4),
+	       .rs485_txdir_lvl = UART5_RS485_TXDIR_LVL,
+	       .rs485_txdir_gpio = UART5_RS485_TXDIR_GPIO,
 	       .enabled = 1,
 	       .cts_threshold = UART5_UCR4_CTSTL,
 	       .dma_enabled = UART5_DMA_ENABLE,