From b56dae20cb81a631165368c1c913f9ccad14d631 Mon Sep 17 00:00:00 2001 From: Leonard Mai Date: Tue, 22 Nov 2011 11:46:57 -0800 Subject: [PATCH] dw_spi_pci: add spi1 probing support for cloverview BZ: 15092 Cloverview SOC use different PCI Device ID for SPIs hence existing SPI driver won't be initialized on Cloverview SOC. This patch adds SPI1 probing support for enabling Cloverview SOC. Also, 0x0800 is the PCI device ID for SPI controller 1 on Penwell (not 0) hence corrected the comment. Change-Id: Ie0db4da6cf4f72f1ddb0ae4f53f029eec44f0f0d Signed-off-by: Leonard D Mai Reviewed-by: Pierre Tardy Tested-by: Siva Prasath Ponnusamy Reviewed-on: http://android.intel.com:8080/25028 Reviewed-by: Gross, Mark Tested-by: Gross, Mark --- drivers/spi/dw_spi_pci.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/spi/dw_spi_pci.c b/drivers/spi/dw_spi_pci.c index ea0337d..7d7fffb 100644 --- a/drivers/spi/dw_spi_pci.c +++ b/drivers/spi/dw_spi_pci.c @@ -80,11 +80,9 @@ static int __devinit spi_pci_probe(struct pci_dev *pdev, * Specific handling for Intel MID paltforms, like dma setup, * clock rate, FIFO depth. */ - if (pdev->device == 0x0800) { - ret = spi_dw_mid_init(dws); - if (ret) - goto err_unmap; - } + ret = spi_dw_mid_init(dws); + if (ret) + goto err_unmap; ret = spi_dw_add_host(dws); if (ret) @@ -200,8 +198,11 @@ static int spi_dw_pci_runtime_idle(struct device *dev) #endif static const struct pci_device_id pci_ids[] __devinitdata = { - /* Intel Moorestown platform SPI controller 0 */ + /* Intel Moorestown platform SPI controller 1 */ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) }, + + /* Intel Cloverview SPI controller 1 */ + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x08E1) }, {}, }; static const struct dev_pm_ops dw_spi_pm_ops = { -- 2.7.4