Merge branch 'for-next/i2c'

7 files changed, 8 insertions, 8 deletions

diff --git a/arch/arm/mach-imx/devices.c b/arch/arm/mach-imx/devices.c
index 8120f56828..9fde84f1a1 100644
--- a/arch/arm/mach-imx/devices.c
+++ b/arch/arm/mach-imx/devices.c
@@ -20,7 +20,7 @@ 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)
 {
-	return imx_add_device("i2c-imx", id, base, 0x1000, pdata);
+	return imx_add_device("i2c-fsl", id, base, 0x1000, pdata);
 }
 
 struct device_d *imx_add_uart(void *base, int id)
diff --git a/arch/arm/mach-imx/include/mach/clock.h b/arch/arm/mach-imx/include/mach/clock.h
index 050b7f8921..f613395768 100644
--- a/arch/arm/mach-imx/include/mach/clock.h
+++ b/arch/arm/mach-imx/include/mach/clock.h
@@ -27,7 +27,7 @@ ulong imx_get_fecclk(void);
 ulong imx_get_gptclk(void);
 ulong imx_get_uartclk(void);
 ulong imx_get_lcdclk(void);
-ulong imx_get_i2cclk(void);
+ulong fsl_get_i2cclk(void);
 ulong imx_get_mmcclk(void);
 ulong imx_get_cspiclk(void);
 ulong imx_get_ipgclk(void);
diff --git a/arch/arm/mach-imx/speed-imx25.c b/arch/arm/mach-imx/speed-imx25.c
index ed14113f76..39e68c85a4 100644
--- a/arch/arm/mach-imx/speed-imx25.c
+++ b/arch/arm/mach-imx/speed-imx25.c
@@ -78,7 +78,7 @@ unsigned long imx_get_lcdclk(void)
 	return imx_get_perclk(7);
 }
 
-unsigned long imx_get_i2cclk(void)
+unsigned long fsl_get_i2cclk(void)
 {
 	return imx_get_perclk(6);
 }
diff --git a/arch/arm/mach-imx/speed-imx27.c b/arch/arm/mach-imx/speed-imx27.c
index 644fd0462a..7224382299 100644
--- a/arch/arm/mach-imx/speed-imx27.c
+++ b/arch/arm/mach-imx/speed-imx27.c
@@ -155,7 +155,7 @@ ulong imx_get_lcdclk(void)
 	return imx_get_perclk3();
 }
 
-ulong imx_get_i2cclk(void)
+ulong fsl_get_i2cclk(void)
 {
 	return imx_get_ipgclk();
 }
diff --git a/arch/arm/mach-imx/speed-imx35.c b/arch/arm/mach-imx/speed-imx35.c
index 6d4236a020..ec7d06a11b 100644
--- a/arch/arm/mach-imx/speed-imx35.c
+++ b/arch/arm/mach-imx/speed-imx35.c
@@ -187,7 +187,7 @@ ulong imx_get_fecclk(void)
 	return imx_get_ipgclk();
 }
 
-ulong imx_get_i2cclk(void)
+ulong fsl_get_i2cclk(void)
 {
 	return imx_get_ipg_perclk();
 }
diff --git a/arch/arm/mach-imx/speed-imx51.c b/arch/arm/mach-imx/speed-imx51.c
index 288fe1a640..3903afc821 100644
--- a/arch/arm/mach-imx/speed-imx51.c
+++ b/arch/arm/mach-imx/speed-imx51.c
@@ -179,7 +179,7 @@ unsigned long imx_get_fecclk(void)
 	return imx_get_ipgclk();
 }
 
-unsigned long imx_get_i2cclk(void)
+unsigned long fsl_get_i2cclk(void)
 {
 	return imx_get_ipgclk();
 }
diff --git a/arch/arm/mach-imx/speed-imx53.c b/arch/arm/mach-imx/speed-imx53.c
index ede5ffd75b..b1ba5fd1d2 100644
--- a/arch/arm/mach-imx/speed-imx53.c
+++ b/arch/arm/mach-imx/speed-imx53.c
@@ -190,7 +190,7 @@ static unsigned long imx_get_ipg_perclk(void)
 	return 0;
 }
 
-unsigned long imx_get_i2cclk(void)
+unsigned long fsl_get_i2cclk(void)
 {
 	return imx_get_ipg_perclk();
 }
@@ -232,5 +232,5 @@ void imx_dump_clocks(void)
 	printf("ipg:  %ld\n", imx_get_ipgclk());
 	printf("fec:  %ld\n", imx_get_fecclk());
 	printf("gpt:  %ld\n", imx_get_gptclk());
-	printf("i2c:  %ld\n", imx_get_i2cclk());
+	printf("i2c:  %ld\n", fsl_get_i2cclk());
 }