Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fbf5ba4 authored by Peer Chen's avatar Peer Chen Committed by Jeff Garzik
Browse files

[libata] Move some PCI IDs from sata_nv to ahci 



The content of memory map io of BAR5 have been change from MCP65 then
sata_nv can't work fine on the platform based on MCP65 and MCP67, so move
their IDs from sata_nv.c to ahci.c.

Signed-off-by: default avatarPeer Chen <pchen@nvidia.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 73720861

drivers/ata/ahci.c

+8 −0
Original line number Diff line number Diff line
@@ -402,6 +402,14 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(NVIDIA, 0x044d), board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x044e), board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x044f), board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x045c), board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x045d), board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x045e), board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x045f), board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x0550), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0551), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0552), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0553), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0554), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0555), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0556), board_ahci },		/* MCP67 */

drivers/ata/sata_nv.c

+0 −8
Original line number Diff line number Diff line
@@ -270,14 +270,6 @@ static const struct pci_device_id nv_pci_tbl[] = { 
	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA), GENERIC },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2), GENERIC },

	{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3), GENERIC },

	{ PCI_VDEVICE(NVIDIA, 0x045c), GENERIC }, /* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x045d), GENERIC }, /* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x045e), GENERIC }, /* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x045f), GENERIC }, /* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x0550), GENERIC }, /* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0551), GENERIC }, /* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0552), GENERIC }, /* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0553), GENERIC }, /* MCP67 */

	{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,

		PCI_ANY_ID, PCI_ANY_ID,

		PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },