3.15-stable patches

added patches:
	ahci-add-device-id-for-highpoint-rocketraid-642l.patch
	ahci-add-pci-id-for-marvell-88se91a0-sata-controller.patch

diff --git a/queue-3.15/ahci-add-device-id-for-highpoint-rocketraid-642l.patch b/queue-3.15/ahci-add-device-id-for-highpoint-rocketraid-642l.patch
new file mode 100644 (file)
index 0000000..74aed3c
--- /dev/null
+++ b/queue-3.15/ahci-add-device-id-for-highpoint-rocketraid-642l.patch
@@ -0,0 +1,39 @@
+From d251836508fb26cd1a22b41381739835ee23728d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Carretero?= <cJ-ko@zougloub.eu>
+Date: Tue, 3 Jun 2014 14:56:25 -0400
+Subject: ahci: Add Device ID for HighPoint RocketRaid 642L
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Carretero?= <cJ-ko@zougloub.eu>
+
+commit d251836508fb26cd1a22b41381739835ee23728d upstream.
+
+This device normally comes with a proprietary driver, using a web GUI
+to configure RAID:
+ http://www.highpoint-tech.com/USA_new/series_rr600-download.htm
+But thankfully it also works out of the box with the AHCI driver,
+being just a Marvell 88SE9235.
+
+Devices 640L, 644L, 644LS should also be supported but not tested here.
+
+Signed-off-by: Jérôme Carretero <cJ-ko@zougloub.eu>
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/ata/ahci.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -449,6 +449,8 @@ static const struct pci_device_id ahci_p
+         .driver_data = board_ahci_yes_fbs },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230),
+         .driver_data = board_ahci_yes_fbs },
++      { PCI_DEVICE(PCI_VENDOR_ID_TTI, 0x0642),
++        .driver_data = board_ahci_yes_fbs },
+ 
+       /* Promise */
+       { PCI_VDEVICE(PROMISE, 0x3f20), board_ahci },   /* PDC42819 */

diff --git a/queue-3.15/ahci-add-pci-id-for-marvell-88se91a0-sata-controller.patch b/queue-3.15/ahci-add-pci-id-for-marvell-88se91a0-sata-controller.patch
new file mode 100644 (file)
index 0000000..3646e05
--- /dev/null
+++ b/queue-3.15/ahci-add-pci-id-for-marvell-88se91a0-sata-controller.patch
@@ -0,0 +1,34 @@
+From 754a292fe6b08196cb135c03b404444e17de520a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20Schr=C3=A4gle?= <ajs124.ajs124@gmail.com>
+Date: Sat, 24 May 2014 16:35:43 +0200
+Subject: ahci: add PCI ID for Marvell 88SE91A0 SATA Controller
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: =?UTF-8?q?Andreas=20Schr=C3=A4gle?= <ajs124.ajs124@gmail.com>
+
+commit 754a292fe6b08196cb135c03b404444e17de520a upstream.
+
+Add support for Marvell Technology Group Ltd. 88SE91A0 SATA 6Gb/s
+Controller by adding its PCI ID.
+
+Signed-off-by: Andreas Schrägle <ajs124.ajs124@gmail.com>
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/ata/ahci.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -445,6 +445,8 @@ static const struct pci_device_id ahci_p
+         .driver_data = board_ahci_yes_fbs },                  /* 88se9172 */
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192),
+         .driver_data = board_ahci_yes_fbs },                  /* 88se9172 on some Gigabyte */
++      { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a0),
++        .driver_data = board_ahci_yes_fbs },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3),
+         .driver_data = board_ahci_yes_fbs },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230),

diff --git a/queue-3.15/series b/queue-3.15/series
index ff9cf85970b2d297514a0d22b6dcc18861a0e6ef..90e1a8fb264891c2db652219854c7b805b2c957c 100644 (file)
--- a/queue-3.15/series
+++ b/queue-3.15/series
@@ -8,3 +8,5 @@ mei-me-read-h_csr-after-asserting-reset.patch
 rtl28xxu-add-1b80-d395-peak-dvb-t-usb.patch
 rtl28xxu-add-sveon-stv20.patch
 rtl28xxu-add-sveon-stv27.patch
+ahci-add-device-id-for-highpoint-rocketraid-642l.patch
+ahci-add-pci-id-for-marvell-88se91a0-sata-controller.patch