diff options
author | Jayachandran C <jayachandranc@netlogicmicro.com> | 2012-01-23 07:31:29 -0500 |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-02-24 16:25:58 -0500 |
commit | 3e1b76be0bf3e14b02882bd87af68d0469f0f660 (patch) | |
tree | ee206188e640b59dc192f8d40c444254de1c89c0 /drivers | |
parent | 401c3434c4d7f5619fd81b5ff9c38f54f52346a0 (diff) |
i2c: Move I2C_EG20T option to the right place.
Move Kconfig option for I2C_EG20T to the correct position and keep
the options sorted.
Also, use tabs in Makefile and move the I2C_EG20T entry to its
position.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/busses/Kconfig | 30 | ||||
-rw-r--r-- | drivers/i2c/busses/Makefile | 2 |
2 files changed, 16 insertions, 16 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 7726c792c807..e99bfa86ba71 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
@@ -369,6 +369,21 @@ config I2C_DESIGNWARE_PCI | |||
369 | This driver can also be built as a module. If so, the module | 369 | This driver can also be built as a module. If so, the module |
370 | will be called i2c-designware-pci. | 370 | will be called i2c-designware-pci. |
371 | 371 | ||
372 | config I2C_EG20T | ||
373 | tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) I2C" | ||
374 | depends on PCI | ||
375 | help | ||
376 | This driver is for PCH(Platform controller Hub) I2C of EG20T which | ||
377 | is an IOH(Input/Output Hub) for x86 embedded processor. | ||
378 | This driver can access PCH I2C bus device. | ||
379 | |||
380 | This driver also can be used for LAPIS Semiconductor IOH(Input/ | ||
381 | Output Hub), ML7213, ML7223 and ML7831. | ||
382 | ML7213 IOH is for IVI(In-Vehicle Infotainment) use, ML7223 IOH is | ||
383 | for MP(Media Phone) use and ML7831 IOH is for general purpose use. | ||
384 | ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series. | ||
385 | ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH. | ||
386 | |||
372 | config I2C_GPIO | 387 | config I2C_GPIO |
373 | tristate "GPIO-based bitbanging I2C" | 388 | tristate "GPIO-based bitbanging I2C" |
374 | depends on GENERIC_GPIO | 389 | depends on GENERIC_GPIO |
@@ -691,21 +706,6 @@ config I2C_XLR | |||
691 | This driver can also be built as a module. If so, the module | 706 | This driver can also be built as a module. If so, the module |
692 | will be called i2c-xlr. | 707 | will be called i2c-xlr. |
693 | 708 | ||
694 | config I2C_EG20T | ||
695 | tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) I2C" | ||
696 | depends on PCI | ||
697 | help | ||
698 | This driver is for PCH(Platform controller Hub) I2C of EG20T which | ||
699 | is an IOH(Input/Output Hub) for x86 embedded processor. | ||
700 | This driver can access PCH I2C bus device. | ||
701 | |||
702 | This driver also can be used for LAPIS Semiconductor IOH(Input/ | ||
703 | Output Hub), ML7213, ML7223 and ML7831. | ||
704 | ML7213 IOH is for IVI(In-Vehicle Infotainment) use, ML7223 IOH is | ||
705 | for MP(Media Phone) use and ML7831 IOH is for general purpose use. | ||
706 | ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series. | ||
707 | ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH. | ||
708 | |||
709 | comment "External I2C/SMBus adapter drivers" | 709 | comment "External I2C/SMBus adapter drivers" |
710 | 710 | ||
711 | config I2C_DIOLAN_U2C | 711 | config I2C_DIOLAN_U2C |
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index a0c644d0d780..8f9e7b6677e1 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile | |||
@@ -37,6 +37,7 @@ obj-$(CONFIG_I2C_DESIGNWARE_PLATFORM) += i2c-designware-platform.o | |||
37 | i2c-designware-platform-objs := i2c-designware-platdrv.o i2c-designware-core.o | 37 | i2c-designware-platform-objs := i2c-designware-platdrv.o i2c-designware-core.o |
38 | obj-$(CONFIG_I2C_DESIGNWARE_PCI) += i2c-designware-pci.o | 38 | obj-$(CONFIG_I2C_DESIGNWARE_PCI) += i2c-designware-pci.o |
39 | i2c-designware-pci-objs := i2c-designware-pcidrv.o i2c-designware-core.o | 39 | i2c-designware-pci-objs := i2c-designware-pcidrv.o i2c-designware-core.o |
40 | obj-$(CONFIG_I2C_EG20T) += i2c-eg20t.o | ||
40 | obj-$(CONFIG_I2C_GPIO) += i2c-gpio.o | 41 | obj-$(CONFIG_I2C_GPIO) += i2c-gpio.o |
41 | obj-$(CONFIG_I2C_HIGHLANDER) += i2c-highlander.o | 42 | obj-$(CONFIG_I2C_HIGHLANDER) += i2c-highlander.o |
42 | obj-$(CONFIG_I2C_IBM_IIC) += i2c-ibm_iic.o | 43 | obj-$(CONFIG_I2C_IBM_IIC) += i2c-ibm_iic.o |
@@ -69,7 +70,6 @@ obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o | |||
69 | obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o | 70 | obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o |
70 | obj-$(CONFIG_I2C_XILINX) += i2c-xiic.o | 71 | obj-$(CONFIG_I2C_XILINX) += i2c-xiic.o |
71 | obj-$(CONFIG_I2C_XLR) += i2c-xlr.o | 72 | obj-$(CONFIG_I2C_XLR) += i2c-xlr.o |
72 | obj-$(CONFIG_I2C_EG20T) += i2c-eg20t.o | ||
73 | 73 | ||
74 | # External I2C/SMBus adapter drivers | 74 | # External I2C/SMBus adapter drivers |
75 | obj-$(CONFIG_I2C_DIOLAN_U2C) += i2c-diolan-u2c.o | 75 | obj-$(CONFIG_I2C_DIOLAN_U2C) += i2c-diolan-u2c.o |