1 files changed, 31 insertions, 10 deletions

diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index d05ad590af29..a028617b8f13 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -231,11 +231,11 @@ static int piix4_setup(struct pci_dev *PIIX4_dev,
 }
 
 static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
-                             const struct pci_device_id *id)
+                             const struct pci_device_id *id, u8 aux)
 {
         unsigned short piix4_smba;
         unsigned short smba_idx = 0xcd6;
-        u8 smba_en_lo, smba_en_hi, i2ccfg, i2ccfg_offset = 0x10, smb_en = 0x2c;
+        u8 smba_en_lo, smba_en_hi, i2ccfg, i2ccfg_offset = 0x10, smb_en;
 
         /* SB800 and later SMBus does not support forcing address */
         if (force || force_addr) {
@@ -245,6 +245,8 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
         }
 
         /* Determine the address of the SMBus areas */
+        smb_en = (aux) ? 0x28 : 0x2c;
+
         if (!request_region(smba_idx, 2, "smba_idx")) {
                 dev_err(&PIIX4_dev->dev, "SMBus base address index region "
                         "0x%x already in use!\n", smba_idx);
@@ -272,6 +274,13 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
                 return -EBUSY;
         }
 
+        /* Aux SMBus does not support IRQ information */
+        if (aux) {
+                dev_info(&PIIX4_dev->dev,
+                         "SMBus Host Controller at 0x%x\n", piix4_smba);
+                return piix4_smba;
+        }
+
         /* Request the SMBus I2C bus config region */
         if (!request_region(piix4_smba + i2ccfg_offset, 1, "i2ccfg")) {
                 dev_err(&PIIX4_dev->dev, "SMBus I2C bus config region "
@@ -597,7 +606,7 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
              dev->revision >= 0x40) ||
             dev->vendor == PCI_VENDOR_ID_AMD)
                 /* base address location etc changed in SB800 */
-                retval = piix4_setup_sb800(dev, id);
+                retval = piix4_setup_sb800(dev, id, 0);
         else
                 retval = piix4_setup(dev, id);
 
@@ -611,17 +620,29 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 return retval;
 
         /* Check for auxiliary SMBus on some AMD chipsets */
+        retval = -ENODEV;
+
         if (dev->vendor == PCI_VENDOR_ID_ATI &&
-            dev->device == PCI_DEVICE_ID_ATI_SBX00_SMBUS &&
-            dev->revision < 0x40) {
-                retval = piix4_setup_aux(dev, id, 0x58);
-                if (retval > 0) {
-                        /* Try to add the aux adapter if it exists,
-                         * piix4_add_adapter will clean up if this fails */
-                        piix4_add_adapter(dev, retval, &piix4_aux_adapter);
+            dev->device == PCI_DEVICE_ID_ATI_SBX00_SMBUS) {
+                if (dev->revision < 0x40) {
+                        retval = piix4_setup_aux(dev, id, 0x58);
+                } else {
+                        /* SB800 added aux bus too */
+                        retval = piix4_setup_sb800(dev, id, 1);
                 }
         }
 
+        if (dev->vendor == PCI_VENDOR_ID_AMD &&
+            dev->device == PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) {
+                retval = piix4_setup_sb800(dev, id, 1);
+        }
+
+        if (retval > 0) {
+                /* Try to add the aux adapter if it exists,
+                 * piix4_add_adapter will clean up if this fails */
+                piix4_add_adapter(dev, retval, &piix4_aux_adapter);
+        }
+
         return 0;
 }