From c0a0a2581dc45e6082ff52b367eb30286c8047a7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Sep 2003 01:00:04 -0700 Subject: [PATCH] [PATCH] I2C: move the remaining i2c bus drivers to drivers/i2c/busses --- drivers/i2c/Kconfig | 35 +------------------ drivers/i2c/Makefile | 10 ++---- drivers/i2c/busses/Kconfig | 35 ++++++++++++++++++- drivers/i2c/busses/Makefile | 9 +++-- drivers/i2c/{ => busses}/i2c-frodo.c | 0 drivers/i2c/{ => busses}/i2c-ibm_iic.c | 0 drivers/i2c/{ => busses}/i2c-ibm_iic.h | 0 drivers/i2c/{ => busses}/i2c-iop3xx.c | 0 drivers/i2c/{ => busses}/i2c-iop3xx.h | 0 .../i2c/{i2c-adap-ite.c => busses/i2c-ite.c} | 2 +- drivers/i2c/{ => busses}/i2c-keywest.c | 0 drivers/i2c/{ => busses}/i2c-keywest.h | 0 drivers/i2c/{ => busses}/i2c-rpx.c | 0 13 files changed, 46 insertions(+), 45 deletions(-) rename drivers/i2c/{ => busses}/i2c-frodo.c (100%) rename drivers/i2c/{ => busses}/i2c-ibm_iic.c (100%) rename drivers/i2c/{ => busses}/i2c-ibm_iic.h (100%) rename drivers/i2c/{ => busses}/i2c-iop3xx.c (100%) rename drivers/i2c/{ => busses}/i2c-iop3xx.h (100%) rename drivers/i2c/{i2c-adap-ite.c => busses/i2c-ite.c} (99%) rename drivers/i2c/{ => busses}/i2c-keywest.c (100%) rename drivers/i2c/{ => busses}/i2c-keywest.h (100%) rename drivers/i2c/{ => busses}/i2c-rpx.c (100%) diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 5f4d8447b42ed..939448e936621 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -59,17 +59,7 @@ config I2C_ALGOPCF This support is also available as a module. If so, the module will be called i2c-algo-pcf. -config I2C_KEYWEST - tristate "Powermac Keywest I2C interface" - depends on I2C && PPC_PMAC - help - This supports the use of the I2C interface in the combo-I/O - chip on recent Apple machines. Say Y if you have such a machine. - - This support is also available as a module. If so, the module - will be called i2c-keywest. - -config ITE_I2C_ALGO +config I2C_ALGOITE tristate "ITE I2C Algorithm" depends on MIPS_ITE8172 && I2C help @@ -80,33 +70,10 @@ config ITE_I2C_ALGO This support is also available as a module. If so, the module will be called i2c-algo-ite. -config ITE_I2C_ADAP - tristate "ITE I2C Adapter" - depends on ITE_I2C_ALGO - help - This supports the ITE8172 I2C peripheral found on some MIPS - systems. Say Y if you have one of these. You should also say Y for - the ITE I2C driver algorithm support above. - - This support is also available as a module. If so, the module - will be called i2c-adap-ite. - config I2C_ALGO8XX tristate "MPC8xx CPM I2C interface" depends on 8xx && I2C -config I2C_RPXLITE - tristate "Embedded Planet RPX Lite/Classic suppoort" - depends on (RPXLITE || RPXCLASSIC) && I2C_ALGO8XX - -config I2C_IBM_IIC - tristate "IBM IIC I2C" - depends on IBM_OCP && I2C - -config I2C_IOP3XX - tristate "Intel XScale IOP3xx on-chip I2C interface" - depends on ARCH_IOP3XX && I2C - source drivers/i2c/busses/Kconfig source drivers/i2c/chips/Kconfig diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index 2e7b7146d47b4..1cec46521453a 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -1,15 +1,11 @@ # -# Makefile for the kernel i2c bus driver. +# Makefile for the i2c core. # obj-$(CONFIG_I2C) += i2c-core.o obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o +obj-$(CONFIG_I2C_SENSOR) += i2c-sensor.o obj-$(CONFIG_I2C_ALGOBIT) += i2c-algo-bit.o obj-$(CONFIG_I2C_ALGOPCF) += i2c-algo-pcf.o -obj-$(CONFIG_I2C_KEYWEST) += i2c-keywest.o -obj-$(CONFIG_ITE_I2C_ALGO) += i2c-algo-ite.o -obj-$(CONFIG_ITE_I2C_ADAP) += i2c-adap-ite.o -obj-$(CONFIG_I2C_IBM_IIC) += i2c-ibm_iic.o -obj-$(CONFIG_I2C_SENSOR) += i2c-sensor.o -obj-$(CONFIG_I2C_IOP3XX) += i2c-iop3xx.o +obj-$(CONFIG_I2C_ALGOITE) += i2c-algo-ite.o obj-y += busses/ chips/ diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index c90839e7a10d8..0ab8038109d60 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -2,7 +2,7 @@ # Sensor device configuration # -menu "I2C Hardware Sensors Mainboard support" +menu "I2C Hardware Bus support" config I2C_ALI1535 tristate "ALI 1535" @@ -97,6 +97,14 @@ config I2C_I810 This driver can also be built as a module. If so, the module will be called i2c-i810. +config I2C_IBM_IIC + tristate "IBM IIC I2C" + depends on IBM_OCP && I2C + +config I2C_IOP3XX + tristate "Intel XScale IOP3xx on-chip I2C interface" + depends on ARCH_IOP3XX && I2C + config I2C_ISA tristate "ISA Bus support" depends on I2C && ISA && EXPERIMENTAL @@ -107,6 +115,27 @@ config I2C_ISA This driver can also be built as a module. If so, the module will be called i2c-isa. +config I2C_ITE + tristate "ITE I2C Adapter" + depends on I2C_ALGOITE + help + This supports the ITE8172 I2C peripheral found on some MIPS + systems. Say Y if you have one of these. You should also say Y for + the ITE I2C driver algorithm support above. + + This support is also available as a module. If so, the module + will be called i2c-ite. + +config I2C_KEYWEST + tristate "Powermac Keywest I2C interface" + depends on I2C && PPC_PMAC + help + This supports the use of the I2C interface in the combo-I/O + chip on recent Apple machines. Say Y if you have such a machine. + + This support is also available as a module. If so, the module + will be called i2c-keywest. + config I2C_NFORCE2 tristate "Nvidia Nforce2" depends on I2C && PCI && EXPERIMENTAL @@ -156,6 +185,10 @@ config I2C_PROSAVAGE This support is also available as a module. If so, the module will be called i2c-prosavage. +config I2C_RPXLITE + tristate "Embedded Planet RPX Lite/Classic suppoort" + depends on (RPXLITE || RPXCLASSIC) && I2C_ALGO8XX + config I2C_SAVAGE4 tristate "S3 Savage 4" depends on I2C_ALGOBIT && PCI && EXPERIMENTAL diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index c437df090aa56..4f584e82eedf0 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -1,5 +1,5 @@ # -# Makefile for the kernel hardware sensors bus drivers. +# Makefile for the i2c bus drivers. # obj-$(CONFIG_I2C_ALI1535) += i2c-ali1535.o @@ -10,11 +10,16 @@ obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o obj-$(CONFIG_I2C_ELV) += i2c-elv.o obj-$(CONFIG_I2C_I801) += i2c-i801.o obj-$(CONFIG_I2C_I810) += i2c-i810.o +obj-$(CONFIG_I2C_IBM_IIC) += i2c-ibm_iic.o +obj-$(CONFIG_I2C_IOP3XX) += i2c-iop3xx.o obj-$(CONFIG_I2C_ISA) += i2c-isa.o +obj-$(CONFIG_I2C_ITE) += i2c-ite.o +obj-$(CONFIG_I2C_KEYWEST) += i2c-keywest.o obj-$(CONFIG_I2C_NFORCE2) += i2c-nforce2.o obj-$(CONFIG_I2C_PHILIPSPAR) += i2c-philips-par.o obj-$(CONFIG_I2C_PIIX4) += i2c-piix4.o obj-$(CONFIG_I2C_PROSAVAGE) += i2c-prosavage.o +obj-$(CONFIG_I2C_RPXLITE) += i2c-rpx.o obj-$(CONFIG_I2C_SAVAGE4) += i2c-savage4.o obj-$(CONFIG_I2C_SIS5595) += i2c-sis5595.o obj-$(CONFIG_I2C_SIS630) += i2c-sis630.o @@ -23,5 +28,5 @@ obj-$(CONFIG_I2C_VELLEMAN) += i2c-velleman.o obj-$(CONFIG_I2C_VIA) += i2c-via.o obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o obj-$(CONFIG_I2C_VOODOO3) += i2c-voodoo3.o -obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o obj-$(CONFIG_SCx200_ACB) += scx200_acb.o +obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o diff --git a/drivers/i2c/i2c-frodo.c b/drivers/i2c/busses/i2c-frodo.c similarity index 100% rename from drivers/i2c/i2c-frodo.c rename to drivers/i2c/busses/i2c-frodo.c diff --git a/drivers/i2c/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c similarity index 100% rename from drivers/i2c/i2c-ibm_iic.c rename to drivers/i2c/busses/i2c-ibm_iic.c diff --git a/drivers/i2c/i2c-ibm_iic.h b/drivers/i2c/busses/i2c-ibm_iic.h similarity index 100% rename from drivers/i2c/i2c-ibm_iic.h rename to drivers/i2c/busses/i2c-ibm_iic.h diff --git a/drivers/i2c/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c similarity index 100% rename from drivers/i2c/i2c-iop3xx.c rename to drivers/i2c/busses/i2c-iop3xx.c diff --git a/drivers/i2c/i2c-iop3xx.h b/drivers/i2c/busses/i2c-iop3xx.h similarity index 100% rename from drivers/i2c/i2c-iop3xx.h rename to drivers/i2c/busses/i2c-iop3xx.h diff --git a/drivers/i2c/i2c-adap-ite.c b/drivers/i2c/busses/i2c-ite.c similarity index 99% rename from drivers/i2c/i2c-adap-ite.c rename to drivers/i2c/busses/i2c-ite.c index 7cb14c874016b..36fcce366b427 100644 --- a/drivers/i2c/i2c-adap-ite.c +++ b/drivers/i2c/busses/i2c-ite.c @@ -45,7 +45,7 @@ #include #include #include -#include "i2c-ite.h" +#include "../i2c-ite.h" #define DEFAULT_BASE 0x14014030 #define ITE_IIC_IO_SIZE 0x40 diff --git a/drivers/i2c/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c similarity index 100% rename from drivers/i2c/i2c-keywest.c rename to drivers/i2c/busses/i2c-keywest.c diff --git a/drivers/i2c/i2c-keywest.h b/drivers/i2c/busses/i2c-keywest.h similarity index 100% rename from drivers/i2c/i2c-keywest.h rename to drivers/i2c/busses/i2c-keywest.h diff --git a/drivers/i2c/i2c-rpx.c b/drivers/i2c/busses/i2c-rpx.c similarity index 100% rename from drivers/i2c/i2c-rpx.c rename to drivers/i2c/busses/i2c-rpx.c -- 2.53.0