Merge branch 'for-next/imx-dt' into for-next/imx

21 files changed, 140 insertions, 47 deletions

diff --git a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
index 7cd61f9e96..5bcb24cf45 100644
--- a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
+++ b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
@@ -236,7 +236,7 @@ static int mx28_evk_devices_init(void)
 
 	imx_enable_enetclk();
 	mx28_evk_fec_reset();
-	add_generic_device("fec_imx", 0, NULL, IMX_FEC0_BASE, 0x4000,
+	add_generic_device("imx28-fec", 0, NULL, IMX_FEC0_BASE, 0x4000,
 			   IORESOURCE_MEM, &fec_info);
 
 	return 0;
diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c
index 961787669b..766e77b247 100644
--- a/arch/arm/boards/karo-tx28/tx28-stk5.c
+++ b/arch/arm/boards/karo-tx28/tx28-stk5.c
@@ -393,7 +393,7 @@ void base_board_init(void)
 	tx28_get_ethaddr();
 
 	imx_enable_enetclk();
-	add_generic_device("fec_imx", 0, NULL, IMX_FEC0_BASE, 0x4000,
+	add_generic_device("imx28-fec", 0, NULL, IMX_FEC0_BASE, 0x4000,
 			   IORESOURCE_MEM, &fec_info);
 
 	ret = register_persistent_environment();
diff --git a/arch/arm/mach-imx/clk-imx1.c b/arch/arm/mach-imx/clk-imx1.c
index 45e9c6643f..0d04a92f36 100644
--- a/arch/arm/mach-imx/clk-imx1.c
+++ b/arch/arm/mach-imx/clk-imx1.c
@@ -96,9 +96,18 @@ static int imx1_ccm_probe(struct device_d *dev)
 	return 0;
 }
 
+static __maybe_unused struct of_device_id imx1_ccm_dt_ids[] = {
+	{
+		.compatible = "fsl,imx1-ccm",
+	}, {
+		/* sentinel */
+	}
+};
+
 static struct driver_d imx1_ccm_driver = {
 	.probe	= imx1_ccm_probe,
 	.name	= "imx1-ccm",
+	.of_compatible = DRV_OF_COMPAT(imx1_ccm_dt_ids),
 };
 
 static int imx1_ccm_init(void)
diff --git a/arch/arm/mach-imx/clk-imx21.c b/arch/arm/mach-imx/clk-imx21.c
index 69aaa9e6ad..a7c5732260 100644
--- a/arch/arm/mach-imx/clk-imx21.c
+++ b/arch/arm/mach-imx/clk-imx21.c
@@ -107,9 +107,18 @@ static int imx21_ccm_probe(struct device_d *dev)
 	return 0;
 }
 
+static __maybe_unused struct of_device_id imx21_ccm_dt_ids[] = {
+	{
+		.compatible = "fsl,imx21-ccm",
+	}, {
+		/* sentinel */
+	}
+};
+
 static struct driver_d imx21_ccm_driver = {
 	.probe	= imx21_ccm_probe,
 	.name	= "imx21-ccm",
+	.of_compatible = DRV_OF_COMPAT(imx21_ccm_dt_ids),
 };
 
 static int imx21_ccm_init(void)
diff --git a/arch/arm/mach-imx/clk-imx25.c b/arch/arm/mach-imx/clk-imx25.c
index 9583cb463c..17e54494dd 100644
--- a/arch/arm/mach-imx/clk-imx25.c
+++ b/arch/arm/mach-imx/clk-imx25.c
@@ -152,9 +152,18 @@ static int imx25_ccm_probe(struct device_d *dev)
 	return 0;
 }
 
+static __maybe_unused struct of_device_id imx25_ccm_dt_ids[] = {
+	{
+		.compatible = "fsl,imx25-ccm",
+	}, {
+		/* sentinel */
+	}
+};
+
 static struct driver_d imx25_ccm_driver = {
 	.probe	= imx25_ccm_probe,
 	.name	= "imx25-ccm",
+	.of_compatible = DRV_OF_COMPAT(imx25_ccm_dt_ids),
 };
 
 static int imx25_ccm_init(void)
diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c
index abfde0fd62..912d3f1f0b 100644
--- a/arch/arm/mach-imx/clk-imx27.c
+++ b/arch/arm/mach-imx/clk-imx27.c
@@ -142,9 +142,18 @@ static int imx27_ccm_probe(struct device_d *dev)
 	return 0;
 }
 
+static __maybe_unused struct of_device_id imx27_ccm_dt_ids[] = {
+	{
+		.compatible = "fsl,imx27-ccm",
+	}, {
+		/* sentinel */
+	}
+};
+
 static struct driver_d imx27_ccm_driver = {
 	.probe	= imx27_ccm_probe,
 	.name	= "imx27-ccm",
+	.of_compatible = DRV_OF_COMPAT(imx27_ccm_dt_ids),
 };
 
 static int imx27_ccm_init(void)
diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c
index cf8963a326..aa1b652ddd 100644
--- a/arch/arm/mach-imx/clk-imx31.c
+++ b/arch/arm/mach-imx/clk-imx31.c
@@ -121,9 +121,18 @@ static int imx31_ccm_probe(struct device_d *dev)
 	return 0;
 }
 
+static __maybe_unused struct of_device_id imx31_ccm_dt_ids[] = {
+	{
+		.compatible = "fsl,imx31-ccm",
+	}, {
+		/* sentinel */
+	}
+};
+
 static struct driver_d imx31_ccm_driver = {
 	.probe	= imx31_ccm_probe,
 	.name	= "imx31-ccm",
+	.of_compatible = DRV_OF_COMPAT(imx31_ccm_dt_ids),
 };
 
 static int imx31_ccm_init(void)
diff --git a/arch/arm/mach-imx/clk-imx35.c b/arch/arm/mach-imx/clk-imx35.c
index dfa75614fa..5b5a9e7882 100644
--- a/arch/arm/mach-imx/clk-imx35.c
+++ b/arch/arm/mach-imx/clk-imx35.c
@@ -174,9 +174,18 @@ static int imx35_ccm_probe(struct device_d *dev)
 	return 0;
 }
 
+static __maybe_unused struct of_device_id imx35_ccm_dt_ids[] = {
+	{
+		.compatible = "fsl,imx35-ccm",
+	}, {
+		/* sentinel */
+	}
+};
+
 static struct driver_d imx35_ccm_driver = {
 	.probe	= imx35_ccm_probe,
 	.name	= "imx35-ccm",
+	.of_compatible = DRV_OF_COMPAT(imx35_ccm_dt_ids),
 };
 
 static int imx35_ccm_init(void)
diff --git a/arch/arm/mach-imx/clk-imx5.c b/arch/arm/mach-imx/clk-imx5.c
index 365fcb3338..03a18435c6 100644
--- a/arch/arm/mach-imx/clk-imx5.c
+++ b/arch/arm/mach-imx/clk-imx5.c
@@ -233,9 +233,18 @@ static int imx51_ccm_probe(struct device_d *dev)
 	return 0;
 }
 
+static __maybe_unused struct of_device_id imx51_ccm_dt_ids[] = {
+	{
+		.compatible = "fsl,imx51-ccm",
+	}, {
+		/* sentinel */
+	}
+};
+
 static struct driver_d imx51_ccm_driver = {
 	.probe	= imx51_ccm_probe,
 	.name	= "imx51-ccm",
+	.of_compatible = DRV_OF_COMPAT(imx51_ccm_dt_ids),
 };
 
 static int imx51_ccm_init(void)
@@ -285,9 +294,18 @@ static int imx53_ccm_probe(struct device_d *dev)
 	return 0;
 }
 
+static __maybe_unused struct of_device_id imx53_ccm_dt_ids[] = {
+	{
+		.compatible = "fsl,imx53-ccm",
+	}, {
+		/* sentinel */
+	}
+};
+
 static struct driver_d imx53_ccm_driver = {
 	.probe	= imx53_ccm_probe,
 	.name	= "imx53-ccm",
+	.of_compatible = DRV_OF_COMPAT(imx53_ccm_dt_ids),
 };
 
 static int imx53_ccm_init(void)
diff --git a/arch/arm/mach-imx/clk-imx6.c b/arch/arm/mach-imx/clk-imx6.c
index 19a8bc6836..a1da47a959 100644
--- a/arch/arm/mach-imx/clk-imx6.c
+++ b/arch/arm/mach-imx/clk-imx6.c
@@ -294,9 +294,18 @@ static int imx6_ccm_probe(struct device_d *dev)
 	return 0;
 }
 
+static __maybe_unused struct of_device_id imx6_ccm_dt_ids[] = {
+	{
+		.compatible = "fsl,imx6-ccm",
+	}, {
+		/* sentinel */
+	}
+};
+
 static struct driver_d imx6_ccm_driver = {
 	.probe	= imx6_ccm_probe,
 	.name	= "imx6-ccm",
+	.of_compatible = DRV_OF_COMPAT(imx6_ccm_dt_ids),
 };
 
 static int imx6_ccm_init(void)
diff --git a/arch/arm/mach-imx/devices.c b/arch/arm/mach-imx/devices.c
index 9fde84f1a1..4ee4e6cc8d 100644
--- a/arch/arm/mach-imx/devices.c
+++ b/arch/arm/mach-imx/devices.c
@@ -8,9 +8,14 @@ static inline struct device_d *imx_add_device(char *name, int id, void *base, in
 				  IORESOURCE_MEM, pdata);
 }
 
-struct device_d *imx_add_fec(void *base, struct fec_platform_data *pdata)
+struct device_d *imx_add_fec_imx27(void *base, struct fec_platform_data *pdata)
 {
-	return imx_add_device("fec_imx", -1, base, 0x1000, pdata);
+	return imx_add_device("imx27-fec", -1, base, 0x1000, pdata);
+}
+
+struct device_d *imx_add_fec_imx6(void *base, struct fec_platform_data *pdata)
+{
+	return imx_add_device("imx6-fec", -1, base, 0x1000, pdata);
 }
 
 struct device_d *imx_add_spi(void *base, int id, struct spi_imx_master *pdata)
@@ -23,9 +28,14 @@ struct device_d *imx_add_i2c(void *base, int id, struct i2c_platform_data *pdata
 	return imx_add_device("i2c-fsl", id, base, 0x1000, pdata);
 }
 
-struct device_d *imx_add_uart(void *base, int id)
+struct device_d *imx_add_uart_imx1(void *base, int id)
+{
+	return imx_add_device("imx1-uart", id, base, 0x1000, NULL);
+}
+
+struct device_d *imx_add_uart_imx21(void *base, int id)
 {
-	return imx_add_device("imx_serial", id, base, 0x1000, NULL);
+	return imx_add_device("imx21-uart", id, base, 0x1000, NULL);
 }
 
 struct device_d *imx_add_nand(void *base, struct imx_nand_platform_data *pdata)
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..a655be9564 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)
@@ -68,7 +68,7 @@ static inline struct device_d *imx25_add_fb(struct imx_fb_platform_data *pdata)
 
 static inline struct device_d *imx25_add_fec(struct fec_platform_data *pdata)
 {
-	return imx_add_fec((void *)MX25_FEC_BASE_ADDR, pdata);
+	return imx_add_fec_imx27((void *)MX25_FEC_BASE_ADDR, pdata);
 }
 
 static inline struct device_d *imx25_add_mmc0(struct esdhc_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..79da93531d 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)
@@ -53,7 +53,7 @@ static inline struct device_d *imx27_add_fb(struct imx_fb_platform_data *pdata)
 
 static inline struct device_d *imx27_add_fec(struct fec_platform_data *pdata)
 {
-	return imx_add_fec((void *)MX27_FEC_BASE_ADDR, pdata);
+	return imx_add_fec_imx27((void *)MX27_FEC_BASE_ADDR, pdata);
 }
 
 static inline struct device_d *imx27_add_mmc0(void *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..912c41872e 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)
@@ -53,7 +53,7 @@ static inline struct device_d *imx35_add_fb(struct imx_ipu_fb_platform_data *pda
 
 static inline struct device_d *imx35_add_fec(struct fec_platform_data *pdata)
 {
-	return imx_add_fec((void *)MX35_FEC_BASE_ADDR, pdata);
+	return imx_add_fec_imx27((void *)MX35_FEC_BASE_ADDR, pdata);
 }
 
 static inline struct device_d *imx35_add_mmc0(struct esdhc_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..8ee3c17478 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx51.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx51.h
@@ -29,22 +29,22 @@ 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)
 {
-	return imx_add_fec((void *)MX51_MXC_FEC_BASE_ADDR, pdata);
+	return imx_add_fec_imx27((void *)MX51_MXC_FEC_BASE_ADDR, pdata);
 }
 
 static inline struct device_d *imx51_add_mmc0(struct esdhc_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..5f967eaac2 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx53.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx53.h
@@ -23,22 +23,22 @@ 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)
 {
-	return imx_add_fec((void *)MX53_FEC_BASE_ADDR, pdata);
+	return imx_add_fec_imx27((void *)MX53_FEC_BASE_ADDR, pdata);
 }
 
 static inline struct device_d *imx53_add_mmc0(struct esdhc_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..f8282e7fca 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)
@@ -42,7 +42,7 @@ static inline struct device_d *imx6_add_mmc3(struct esdhc_platform_data *pdata)
 
 static inline struct device_d *imx6_add_fec(struct fec_platform_data *pdata)
 {
-	return imx_add_fec((void *)MX6_ENET_BASE_ADDR, pdata);
+	return imx_add_fec_imx6((void *)MX6_ENET_BASE_ADDR, pdata);
 }
 
 static inline struct device_d *imx6_add_spi0(struct spi_imx_master *pdata)
diff --git a/arch/arm/mach-imx/include/mach/devices.h b/arch/arm/mach-imx/include/mach/devices.h
index da9164616e..f7824f5406 100644
--- a/arch/arm/mach-imx/include/mach/devices.h
+++ b/arch/arm/mach-imx/include/mach/devices.h
@@ -8,10 +8,12 @@
 #include <mach/imx-ipu-fb.h>
 #include <mach/esdhc.h>
 
-struct device_d *imx_add_fec(void *base, struct fec_platform_data *pdata);
+struct device_d *imx_add_fec_imx27(void *base, struct fec_platform_data *pdata);
+struct device_d *imx_add_fec_imx6(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);