blackfin: rename bfin-twi_i2c driver to adi_i2c

Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
This commit is contained in:
Scott Jiang 2014-11-13 15:30:53 +08:00 committed by Heiko Schocher
parent 2086e388d5
commit fea9b69acd
23 changed files with 25 additions and 26 deletions

View file

@ -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

View file

@ -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. * Licensed under the GPL-2 or later.
*/ */
@ -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;

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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
/* /*

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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