summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/i2c/Makefile2
-rw-r--r--drivers/i2c/adi_i2c.c (renamed from drivers/i2c/bfin-twi_i2c.c)7
-rw-r--r--include/configs/bct-brettl2.h2
-rw-r--r--include/configs/bf518f-ezbrd.h2
-rw-r--r--include/configs/bf526-ezbrd.h2
-rw-r--r--include/configs/bf527-ad7160-eval.h2
-rw-r--r--include/configs/bf527-ezkit.h2
-rw-r--r--include/configs/bf527-sdp.h2
-rw-r--r--include/configs/bf537-minotaur.h2
-rw-r--r--include/configs/bf537-pnav.h2
-rw-r--r--include/configs/bf537-srv1.h2
-rw-r--r--include/configs/bf537-stamp.h2
-rw-r--r--include/configs/bf538f-ezkit.h2
-rw-r--r--include/configs/bf548-ezkit.h2
-rw-r--r--include/configs/bf609-ezkit.h2
-rw-r--r--include/configs/br4.h2
-rw-r--r--include/configs/cm-bf527.h2
-rw-r--r--include/configs/cm-bf537e.h2
-rw-r--r--include/configs/cm-bf537u.h2
-rw-r--r--include/configs/cm-bf548.h2
-rw-r--r--include/configs/pr1.h2
-rw-r--r--include/configs/tcm-bf518.h2
-rw-r--r--include/configs/tcm-bf537.h2
23 files changed, 25 insertions, 26 deletions
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index d067897..dae3d71 100644
--- 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
diff --git a/drivers/i2c/bfin-twi_i2c.c b/drivers/i2c/adi_i2c.c
index cfab064..cb74062 100644
--- a/drivers/i2c/bfin-twi_i2c.c
+++ b/drivers/i2c/adi_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;
diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index d0828d5..f0b74d8 100644
--- 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
diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 20f6ed1..4df51b9 100644
--- 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
diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index c33d035..55bfbbe 100644
--- 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
diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h
index b497f26..589c7a5 100644
--- 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
diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index 0bca53f..0e68952 100644
--- 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
diff --git a/include/configs/bf527-sdp.h b/include/configs/bf527-sdp.h
index 9d43b81..a3ad7ae 100644
--- 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
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 3bc364c..d94c2df 100644
--- 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
diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index ba74a69..6c9a907 100644
--- 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
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index 0b723cf..a6ceffa 100644
--- 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
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 29f9316..7ab644f 100644
--- 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
diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index a655282..743e193 100644
--- 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
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index da5f029..6b29d08 100644
--- 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
diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h
index 12192ff..f02e155 100644
--- 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
/*
diff --git a/include/configs/br4.h b/include/configs/br4.h
index 3f24008..13e939f 100644
--- 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
diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h
index f5351ad..3668903 100644
--- 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
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 1729b44..85f5341 100644
--- 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
diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index 272aa74..5dffd1b 100644
--- 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
diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h
index 7f27eda..13ea067 100644
--- 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
diff --git a/include/configs/pr1.h b/include/configs/pr1.h
index 0f57e86..eb18d6d 100644
--- 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
diff --git a/include/configs/tcm-bf518.h b/include/configs/tcm-bf518.h
index 6673026..e9bff83 100644
--- 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
diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index 9998343..caf8847 100644
--- 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
generated by cgit v1.1 at 2024-11-09 14:51:48 +0000