Commit 5deab536 authored by Shane Huang's avatar Shane Huang Committed by Jeff Garzik
Browse files

ahci / atiixp / pci quirks: rename AMD SB900 into Hudson-2 



This patch renames the code name SB900 into Hudson-2

Signed-off-by: default avatarShane Huang <shane.huang@amd.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 726206f8

drivers/ata/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(ATI, 0x4395), board_ahci_sb700 }, /* ATI SB700/800 */



	/* AMD */

	{ PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD SB900 */

	{ PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD Hudson-2 */

	/* AMD is using RAID class only for ahci controllers */

	{ PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

	  PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci },

drivers/ata/pata_atiixp.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static const struct pci_device_id atiixp[] = { 
	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP400_IDE), },

	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP600_IDE), },

	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP700_IDE), },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_SB900_IDE), },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_HUDSON2_IDE), },



	{ },

};

drivers/ide/atiixp.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static const struct pci_device_id atiixp_pci_tbl[] = { 
	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP400_IDE), 0 },

	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP600_IDE), 1 },

	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP700_IDE), 0 },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_SB900_IDE), 0 },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_HUDSON2_IDE), 0 },

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);

drivers/pci/quirks.c

+3 −3
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82454NX, 


static void __devinit quirk_amd_ide_mode(struct pci_dev *pdev)

{

	/* set SBX00 SATA in IDE mode to AHCI mode */

	/* set SBX00/Hudson-2 SATA in IDE mode to AHCI mode */

	u8 tmp;



	pci_read_config_byte(pdev, PCI_CLASS_DEVICE, &tmp);
@@ -1028,8 +1028,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk 
DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_amd_ide_mode);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_amd_ide_mode);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_amd_ide_mode);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_SB900_SATA_IDE, quirk_amd_ide_mode);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_SB900_SATA_IDE, quirk_amd_ide_mode);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE, quirk_amd_ide_mode);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE, quirk_amd_ide_mode);



/*

 *	Serverworks CSB5 IDE does not fully support native mode

include/linux/pci_ids.h

+2 −4
Original line number Diff line number Diff line
@@ -379,9 +379,6 @@ 
#define PCI_DEVICE_ID_ATI_IXP600_IDE	0x438c

#define PCI_DEVICE_ID_ATI_IXP700_SATA	0x4390

#define PCI_DEVICE_ID_ATI_IXP700_IDE	0x439c

/* AMD SB Chipset */

#define PCI_DEVICE_ID_AMD_SB900_IDE	 0x780c

#define PCI_DEVICE_ID_AMD_SB900_SATA_IDE 0x7800



#define PCI_VENDOR_ID_VLSI		0x1004

#define PCI_DEVICE_ID_VLSI_82C592	0x0005
@@ -553,9 +550,10 @@ 
#define PCI_DEVICE_ID_AMD_CS5536_UDC    0x2096

#define PCI_DEVICE_ID_AMD_CS5536_UOC    0x2097

#define PCI_DEVICE_ID_AMD_CS5536_IDE    0x209A



#define PCI_DEVICE_ID_AMD_LX_VIDEO  0x2081

#define PCI_DEVICE_ID_AMD_LX_AES    0x2082

#define PCI_DEVICE_ID_AMD_HUDSON2_IDE		0x780c

#define PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE	0x7800



#define PCI_VENDOR_ID_TRIDENT		0x1023

#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX	0x2000