drivers/serial: Fix uart issues for i.MX7 and i.MX6

diegosueiro · nashif · commit f1caf676caae · 2018-12-03T15:15:36.000-05:00
This patch fixes the uart isr calling the callback with wrong data (#11465) and the uart_poll_in checking the wrong status flag. Signed-off-by: Diego Sueiro <diego.sueiro@gmail.com>
diff --git a/drivers/serial/uart_imx.c b/drivers/serial/uart_imx.c
@@ -107,7 +107,7 @@ static int uart_imx_poll_in(struct device *dev, unsigned char *c)
 {
 	UART_Type *uart = UART_STRUCT(dev);
 
-	while (!UART_GetStatusFlag(uart, uartStatusRxReady))
+	while (!UART_GetStatusFlag(uart, uartStatusRxDataReady))
 		;
 	*c = UART_Getchar(uart);
 
@@ -254,7 +254,7 @@ void uart_imx_isr(void *arg)
 	struct imx_uart_data *data = dev->driver_data;
 
 	if (data->callback) {
-		data->callback(dev);
+		data->callback(data->cb_data);
 	}
 }
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ static int uart_imx_poll_in(struct device dev, unsigned char c)`
`107`	`107`	`{`
`108`	`108`	`UART_Type *uart = UART_STRUCT(dev);`
`109`	`109`
`110`		`- while (!UART_GetStatusFlag(uart, uartStatusRxReady))`
	`110`	`+ while (!UART_GetStatusFlag(uart, uartStatusRxDataReady))`
`111`	`111`	`;`
`112`	`112`	`*c = UART_Getchar(uart);`
`113`	`113`
`@@ -254,7 +254,7 @@ void uart_imx_isr(void *arg)`
`254`	`254`	`struct imx_uart_data *data = dev->driver_data;`
`255`	`255`
`256`	`256`	`if (data->callback) {`
`257`		`- data->callback(dev);`
	`257`	`+ data->callback(data->cb_data);`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`	`#endif /* CONFIG_UART_INTERRUPT_DRIVEN */`