tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Shane Huang <shane.huang@amd.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Shane Huang and committed by
Linus Torvalds 60693e5a 4500371e

+5 -7
+1 -1
Documentation/i2c/busses/i2c-piix4
··· 6 6 Datasheet: Publicly available at the Intel website 7 7 * ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges 8 8 Datasheet: Only available via NDA from ServerWorks 9 - * ATI IXP200, IXP300, IXP400, SB600 and SB700 southbridges 9 + * ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges 10 10 Datasheet: Not publicly available 11 11 * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge 12 12 Datasheet: Publicly available at the SMSC website http://www.smsc.com
+1
drivers/i2c/busses/Kconfig
··· 208 208 ATI IXP400 209 209 ATI SB600 210 210 ATI SB700 211 + ATI SB800 211 212 Serverworks OSB4 212 213 Serverworks CSB5 213 214 Serverworks CSB6
+2 -4
drivers/i2c/busses/i2c-piix4.c
··· 23 23 Supports: 24 24 Intel PIIX4, 440MX 25 25 Serverworks OSB4, CSB5, CSB6, HT-1000 26 - ATI IXP200, IXP300, IXP400, SB600, SB700 26 + ATI IXP200, IXP300, IXP400, SB600, SB700, SB800 27 27 SMSC Victory66 28 28 29 29 Note: we assume there can only be one device, with one SMBus interface. ··· 397 397 .driver_data = 0 }, 398 398 { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS), 399 399 .driver_data = 0 }, 400 - { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SMBUS), 401 - .driver_data = 0 }, 402 - { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SMBUS), 400 + { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS), 403 401 .driver_data = 0 }, 404 402 { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4), 405 403 .driver_data = 0 },
+1 -2
include/linux/pci_ids.h
··· 374 374 #define PCI_DEVICE_ID_ATI_IXP400_SATA 0x4379 375 375 #define PCI_DEVICE_ID_ATI_IXP400_SATA2 0x437a 376 376 #define PCI_DEVICE_ID_ATI_IXP600_SATA 0x4380 377 - #define PCI_DEVICE_ID_ATI_IXP600_SMBUS 0x4385 377 + #define PCI_DEVICE_ID_ATI_SBX00_SMBUS 0x4385 378 378 #define PCI_DEVICE_ID_ATI_IXP600_IDE 0x438c 379 379 #define PCI_DEVICE_ID_ATI_IXP700_SATA 0x4390 380 - #define PCI_DEVICE_ID_ATI_IXP700_SMBUS 0x4395 381 380 #define PCI_DEVICE_ID_ATI_IXP700_IDE 0x439c 382 381 383 382 #define PCI_VENDOR_ID_VLSI 0x1004