projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| d533cb26 GKH |
1 | From 591b6bb605785c12a21e8b07a08a277065b655a5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Andrey Korolyov <andrey@xdel.ru> | |
| 3 | Date: Thu, 10 Aug 2017 13:21:14 +0300 | |
| 4 | Subject: cs5536: add support for IDE controller variant | |
| 5 | ||
| 6 | From: Andrey Korolyov <andrey@xdel.ru> | |
| 7 | ||
| 8 | commit 591b6bb605785c12a21e8b07a08a277065b655a5 upstream. | |
| 9 | ||
| 10 | Several legacy devices such as Geode-based Cisco ASA appliances | |
| 11 | and DB800 development board do possess CS5536 IDE controller | |
| 12 | with different PCI id than existing one. Using pata_generic is | |
| 13 | not always feasible as at least DB800 requires MSR quirk from | |
| 14 | pata_cs5536 to be used with vendor firmware. | |
| 15 | ||
| 16 | Signed-off-by: Andrey Korolyov <andrey@xdel.ru> | |
| 17 | Signed-off-by: Tejun Heo <tj@kernel.org> | |
| 18 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 19 | ||
| 20 | --- | |
| 21 | drivers/ata/pata_amd.c | 1 + | |
| 22 | drivers/ata/pata_cs5536.c | 1 + | |
| 23 | include/linux/pci_ids.h | 1 + | |
| 24 | 3 files changed, 3 insertions(+) | |
| 25 | ||
| 26 | --- a/drivers/ata/pata_amd.c | |
| 27 | +++ b/drivers/ata/pata_amd.c | |
| 28 | @@ -616,6 +616,7 @@ static const struct pci_device_id amd[] | |
| 29 | { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE), 8 }, | |
| 30 | { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE), 8 }, | |
| 31 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_IDE), 9 }, | |
| 32 | + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_DEV_IDE), 9 }, | |
| 33 | ||
| 34 | { }, | |
| 35 | }; | |
| 36 | --- a/drivers/ata/pata_cs5536.c | |
| 37 | +++ b/drivers/ata/pata_cs5536.c | |
| 38 | @@ -289,6 +289,7 @@ static int cs5536_init_one(struct pci_de | |
| 39 | ||
| 40 | static const struct pci_device_id cs5536[] = { | |
| 41 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_IDE), }, | |
| 42 | + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_DEV_IDE), }, | |
| 43 | { }, | |
| 44 | }; | |
| 45 | ||
| 46 | --- a/include/linux/pci_ids.h | |
| 47 | +++ b/include/linux/pci_ids.h | |
| 48 | @@ -574,6 +574,7 @@ | |
| 49 | #define PCI_DEVICE_ID_AMD_CS5536_EHC 0x2095 | |
| 50 | #define PCI_DEVICE_ID_AMD_CS5536_UDC 0x2096 | |
| 51 | #define PCI_DEVICE_ID_AMD_CS5536_UOC 0x2097 | |
| 52 | +#define PCI_DEVICE_ID_AMD_CS5536_DEV_IDE 0x2092 | |
| 53 | #define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A | |
| 54 | #define PCI_DEVICE_ID_AMD_LX_VIDEO 0x2081 | |
| 55 | #define PCI_DEVICE_ID_AMD_LX_AES 0x2082 |