From 080c646dbf474a109c3f85718fb01ce042a38c45 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Tue, 20 Nov 2007 20:14:18 +0100
Subject: [PATCH] drivers/i2c : move i2c drivers to drivers/i2c

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 Makefile                         |  1 +
 drivers/Makefile                 |  8 ------
 drivers/i2c/Makefile             | 49 ++++++++++++++++++++++++++++++++
 drivers/{ => i2c}/fsl_i2c.c      |  0
 drivers/{ => i2c}/omap1510_i2c.c |  0
 drivers/{ => i2c}/omap24xx_i2c.c |  0
 drivers/{ => i2c}/tsi108_i2c.c   |  0
 7 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 drivers/i2c/Makefile
 rename drivers/{ => i2c}/fsl_i2c.c (100%)
 rename drivers/{ => i2c}/omap1510_i2c.c (100%)
 rename drivers/{ => i2c}/omap24xx_i2c.c (100%)
 rename drivers/{ => i2c}/tsi108_i2c.c (100%)

diff --git a/Makefile b/Makefile
index ac4b430d75..78ae92400d 100644
--- a/Makefile
+++ b/Makefile
@@ -207,6 +207,7 @@ LIBS += net/libnet.a
 LIBS += disk/libdisk.a
 LIBS += rtc/librtc.a
 LIBS += dtt/libdtt.a
+LIBS += drivers/i2c/libi2c.a
 LIBS += drivers/libdrivers.a
 LIBS += drivers/bios_emulator/libatibiosemu.a
 LIBS += drivers/nand/libnand.a
diff --git a/drivers/Makefile b/drivers/Makefile
index 480b3581f6..7b524e4a4d 100755
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -70,14 +70,6 @@ COBJS-y += smiLynxEM.o
 COBJS-y += usbtty.o
 COBJS-y += videomodes.o
 
-#
-# I2C Drivers
-#
-COBJS-y += omap1510_i2c.o
-COBJS-y += omap24xx_i2c.o
-COBJS-y += tsi108_i2c.o
-COBJS-y += fsl_i2c.o
-
 #
 # Network Drivers
 #
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
new file mode 100644
index 0000000000..29d6c03dbb
--- /dev/null
+++ b/drivers/i2c/Makefile
@@ -0,0 +1,49 @@
+#
+# (C) Copyright 2000-2007
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB 	:= $(obj)libi2c.a
+
+COBJS-y += fsl_i2c.o
+COBJS-y += omap1510_i2c.o
+COBJS-y += omap24xx_i2c.o
+COBJS-y += tsi108_i2c.o
+
+COBJS	:= $(COBJS-y)
+SRCS 	:= $(COBJS:.o=.c)
+OBJS 	:= $(addprefix $(obj),$(COBJS))
+
+all:	$(LIB)
+
+$(LIB):	$(obj).depend $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/drivers/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
similarity index 100%
rename from drivers/fsl_i2c.c
rename to drivers/i2c/fsl_i2c.c
diff --git a/drivers/omap1510_i2c.c b/drivers/i2c/omap1510_i2c.c
similarity index 100%
rename from drivers/omap1510_i2c.c
rename to drivers/i2c/omap1510_i2c.c
diff --git a/drivers/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
similarity index 100%
rename from drivers/omap24xx_i2c.c
rename to drivers/i2c/omap24xx_i2c.c
diff --git a/drivers/tsi108_i2c.c b/drivers/i2c/tsi108_i2c.c
similarity index 100%
rename from drivers/tsi108_i2c.c
rename to drivers/i2c/tsi108_i2c.c
-- 
2.39.5