[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-ti33x-psp-3.2 / 3.2.16 / 0060-spi-topcliff-pch-Support-new-device-LAPIS-Semiconduc.patch
1 From 743c46c92827cc3cd7bd1fa7b0e9e7ca84e7463a Mon Sep 17 00:00:00 2001
2 From: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>
3 Date: Fri, 28 Oct 2011 09:35:21 +0900
4 Subject: [PATCH 60/68] spi-topcliff-pch: Support new device LAPIS
5 Semiconductor ML7831 IOH
7 commit 92b3a5c1bc3c7da1ae4675d014124f4a97ddb632 upstream.
9 ML7831 is companion chip for Intel Atom E6xx series.
11 Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>
12 Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
13 Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com>
14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
15 ---
16 drivers/spi/Kconfig | 6 +++---
17 drivers/spi/spi-topcliff-pch.c | 5 ++++-
18 2 files changed, 7 insertions(+), 4 deletions(-)
20 diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
21 index 8ba4510..7587796 100644
22 --- a/drivers/spi/Kconfig
23 +++ b/drivers/spi/Kconfig
24 @@ -346,14 +346,14 @@ config SPI_TI_SSP
25 serial port.
27 config SPI_TOPCLIFF_PCH
28 - tristate "Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH SPI controller"
29 + tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) SPI"
30 depends on PCI
31 help
32 SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus
33 used in some x86 embedded processors.
35 - This driver also supports the ML7213, a companion chip for the
36 - Atom E6xx series and compatible with the Intel EG20T PCH.
37 + This driver also supports the ML7213/ML7223/ML7831, a companion chip
38 + for the Atom E6xx series and compatible with the Intel EG20T PCH.
40 config SPI_TXX9
41 tristate "Toshiba TXx9 SPI controller"
42 diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
43 index ec50541..54b9d2e 100644
44 --- a/drivers/spi/spi-topcliff-pch.c
45 +++ b/drivers/spi/spi-topcliff-pch.c
46 @@ -95,16 +95,18 @@
47 #define PCH_CLOCK_HZ 50000000
48 #define PCH_MAX_SPBR 1023
50 -/* Definition for ML7213 by OKI SEMICONDUCTOR */
51 +/* Definition for ML7213/ML7831 by OKI SEMICONDUCTOR */
52 #define PCI_VENDOR_ID_ROHM 0x10DB
53 #define PCI_DEVICE_ID_ML7213_SPI 0x802c
54 #define PCI_DEVICE_ID_ML7223_SPI 0x800F
55 +#define PCI_DEVICE_ID_ML7831_SPI 0x8816
57 /*
58 * Set the number of SPI instance max
59 * Intel EG20T PCH : 1ch
60 * OKI SEMICONDUCTOR ML7213 IOH : 2ch
61 * OKI SEMICONDUCTOR ML7223 IOH : 1ch
62 + * OKI SEMICONDUCTOR ML7831 IOH : 1ch
63 */
64 #define PCH_SPI_MAX_DEV 2
66 @@ -218,6 +220,7 @@ static struct pci_device_id pch_spi_pcidev_id[] = {
67 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_GE_SPI), 1, },
68 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_SPI), 2, },
69 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_SPI), 1, },
70 + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_SPI), 1, },
71 { }
72 };
74 --
75 1.7.10