diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2014-09-12 08:11:59 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-13 12:01:57 -0400 |
commit | ea092455d713d28c0b74a2ebe022524025d97491 (patch) | |
tree | 33644044669966b84343bc875cecebd405934e16 | |
parent | fb57862ead652454ceeb659617404c5f13bc34b5 (diff) |
spi: dw-mid: remove Moorestown support
The support of the Moorestown was removed [1] from kernel long time ago. This
is just a follow up of that change.
[1] http://www.spinics.net/lists/platform-driver-x86/msg02948.html
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/spi/Kconfig | 2 | ||||
-rw-r--r-- | drivers/spi/spi-dw-mid.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 62e2242ad7e0..6343df87afb3 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
@@ -591,7 +591,7 @@ config SPI_DW_PCI | |||
591 | depends on SPI_DESIGNWARE && PCI | 591 | depends on SPI_DESIGNWARE && PCI |
592 | 592 | ||
593 | config SPI_DW_MID_DMA | 593 | config SPI_DW_MID_DMA |
594 | bool "DMA support for DW SPI controller on Intel Moorestown platform" | 594 | bool "DMA support for DW SPI controller on Intel MID platform" |
595 | depends on SPI_DW_PCI && INTEL_MID_DMAC | 595 | depends on SPI_DW_PCI && INTEL_MID_DMAC |
596 | 596 | ||
597 | config SPI_DW_MMIO | 597 | config SPI_DW_MMIO |
diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c index 0d88e4aab73e..deba3c459d68 100644 --- a/drivers/spi/spi-dw-mid.c +++ b/drivers/spi/spi-dw-mid.c | |||
@@ -50,11 +50,9 @@ static int mid_spi_dma_init(struct dw_spi *dws) | |||
50 | 50 | ||
51 | /* | 51 | /* |
52 | * Get pci device for DMA controller, currently it could only | 52 | * Get pci device for DMA controller, currently it could only |
53 | * be the DMA controller of either Moorestown or Medfield | 53 | * be the DMA controller of Medfield |
54 | */ | 54 | */ |
55 | dws->dmac = pci_get_device(PCI_VENDOR_ID_INTEL, 0x0813, NULL); | 55 | dws->dmac = pci_get_device(PCI_VENDOR_ID_INTEL, 0x0827, NULL); |
56 | if (!dws->dmac) | ||
57 | dws->dmac = pci_get_device(PCI_VENDOR_ID_INTEL, 0x0827, NULL); | ||
58 | 56 | ||
59 | dma_cap_zero(mask); | 57 | dma_cap_zero(mask); |
60 | dma_cap_set(DMA_SLAVE, mask); | 58 | dma_cap_set(DMA_SLAVE, mask); |
@@ -192,7 +190,7 @@ static struct dw_spi_dma_ops mid_dma_ops = { | |||
192 | }; | 190 | }; |
193 | #endif | 191 | #endif |
194 | 192 | ||
195 | /* Some specific info for SPI0 controller on Moorestown */ | 193 | /* Some specific info for SPI0 controller on Intel MID */ |
196 | 194 | ||
197 | /* HW info for MRST CLk Control Unit, one 32b reg */ | 195 | /* HW info for MRST CLk Control Unit, one 32b reg */ |
198 | #define MRST_SPI_CLK_BASE 100000000 /* 100m */ | 196 | #define MRST_SPI_CLK_BASE 100000000 /* 100m */ |