serial i.MX: Use devtype data to determine uart version

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

10 files changed, 35 insertions, 34 deletions

diff --git a/arch/arm/mach-imx/include/mach/devices-imx1.h b/arch/arm/mach-imx/include/mach/devices-imx1.h
index c73113cf64..391c1a9c8e 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx1.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx1.h
@@ -2,10 +2,10 @@
 
 static inline struct device_d *imx1_add_uart0(void)
 {
-	return imx_add_uart((void *)MX1_UART1_BASE_ADDR, 0);
+	return imx_add_uart_imx1((void *)MX1_UART1_BASE_ADDR, 0);
 }
 
 static inline struct device_d *imx1_add_uart1(void)
 {
-	return imx_add_uart((void *)MX1_UART2_BASE_ADDR, 1);
+	return imx_add_uart_imx1((void *)MX1_UART2_BASE_ADDR, 1);
 }
diff --git a/arch/arm/mach-imx/include/mach/devices-imx21.h b/arch/arm/mach-imx/include/mach/devices-imx21.h
index 31c5f8c17b..ad7ee5ed02 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx21.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx21.h
@@ -3,22 +3,22 @@
 
 static inline struct device_d *imx21_add_uart0(void)
 {
-	return imx_add_uart((void *)MX21_UART1_BASE_ADDR, 0);
+	return imx_add_uart_imx21((void *)MX21_UART1_BASE_ADDR, 0);
 }
 
 static inline struct device_d *imx21_add_uart1(void)
 {
-	return imx_add_uart((void *)MX21_UART2_BASE_ADDR, 1);
+	return imx_add_uart_imx21((void *)MX21_UART2_BASE_ADDR, 1);
 }
 
 static inline struct device_d *imx21_add_uart2(void)
 {
-	return imx_add_uart((void *)MX21_UART2_BASE_ADDR, 2);
+	return imx_add_uart_imx21((void *)MX21_UART2_BASE_ADDR, 2);
 }
 
 static inline struct device_d *imx21_add_uart3(void)
 {
-	return imx_add_uart((void *)MX21_UART2_BASE_ADDR, 3);
+	return imx_add_uart_imx21((void *)MX21_UART2_BASE_ADDR, 3);
 }
 
 static inline struct device_d *imx21_add_nand(struct imx_nand_platform_data *pdata)
diff --git a/arch/arm/mach-imx/include/mach/devices-imx25.h b/arch/arm/mach-imx/include/mach/devices-imx25.h
index 86cda35a43..f082178d1f 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx25.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx25.h
@@ -33,27 +33,27 @@ static inline struct device_d *imx25_add_spi2(struct spi_imx_master *pdata)
 
 static inline struct device_d *imx25_add_uart0(void)
 {
-	return imx_add_uart((void *)MX25_UART1_BASE_ADDR, 0);
+	return imx_add_uart_imx21((void *)MX25_UART1_BASE_ADDR, 0);
 }
 
 static inline struct device_d *imx25_add_uart1(void)
 {
-	return imx_add_uart((void *)MX25_UART2_BASE_ADDR, 1);
+	return imx_add_uart_imx21((void *)MX25_UART2_BASE_ADDR, 1);
 }
 
 static inline struct device_d *imx25_add_uart2(void)
 {
-	return imx_add_uart((void *)MX25_UART3_BASE_ADDR, 2);
+	return imx_add_uart_imx21((void *)MX25_UART3_BASE_ADDR, 2);
 }
 
 static inline struct device_d *imx25_add_uart3(void)
 {
-	return imx_add_uart((void *)MX25_UART4_BASE_ADDR, 3);
+	return imx_add_uart_imx21((void *)MX25_UART4_BASE_ADDR, 3);
 }
 
 static inline struct device_d *imx25_add_uart4(void)
 {
-	return imx_add_uart((void *)MX25_UART5_BASE_ADDR, 4);
+	return imx_add_uart_imx21((void *)MX25_UART5_BASE_ADDR, 4);
 }
 
 static inline struct device_d *imx25_add_nand(struct imx_nand_platform_data *pdata)
diff --git a/arch/arm/mach-imx/include/mach/devices-imx27.h b/arch/arm/mach-imx/include/mach/devices-imx27.h
index 2799343e59..f143785e40 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx27.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx27.h
@@ -23,22 +23,22 @@ static inline struct device_d *imx27_add_i2c1(struct i2c_platform_data *pdata)
 
 static inline struct device_d *imx27_add_uart0(void)
 {
-	return imx_add_uart((void *)MX27_UART1_BASE_ADDR, 0);
+	return imx_add_uart_imx21((void *)MX27_UART1_BASE_ADDR, 0);
 }
 
 static inline struct device_d *imx27_add_uart1(void)
 {
-	return imx_add_uart((void *)MX27_UART2_BASE_ADDR, 1);
+	return imx_add_uart_imx21((void *)MX27_UART2_BASE_ADDR, 1);
 }
 
 static inline struct device_d *imx27_add_uart2(void)
 {
-	return imx_add_uart((void *)MX27_UART3_BASE_ADDR, 2);
+	return imx_add_uart_imx21((void *)MX27_UART3_BASE_ADDR, 2);
 }
 
 static inline struct device_d *imx27_add_uart3(void)
 {
-	return imx_add_uart((void *)MX27_UART4_BASE_ADDR, 3);
+	return imx_add_uart_imx21((void *)MX27_UART4_BASE_ADDR, 3);
 }
 
 static inline struct device_d *imx27_add_nand(struct imx_nand_platform_data *pdata)
diff --git a/arch/arm/mach-imx/include/mach/devices-imx31.h b/arch/arm/mach-imx/include/mach/devices-imx31.h
index d45e4e1027..72167b0a14 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx31.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx31.h
@@ -19,27 +19,27 @@ static inline struct device_d *imx31_add_spi2(struct spi_imx_master *pdata)
 
 static inline struct device_d *imx31_add_uart0(void)
 {
-	return imx_add_uart((void *)MX31_UART1_BASE_ADDR, 0);
+	return imx_add_uart_imx21((void *)MX31_UART1_BASE_ADDR, 0);
 }
 
 static inline struct device_d *imx31_add_uart1(void)
 {
-	return imx_add_uart((void *)MX31_UART2_BASE_ADDR, 1);
+	return imx_add_uart_imx21((void *)MX31_UART2_BASE_ADDR, 1);
 }
 
 static inline struct device_d *imx31_add_uart2(void)
 {
-	return imx_add_uart((void *)MX31_UART3_BASE_ADDR, 2);
+	return imx_add_uart_imx21((void *)MX31_UART3_BASE_ADDR, 2);
 }
 
 static inline struct device_d *imx31_add_uart3(void)
 {
-	return imx_add_uart((void *)MX31_UART4_BASE_ADDR, 3);
+	return imx_add_uart_imx21((void *)MX31_UART4_BASE_ADDR, 3);
 }
 
 static inline struct device_d *imx31_add_uart4(void)
 {
-	return imx_add_uart((void *)MX31_UART5_BASE_ADDR, 4);
+	return imx_add_uart_imx21((void *)MX31_UART5_BASE_ADDR, 4);
 }
 
 static inline struct device_d *imx31_add_nand(struct imx_nand_platform_data *pdata)
diff --git a/arch/arm/mach-imx/include/mach/devices-imx35.h b/arch/arm/mach-imx/include/mach/devices-imx35.h
index 27c49e7161..06393d42ad 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx35.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx35.h
@@ -28,17 +28,17 @@ static inline struct device_d *imx35_add_spi(struct spi_imx_master *pdata)
 
 static inline struct device_d *imx35_add_uart0(void)
 {
-	return imx_add_uart((void *)MX35_UART1_BASE_ADDR, 0);
+	return imx_add_uart_imx21((void *)MX35_UART1_BASE_ADDR, 0);
 }
 
 static inline struct device_d *imx35_add_uart1(void)
 {
-	return imx_add_uart((void *)MX35_UART2_BASE_ADDR, 1);
+	return imx_add_uart_imx21((void *)MX35_UART2_BASE_ADDR, 1);
 }
 
 static inline struct device_d *imx35_add_uart2(void)
 {
-	return imx_add_uart((void *)MX35_UART3_BASE_ADDR, 2);
+	return imx_add_uart_imx21((void *)MX35_UART3_BASE_ADDR, 2);
 }
 
 static inline struct device_d *imx35_add_nand(struct imx_nand_platform_data *pdata)
diff --git a/arch/arm/mach-imx/include/mach/devices-imx51.h b/arch/arm/mach-imx/include/mach/devices-imx51.h
index 4b35c96e21..83b5a6615e 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx51.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx51.h
@@ -29,17 +29,17 @@ static inline struct device_d *imx51_add_i2c1(struct i2c_platform_data *pdata)
 
 static inline struct device_d *imx51_add_uart0(void)
 {
-	return imx_add_uart((void *)MX51_UART1_BASE_ADDR, 0);
+	return imx_add_uart_imx21((void *)MX51_UART1_BASE_ADDR, 0);
 }
 
 static inline struct device_d *imx51_add_uart1(void)
 {
-	return imx_add_uart((void *)MX51_UART2_BASE_ADDR, 1);
+	return imx_add_uart_imx21((void *)MX51_UART2_BASE_ADDR, 1);
 }
 
 static inline struct device_d *imx51_add_uart2(void)
 {
-	return imx_add_uart((void *)MX51_UART3_BASE_ADDR, 2);
+	return imx_add_uart_imx21((void *)MX51_UART3_BASE_ADDR, 2);
 }
 
 static inline struct device_d *imx51_add_fec(struct fec_platform_data *pdata)
diff --git a/arch/arm/mach-imx/include/mach/devices-imx53.h b/arch/arm/mach-imx/include/mach/devices-imx53.h
index 54d7b27be1..5c3c0938a2 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx53.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx53.h
@@ -23,17 +23,17 @@ static inline struct device_d *imx53_add_i2c1(struct i2c_platform_data *pdata)
 
 static inline struct device_d *imx53_add_uart0(void)
 {
-	return imx_add_uart((void *)MX53_UART1_BASE_ADDR, 0);
+	return imx_add_uart_imx21((void *)MX53_UART1_BASE_ADDR, 0);
 }
 
 static inline struct device_d *imx53_add_uart1(void)
 {
-	return imx_add_uart((void *)MX53_UART2_BASE_ADDR, 1);
+	return imx_add_uart_imx21((void *)MX53_UART2_BASE_ADDR, 1);
 }
 
 static inline struct device_d *imx53_add_uart2(void)
 {
-	return imx_add_uart((void *)MX53_UART3_BASE_ADDR, 2);
+	return imx_add_uart_imx21((void *)MX53_UART3_BASE_ADDR, 2);
 }
 
 static inline struct device_d *imx53_add_fec(struct fec_platform_data *pdata)
diff --git a/arch/arm/mach-imx/include/mach/devices-imx6.h b/arch/arm/mach-imx/include/mach/devices-imx6.h
index c73e4888ed..93109382c5 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx6.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx6.h
@@ -2,22 +2,22 @@
 
 static inline struct device_d *imx6_add_uart0(void)
 {
-	return imx_add_uart((void *)MX6_UART1_BASE_ADDR, 0);
+	return imx_add_uart_imx21((void *)MX6_UART1_BASE_ADDR, 0);
 }
 
 static inline struct device_d *imx6_add_uart1(void)
 {
-	return imx_add_uart((void *)MX6_UART2_BASE_ADDR, 1);
+	return imx_add_uart_imx21((void *)MX6_UART2_BASE_ADDR, 1);
 }
 
 static inline struct device_d *imx6_add_uart2(void)
 {
-	return imx_add_uart((void *)MX6_UART3_BASE_ADDR, 2);
+	return imx_add_uart_imx21((void *)MX6_UART3_BASE_ADDR, 2);
 }
 
 static inline struct device_d *imx6_add_uart3(void)
 {
-	return imx_add_uart((void *)MX6_UART4_BASE_ADDR, 3);
+	return imx_add_uart_imx21((void *)MX6_UART4_BASE_ADDR, 3);
 }
 
 static inline struct device_d *imx6_add_mmc0(struct esdhc_platform_data *pdata)
diff --git a/arch/arm/mach-imx/include/mach/devices.h b/arch/arm/mach-imx/include/mach/devices.h
index da9164616e..8679ade62a 100644
--- a/arch/arm/mach-imx/include/mach/devices.h
+++ b/arch/arm/mach-imx/include/mach/devices.h
@@ -11,7 +11,8 @@
 struct device_d *imx_add_fec(void *base, struct fec_platform_data *pdata);
 struct device_d *imx_add_spi(void *base, int id, struct spi_imx_master *pdata);
 struct device_d *imx_add_i2c(void *base, int id, struct i2c_platform_data *pdata);
-struct device_d *imx_add_uart(void *base, int id);
+struct device_d *imx_add_uart_imx1(void *base, int id);
+struct device_d *imx_add_uart_imx21(void *base, int id);
 struct device_d *imx_add_nand(void *base, struct imx_nand_platform_data *pdata);
 struct device_d *imx_add_fb(void *base, struct imx_fb_platform_data *pdata);
 struct device_d *imx_add_ipufb(void *base, struct imx_ipu_fb_platform_data *pdata);