Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / spi / spi-topcliff-pch.c

diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 99ec279bc46daaec1d9a9a4180e1923dcbae454d..2a6429d8c363e52b73430b9943716e273dc31438 100644 (file)
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -1,7 +1,7 @@
 /*
  * SPI bus driver for the Topcliff PCH used by Intel SoCs
  *
- * Copyright (C) 2010 OKI SEMICONDUCTOR Co., LTD.
+ * Copyright (C) 2011 LAPIS Semiconductor Co., Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -95,16 +95,18 @@
 #define PCH_CLOCK_HZ           50000000
 #define PCH_MAX_SPBR           1023
 
-/* Definition for ML7213 by OKI SEMICONDUCTOR */
+/* Definition for ML7213/ML7223/ML7831 by LAPIS 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
+ * LAPIS Semiconductor ML7213 IOH :    2ch
+ * LAPIS Semiconductor ML7223 IOH :    1ch
+ * LAPIS Semiconductor ML7831 IOH :    1ch
 */
 #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(ROHM, PCI_DEVICE_ID_ML7831_SPI), 1, },
        { }
 };
 
@@ -1753,4 +1756,4 @@ MODULE_PARM_DESC(use_dma,
                 "to use DMA for data transfers pass 1 else 0; default 1");
 
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Intel EG20T PCH/OKI SEMICONDUCTOR ML7xxx IOH SPI Driver");
+MODULE_DESCRIPTION("Intel EG20T PCH/LAPIS Semiconductor ML7xxx IOH SPI Driver");