blackfin: rename bfin-twi_i2c driver to adi_i2c

Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
2014-11-13 15:30:53 +08:00 · 2014-11-13 15:30:53 +08:00 · fea9b69acd
commit fea9b69acd
parent 2086e388d5
23 changed files with 25 additions and 26 deletions
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@ -5,7 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #

-obj-$(CONFIG_BFIN_TWI_I2C) += bfin-twi_i2c.o
+obj-$(CONFIG_SYS_I2C_ADI) += adi_i2c.o
 obj-$(CONFIG_I2C_MV) += mv_i2c.o
 obj-$(CONFIG_PCA9564_I2C) += pca9564_i2c.o
 obj-$(CONFIG_TSI108_I2C) += tsi108_i2c.o
--- a/drivers/i2c/bfin-twi_i2c.c
+++ b/drivers/i2c/bfin-twi_i2c.c
@ -1,7 +1,7 @@
 /*
- * i2c.c - driver for Blackfin on-chip TWI/I2C
+ * i2c.c - driver for ADI TWI/I2C
 *
- * Copyright (c) 2006-2010 Analog Devices Inc.
+ * Copyright (c) 2006-2014 Analog Devices Inc.
 *
 * Licensed under the GPL-2 or later.
 */
@ -9,9 +9,8 @@
 #include <common.h>
 #include <i2c.h>

-#include <asm/blackfin.h>
 #include <asm/clock.h>
-#include <asm/mach-common/bits/twi.h>
+#include <asm/twi.h>

 /* Every register is 32bit aligned, but only 16bits in size */
 #define ureg(name) u16 name; u16 __pad_##name;
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@ -122,7 +122,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@ -134,7 +134,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@ -131,7 +131,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/bf527-ad7160-eval.h
+++ b/include/configs/bf527-ad7160-eval.h
@ -119,7 +119,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@ -134,7 +134,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/bf527-sdp.h
+++ b/include/configs/bf527-sdp.h
@ -103,7 +103,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@ -121,7 +121,7 @@
 /*
 * I2C settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1
 #define CONFIG_SYS_I2C_SPEED		50000
 #define CONFIG_SYS_I2C_SLAVE		0
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@ -142,7 +142,7 @@
 /*
 * I2C settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@ -120,7 +120,7 @@
 /*
 * I2C settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1
 #define CONFIG_SYS_I2C_SPEED		50000
 #define CONFIG_SYS_I2C_SLAVE		0
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@ -128,7 +128,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@ -126,7 +126,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@ -134,7 +134,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/bf609-ezkit.h
+++ b/include/configs/bf609-ezkit.h
@ -81,7 +81,7 @@
 #define CONFIG_PHYLIB

 /* i2c Settings */
-#define CONFIG_BFIN_TWI_I2C
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C

 /*
--- a/include/configs/br4.h
+++ b/include/configs/br4.h
@ -102,7 +102,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C


--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@ -113,7 +113,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@ -122,7 +122,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@ -120,7 +120,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@ -104,7 +104,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/pr1.h
+++ b/include/configs/pr1.h
@ -102,7 +102,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C


--- a/include/configs/tcm-bf518.h
+++ b/include/configs/tcm-bf518.h
@ -103,7 +103,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1


--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@ -122,7 +122,7 @@
 /*
 * I2C Settings
 */
-#define CONFIG_BFIN_TWI_I2C	1
+#define CONFIG_SYS_I2C_ADI
 #define CONFIG_HARD_I2C		1