Commit 60693e5a authored by Shane Huang's avatar Shane Huang Committed by Linus Torvalds
Browse files

i2c-piix4: Fix SB700 PCI device ID 



We find that SB700 and SB800 use the same SMBus device ID as SB600, which is
0x4385, instead of the already submitted 0x4395.

Besides removing the wrong SB700 device ID, add SB800 support to kernel, by
renaming the PCI_DEVICE_ID_ATI_IXP600_SMBUS into
PCI_DEVICE_ID_ATI_SBX00_SMBUS.

Signed-off-by: default avatarShane Huang <shane.huang@amd.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4500371e

Documentation/i2c/busses/i2c-piix4

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Supported adapters: 
    Datasheet: Publicly available at the Intel website

  * ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges

    Datasheet: Only available via NDA from ServerWorks

  * ATI IXP200, IXP300, IXP400, SB600 and SB700 southbridges

  * ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges

    Datasheet: Not publicly available

  * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge

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

drivers/i2c/busses/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ config I2C_PIIX4 
	    ATI IXP400

	    ATI SB600

	    ATI SB700

	    ATI SB800

	    Serverworks OSB4

	    Serverworks CSB5

	    Serverworks CSB6

drivers/i2c/busses/i2c-piix4.c

+2 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
   Supports:

	Intel PIIX4, 440MX

	Serverworks OSB4, CSB5, CSB6, HT-1000

	ATI IXP200, IXP300, IXP400, SB600, SB700

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

	SMSC Victory66



   Note: we assume there can only be one device, with one SMBus interface.
@@ -397,9 +397,7 @@ static struct pci_device_id piix4_ids[] = { 
	  .driver_data = 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS),

	  .driver_data = 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SMBUS),

	  .driver_data = 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SMBUS),

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS),

	  .driver_data = 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4),

	  .driver_data = 0 },

include/linux/pci_ids.h

+1 −2
Original line number Diff line number Diff line
@@ -374,10 +374,9 @@ 
#define PCI_DEVICE_ID_ATI_IXP400_SATA   0x4379

#define PCI_DEVICE_ID_ATI_IXP400_SATA2	0x437a

#define PCI_DEVICE_ID_ATI_IXP600_SATA	0x4380

#define PCI_DEVICE_ID_ATI_IXP600_SMBUS	0x4385

#define PCI_DEVICE_ID_ATI_SBX00_SMBUS	0x4385

#define PCI_DEVICE_ID_ATI_IXP600_IDE	0x438c

#define PCI_DEVICE_ID_ATI_IXP700_SATA	0x4390

#define PCI_DEVICE_ID_ATI_IXP700_SMBUS	0x4395

#define PCI_DEVICE_ID_ATI_IXP700_IDE	0x439c



#define PCI_VENDOR_ID_VLSI		0x1004

CRA Git | Maintained and supported by SUSTech CRA and CCSE