diff options
| author | Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com> | 2011-10-27 20:23:32 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-12-12 15:40:15 -0500 |
| commit | 868fea0507308b6548bba7debe5f5c2d5ca47fca (patch) | |
| tree | f36783145de38ceeb3ac29bfb3f2056819aa1301 | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
pch_gpio: Support new device LAPIS Semiconductor ML7831 IOH
ML7831 is companion chip for Intel Atom E6xx series.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -rw-r--r-- | drivers/gpio/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/gpio/gpio-pch.c | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 8482a23887dc..4e04157a3683 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig | |||
| @@ -387,7 +387,7 @@ config GPIO_LANGWELL | |||
| 387 | Say Y here to support Intel Langwell/Penwell GPIO. | 387 | Say Y here to support Intel Langwell/Penwell GPIO. |
| 388 | 388 | ||
| 389 | config GPIO_PCH | 389 | config GPIO_PCH |
| 390 | tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GPIO" | 390 | tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7223/ML7831) GPIO" |
| 391 | depends on PCI && X86 | 391 | depends on PCI && X86 |
| 392 | select GENERIC_IRQ_CHIP | 392 | select GENERIC_IRQ_CHIP |
| 393 | help | 393 | help |
| @@ -395,11 +395,12 @@ config GPIO_PCH | |||
| 395 | which is an IOH(Input/Output Hub) for x86 embedded processor. | 395 | which is an IOH(Input/Output Hub) for x86 embedded processor. |
| 396 | This driver can access PCH GPIO device. | 396 | This driver can access PCH GPIO device. |
| 397 | 397 | ||
| 398 | This driver also can be used for OKI SEMICONDUCTOR IOH(Input/ | 398 | This driver also can be used for LAPIS Semiconductor IOH(Input/ |
| 399 | Output Hub), ML7223. | 399 | Output Hub), ML7223 and ML7831. |
| 400 | ML7223 IOH is for MP(Media Phone) use. | 400 | ML7223 IOH is for MP(Media Phone) use. |
| 401 | ML7223 is companion chip for Intel Atom E6xx series. | 401 | ML7831 IOH is for general purpose use. |
| 402 | ML7223 is completely compatible for Intel EG20T PCH. | 402 | ML7223/ML7831 is companion chip for Intel Atom E6xx series. |
| 403 | ML7223/ML7831 is completely compatible for Intel EG20T PCH. | ||
| 403 | 404 | ||
| 404 | config GPIO_ML_IOH | 405 | config GPIO_ML_IOH |
| 405 | tristate "OKI SEMICONDUCTOR ML7213 IOH GPIO support" | 406 | tristate "OKI SEMICONDUCTOR ML7213 IOH GPIO support" |
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c index a6008e123d04..eb574f2c5a92 100644 --- a/drivers/gpio/gpio-pch.c +++ b/drivers/gpio/gpio-pch.c | |||
| @@ -524,6 +524,7 @@ static DEFINE_PCI_DEVICE_TABLE(pch_gpio_pcidev_id) = { | |||
| 524 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803) }, | 524 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803) }, |
| 525 | { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014) }, | 525 | { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014) }, |
| 526 | { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8043) }, | 526 | { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8043) }, |
| 527 | { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8803) }, | ||
| 527 | { 0, } | 528 | { 0, } |
| 528 | }; | 529 | }; |
| 529 | MODULE_DEVICE_TABLE(pci, pch_gpio_pcidev_id); | 530 | MODULE_DEVICE_TABLE(pci, pch_gpio_pcidev_id); |
