Skip to content
Snippets Groups Projects
Commit fea9b69a authored by Scott Jiang's avatar Scott Jiang Committed by Heiko Schocher
Browse files

blackfin: rename bfin-twi_i2c driver to adi_i2c

parent 2086e388
No related branches found
No related tags found
No related merge requests found
Showing
with 22 additions and 23 deletions
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # 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_I2C_MV) += mv_i2c.o
obj-$(CONFIG_PCA9564_I2C) += pca9564_i2c.o obj-$(CONFIG_PCA9564_I2C) += pca9564_i2c.o
obj-$(CONFIG_TSI108_I2C) += tsi108_i2c.o obj-$(CONFIG_TSI108_I2C) += tsi108_i2c.o
......
/* /*
* 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. * Licensed under the GPL-2 or later.
*/ */
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
#include <common.h> #include <common.h>
#include <i2c.h> #include <i2c.h>
#include <asm/blackfin.h>
#include <asm/clock.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 */ /* Every register is 32bit aligned, but only 16bits in size */
#define ureg(name) u16 name; u16 __pad_##name; #define ureg(name) u16 name; u16 __pad_##name;
......
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
/* /*
* I2C settings * I2C settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 50000 #define CONFIG_SYS_I2C_SPEED 50000
#define CONFIG_SYS_I2C_SLAVE 0 #define CONFIG_SYS_I2C_SLAVE 0
......
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
/* /*
* I2C settings * I2C settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
/* /*
* I2C settings * I2C settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
#define CONFIG_SYS_I2C_SPEED 50000 #define CONFIG_SYS_I2C_SPEED 50000
#define CONFIG_SYS_I2C_SLAVE 0 #define CONFIG_SYS_I2C_SLAVE 0
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
#define CONFIG_PHYLIB #define CONFIG_PHYLIB
/* i2c Settings */ /* i2c Settings */
#define CONFIG_BFIN_TWI_I2C #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C #define CONFIG_HARD_I2C
/* /*
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C #define CONFIG_HARD_I2C
......
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
/* /*
* I2C Settings * I2C Settings
*/ */
#define CONFIG_BFIN_TWI_I2C 1 #define CONFIG_SYS_I2C_ADI
#define CONFIG_HARD_I2C 1 #define CONFIG_HARD_I2C 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment