From d1a95f3ff7896b59ce1b769cfef407b26fbfa2be Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 19 Apr 2012 12:42:50 -0700 Subject: [PATCH] 3.2-stable patches added patches: spi-topcliff-pch-support-new-device-lapis-semiconductor.patch --- queue-3.2/series | 1 + ...pport-new-device-lapis-semiconductor.patch | 72 +++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 queue-3.2/spi-topcliff-pch-support-new-device-lapis-semiconductor.patch diff --git a/queue-3.2/series b/queue-3.2/series index 0a5fac828f7..932c0f719e5 100644 --- a/queue-3.2/series +++ b/queue-3.2/series @@ -58,3 +58,4 @@ pch_gbe-do-not-abort-probe-on-bad-mac.patch pch_gbe-memory-corruption-calling-pch_gbe_validate_option.patch pch_dma-support-new-device-lapis-semiconductor-ml7831-ioh.patch spi-topcliff-pch-fix-wuninitialized-warning.patch +spi-topcliff-pch-support-new-device-lapis-semiconductor.patch diff --git a/queue-3.2/spi-topcliff-pch-support-new-device-lapis-semiconductor.patch b/queue-3.2/spi-topcliff-pch-support-new-device-lapis-semiconductor.patch new file mode 100644 index 00000000000..06a7f14641e --- /dev/null +++ b/queue-3.2/spi-topcliff-pch-support-new-device-lapis-semiconductor.patch @@ -0,0 +1,72 @@ +From 92b3a5c1bc3c7da1ae4675d014124f4a97ddb632 Mon Sep 17 00:00:00 2001 +From: Tomoya MORINAGA +Date: Fri, 28 Oct 2011 09:35:21 +0900 +Subject: spi-topcliff-pch: Support new device LAPIS Semiconductor + ML7831 IOH + +From: Tomoya MORINAGA + +commit 92b3a5c1bc3c7da1ae4675d014124f4a97ddb632 upstream. + +ML7831 is companion chip for Intel Atom E6xx series. + +Signed-off-by: Tomoya MORINAGA +Signed-off-by: Grant Likely +Signed-off-by: Tomoya MORINAGA +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/spi/Kconfig | 6 +++--- + drivers/spi/spi-topcliff-pch.c | 5 ++++- + 2 files changed, 7 insertions(+), 4 deletions(-) + +--- a/drivers/spi/Kconfig ++++ b/drivers/spi/Kconfig +@@ -346,14 +346,14 @@ config SPI_TI_SSP + 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. + +- 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" +--- 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 + +-/* 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_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 ++ * OKI SEMICONDUCTOR ML7831 IOH : 1ch + */ + #define PCH_SPI_MAX_DEV 2 + +@@ -218,6 +220,7 @@ static struct pci_device_id pch_spi_pcid + { 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, }, + { } + }; + -- 2.47.3