summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2010-09-13 22:34:49 +0800
committerSascha Hauer <s.hauer@pengutronix.de>2010-09-20 08:57:22 +0200
commit6a0ce693bef3a133c57706222966bccfd79148df (patch)
tree5436c03b7ae4f8273e79a825495dd1725beed034 /drivers
parente51b1ac0138bb599eaebead803d695ab880d319f (diff)
downloadbarebox-6a0ce693bef3a133c57706222966bccfd79148df.tar.gz
barebox-6a0ce693bef3a133c57706222966bccfd79148df.tar.xz
i2c: move busses to drivers/i2c/busses
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/Kconfig8
-rw-r--r--drivers/i2c/Makefile5
-rw-r--r--drivers/i2c/busses/Kconfig15
-rw-r--r--drivers/i2c/busses/Makefile2
-rw-r--r--drivers/i2c/busses/i2c-imx.c (renamed from drivers/i2c/i2c-imx.c)0
-rw-r--r--drivers/i2c/busses/i2c-omap.c (renamed from drivers/i2c/i2c-omap.c)0
6 files changed, 19 insertions, 11 deletions
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index a6138aa75a..9ce16558c4 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -3,13 +3,7 @@ menuconfig I2C
if I2C
-config I2C_IMX
- bool "i.MX I2C Master driver"
- depends on ARCH_IMX
-
-config I2C_OMAP
- bool "OMAP I2C Master driver"
- depends on ARCH_OMAP
+source drivers/i2c/busses/Kconfig
config I2C_MC13892
bool "MC13892 a.k.a. PMIC driver"
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index daa79dd5b9..0584b5589d 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -1,7 +1,4 @@
-obj-$(CONFIG_I2C) += i2c.o
-
-obj-$(CONFIG_I2C_IMX) += i2c-imx.o
-obj-$(CONFIG_I2C_OMAP) += i2c-omap.o
+obj-$(CONFIG_I2C) += i2c.o busses/
obj-$(CONFIG_I2C_MC13892) += mc13892.o
obj-$(CONFIG_I2C_MC34704) += mc34704.o
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
new file mode 100644
index 0000000000..4b170caba6
--- /dev/null
+++ b/drivers/i2c/busses/Kconfig
@@ -0,0 +1,15 @@
+#
+# Sensor device configuration
+#
+
+menu "I2C Hardware Bus support"
+
+config I2C_IMX
+ bool "i.MX I2C Master driver"
+ depends on ARCH_IMX
+
+config I2C_OMAP
+ bool "OMAP I2C Master driver"
+ depends on ARCH_OMAP
+
+endmenu
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
new file mode 100644
index 0000000000..e4c5125580
--- /dev/null
+++ b/drivers/i2c/busses/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_I2C_IMX) += i2c-imx.o
+obj-$(CONFIG_I2C_OMAP) += i2c-omap.o
diff --git a/drivers/i2c/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index cc64d943c1..cc64d943c1 100644
--- a/drivers/i2c/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
diff --git a/drivers/i2c/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 8e7a8b500c..8e7a8b500c 100644
--- a/drivers/i2c/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c