spi-topcliff-pch: Support new device LAPIS Semiconductor ML7831 IOH

BugLink: http://bugs.launchpad.net/bugs/987337

commit 92b3a5c1bc3c7da1ae4675d014124f4a97ddb632 upstream.

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>
Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 8ba4510..7587796 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -346,14 +346,14 @@ config SPI_TI_SSP
          serial port.
 
 config SPI_TOPCLIFF_PCH
          serial port.
 
 config SPI_TOPCLIFF_PCH

-       tristate "Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH SPI controller"
+       tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) SPI"

        depends on PCI
        help
          SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus
          used in some x86 embedded processors.
 
        depends on PCI
        help
          SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus
          used in some x86 embedded processors.
 

-         This driver also supports the ML7213, a companion chip for the
-         Atom E6xx series and compatible with the Intel EG20T PCH.
+         This driver also supports the ML7213/ML7223/ML7831, a companion chip
+         for the Atom E6xx series and compatible with the Intel EG20T PCH.

 
 config SPI_TXX9
        tristate "Toshiba TXx9 SPI controller"
 
 config SPI_TXX9
        tristate "Toshiba TXx9 SPI controller"

diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index ec50541..54b9d2e 100644 (file)
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -95,16 +95,18 @@
 #define PCH_CLOCK_HZ           50000000
 #define PCH_MAX_SPBR           1023
 
 #define PCH_CLOCK_HZ           50000000
 #define PCH_MAX_SPBR           1023
 

-/* Definition for ML7213 by OKI SEMICONDUCTOR */
+/* Definition for ML7213/ML7831 by OKI SEMICONDUCTOR */

 #define PCI_VENDOR_ID_ROHM             0x10DB
 #define PCI_DEVICE_ID_ML7213_SPI       0x802c
 #define PCI_DEVICE_ID_ML7223_SPI       0x800F
 #define PCI_VENDOR_ID_ROHM             0x10DB
 #define PCI_DEVICE_ID_ML7213_SPI       0x802c
 #define PCI_DEVICE_ID_ML7223_SPI       0x800F

+#define PCI_DEVICE_ID_ML7831_SPI       0x8816

 
 /*
  * Set the number of SPI instance max
  * Intel EG20T PCH :           1ch
  * OKI SEMICONDUCTOR ML7213 IOH :      2ch
  * OKI SEMICONDUCTOR ML7223 IOH :      1ch
 
 /*
  * Set the number of SPI instance max
  * Intel EG20T PCH :           1ch
  * OKI SEMICONDUCTOR ML7213 IOH :      2ch
  * OKI SEMICONDUCTOR ML7223 IOH :      1ch

+ * OKI SEMICONDUCTOR ML7831 IOH :      1ch

 */
 #define PCH_SPI_MAX_DEV                        2
 
 */
 #define PCH_SPI_MAX_DEV                        2
 

@@ -218,6 +220,7 @@ static struct pci_device_id pch_spi_pcidev_id[] = {
        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_GE_SPI),    1, },
        { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_SPI), 2, },
        { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_SPI), 1, },
        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_GE_SPI),    1, },
        { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_SPI), 2, },
        { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_SPI), 1, },

+       { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_SPI), 1, },

        { }
 };
 
        { }
 };