Commit b1267d60 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/shane-amd-ahci-i2c' into next 

* pci/shane-amd-ahci-i2c:
  i2c-piix4: Add AMD CZ SMBus device ID
  ahci: Add AMD CZ SATA device ID
  PCI: Put Hudson-2 device IDs together
parents 278934bd b996ac90

Documentation/i2c/busses/i2c-piix4

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Supported adapters: 
  * AMD SP5100 (SB700 derivative found on some server mainboards)

    Datasheet: Publicly available at the AMD website

    http://support.amd.com/us/Embedded_TechDocs/44413.pdf

  * AMD Hudson-2

  * AMD Hudson-2, CZ

    Datasheet: Not publicly available

  * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge

    Datasheet: Publicly available at the SMSC website http://www.smsc.com

drivers/ata/ahci.c

+1 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 


	/* AMD */

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

	{ PCI_VDEVICE(AMD, 0x7900), board_ahci }, /* AMD CZ */

	/* 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/i2c/busses/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ config I2C_PIIX4 
	    ATI SB700/SP5100

	    ATI SB800

	    AMD Hudson-2

	    AMD CZ

	    Serverworks OSB4

	    Serverworks CSB5

	    Serverworks CSB6

drivers/i2c/busses/i2c-piix4.c

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
	Intel PIIX4, 440MX

	Serverworks OSB4, CSB5, CSB6, HT-1000, HT-1100

	ATI IXP200, IXP300, IXP400, SB600, SB700/SP5100, SB800

	AMD Hudson-2

	AMD Hudson-2, CZ

	SMSC Victory66



   Note: we assume there can only be one device, with one or more
@@ -522,6 +522,7 @@ static DEFINE_PCI_DEVICE_TABLE(piix4_ids) = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x790b) },

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,

		     PCI_DEVICE_ID_SERVERWORKS_OSB4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,

drivers/pci/quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -1022,6 +1022,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk 
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_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);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x7900, quirk_amd_ide_mode);

DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD, 0x7900, quirk_amd_ide_mode);



/*

 *	Serverworks CSB5 IDE does not fully support native mode