summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorScott Jiang <scott.jiang.linux@gmail.com>2014-11-13 15:30:53 +0800
committerHeiko Schocher <hs@denx.de>2014-11-17 08:10:04 +0100
commitfea9b69acdeb8af4d37cf58ea805eecfbb03d44c (patch)
tree289270de0d4c16affd2ce30534bb32f63ab74022 /drivers
parent2086e388d56cbb0e3737a6276f04f00f74bf6723 (diff)
downloadblackbird-obmc-uboot-fea9b69acdeb8af4d37cf58ea805eecfbb03d44c.tar.gz
blackbird-obmc-uboot-fea9b69acdeb8af4d37cf58ea805eecfbb03d44c.zip
blackfin: rename bfin-twi_i2c driver to adi_i2c
Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/Makefile2
-rw-r--r--drivers/i2c/adi_i2c.c (renamed from drivers/i2c/bfin-twi_i2c.c)7
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index d067897244..dae3d71d2b 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 cfab064dfa..cb740625d2 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;
OpenPOWER on IntegriCloud