From: Greg Kroah-Hartman Date: Fri, 7 Sep 2018 10:58:56 +0000 (+0200) Subject: drop 4.9 spi patch X-Git-Tag: v4.18.7~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62f7da80c47b6bbdad963e022708bf04ad5e78bd;p=thirdparty%2Fkernel%2Fstable-queue.git drop 4.9 spi patch --- diff --git a/queue-4.9/series b/queue-4.9/series index ba6408bb95f..280e12b1b6f 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -2,7 +2,6 @@ net-6lowpan-fix-reserved-space-for-single-frames.patch net-mac802154-tx-expand-tailroom-if-necessary.patch 9p-net-fix-zero-copy-path-in-the-9p-virtio-transport.patch spi-davinci-fix-a-null-pointer-dereference.patch -spi-pxa2xx-add-support-for-intel-ice-lake.patch spi-spi-fsl-dspi-fix-imprecise-abort-on-vf500-during-probe.patch drm-i915-userptr-reject-zero-user_size.patch libertas-fix-suspend-and-resume-for-sdio-connected-cards.patch diff --git a/queue-4.9/spi-pxa2xx-add-support-for-intel-ice-lake.patch b/queue-4.9/spi-pxa2xx-add-support-for-intel-ice-lake.patch deleted file mode 100644 index d8ad83f33cd..00000000000 --- a/queue-4.9/spi-pxa2xx-add-support-for-intel-ice-lake.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 22d71a5097ec7059b6cbbee678a4f88484695941 Mon Sep 17 00:00:00 2001 -From: Mika Westerberg -Date: Thu, 28 Jun 2018 13:52:23 +0300 -Subject: spi: pxa2xx: Add support for Intel Ice Lake - -From: Mika Westerberg - -commit 22d71a5097ec7059b6cbbee678a4f88484695941 upstream. - -Intel Ice Lake SPI host controller follows the Intel Cannon Lake but the -PCI IDs are different. Add the new PCI IDs to the driver supported -devices list. - -Signed-off-by: Mika Westerberg -Signed-off-by: Jarkko Nikula -Signed-off-by: Mark Brown -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/spi/spi-pxa2xx.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/spi/spi-pxa2xx.c -+++ b/drivers/spi/spi-pxa2xx.c -@@ -1462,6 +1462,10 @@ static const struct pci_device_id pxa2xx - { PCI_VDEVICE(INTEL, 0x31c2), LPSS_BXT_SSP }, - { PCI_VDEVICE(INTEL, 0x31c4), LPSS_BXT_SSP }, - { PCI_VDEVICE(INTEL, 0x31c6), LPSS_BXT_SSP }, -+ /* ICL-LP */ -+ { PCI_VDEVICE(INTEL, 0x34aa), LPSS_CNL_SSP }, -+ { PCI_VDEVICE(INTEL, 0x34ab), LPSS_CNL_SSP }, -+ { PCI_VDEVICE(INTEL, 0x34fb), LPSS_CNL_SSP }, - /* APL */ - { PCI_VDEVICE(INTEL, 0x5ac2), LPSS_BXT_SSP }, - { PCI_VDEVICE(INTEL, 0x5ac4), LPSS_BXT_SSP },