From 942ba9969b9efa25f816c238861ecb339c54ed73 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Mon, 30 Mar 2009 18:58:39 +0200 Subject: [PATCH] davinci: move i2c driver to drivers/i2c Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- cpu/arm926ejs/davinci/Makefile | 2 +- drivers/i2c/Makefile | 1 + cpu/arm926ejs/davinci/i2c.c => drivers/i2c/davinci_i2c.c | 5 ----- 3 files changed, 2 insertions(+), 6 deletions(-) rename cpu/arm926ejs/davinci/i2c.c => drivers/i2c/davinci_i2c.c (98%) diff --git a/cpu/arm926ejs/davinci/Makefile b/cpu/arm926ejs/davinci/Makefile index 53f77428e6..ed24e6569f 100644 --- a/cpu/arm926ejs/davinci/Makefile +++ b/cpu/arm926ejs/davinci/Makefile @@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a -COBJS = timer.o ether.o lxt972.o dp83848.o i2c.o +COBJS = timer.o ether.o lxt972.o dp83848.o SOBJS = lowlevel_init.o reset.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index 69cf9a661e..4b4d9db9ec 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -26,6 +26,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libi2c.a COBJS-$(CONFIG_BFIN_TWI_I2C) += bfin-twi_i2c.o +COBJS-$(CONFIG_DRIVER_DAVINCI_I2C) += davinci_i2c.o COBJS-$(CONFIG_FSL_I2C) += fsl_i2c.o COBJS-$(CONFIG_I2C_MXC) += mxc_i2c.o COBJS-$(CONFIG_DRIVER_OMAP1510_I2C) += omap1510_i2c.o diff --git a/cpu/arm926ejs/davinci/i2c.c b/drivers/i2c/davinci_i2c.c similarity index 98% rename from cpu/arm926ejs/davinci/i2c.c rename to drivers/i2c/davinci_i2c.c index 3ba20ef186..eee1cbd25d 100644 --- a/cpu/arm926ejs/davinci/i2c.c +++ b/drivers/i2c/davinci_i2c.c @@ -25,9 +25,6 @@ */ #include - -#ifdef CONFIG_DRIVER_DAVINCI_I2C - #include #include #include @@ -330,5 +327,3 @@ int i2c_write(u_int8_t chip, u_int32_t addr, int alen, u_int8_t *buf, int len) return(0); } - -#endif /* CONFIG_DRIVER_DAVINCI_I2C */ -- 2.39.5