- Merge from linuxbios-lnxi (Linux Networx repository) up to public tree.

[coreboot.git] / src / southbridge / amd / amd8111 / amd8111_acpi.c

diff --git a/src/southbridge/amd/amd8111/amd8111_acpi.c b/src/southbridge/amd/amd8111/amd8111_acpi.c
index 38c3269b1f8411ace5fdb2b8fde5200e84da9932..209036adab2aea94d9511ab50719147a22ad7472 100644 (file)
--- a/src/southbridge/amd/amd8111/amd8111_acpi.c
+++ b/src/southbridge/amd/amd8111/amd8111_acpi.c
@@ -27,7 +27,7 @@ static int lsmbus_recv_byte(device_t dev)
        struct resource *res;
 
        device = dev->path.u.i2c.device;
-       res = find_resource(dev->bus->dev, 0x20);
+       res = find_resource(get_pbus_smbus(dev)->dev, 0x58);
        
        return do_smbus_recv_byte(res->base, device);
 }
@@ -38,7 +38,7 @@ static int lsmbus_send_byte(device_t dev, uint8_t val)
        struct resource *res;
 
        device = dev->path.u.i2c.device;
-       res = find_resource(dev->bus->dev, 0x20);
+       res = find_resource(get_pbus_smbus(dev)->dev, 0x58);
 
        return do_smbus_send_byte(res->base, device, val);
 }
@@ -50,7 +50,7 @@ static int lsmbus_read_byte(device_t dev, uint8_t address)
        struct resource *res;
 
        device = dev->path.u.i2c.device;
-       res = find_resource(dev->bus->dev, 0x20);
+       res = find_resource(get_pbus_smbus(dev)->dev, 0x58);
        
        return do_smbus_read_byte(res->base, device, address);
 }
@@ -61,7 +61,7 @@ static int lsmbus_write_byte(device_t dev, uint8_t address, uint8_t val)
        struct resource *res;
 
        device = dev->path.u.i2c.device;
-       res = find_resource(dev->bus->dev, 0x20);
+       res = find_resource(get_pbus_smbus(dev)->dev, 0x58);
        
        return do_smbus_write_byte(res->base, device, address, val);
 }
@@ -97,6 +97,7 @@ static void acpi_init(struct device *dev)
 
        
 #endif
+       /* power after power fail */
        on = MAINBOARD_POWER_ON_AFTER_POWER_FAIL;
        get_option(&on, "power_on_after_fail");
        byte = pci_read_config8(dev, PREVIOUS_POWER_STATE);
@@ -106,7 +107,7 @@ static void acpi_init(struct device *dev)
        }
        pci_write_config8(dev, PREVIOUS_POWER_STATE, byte);
        printk_info("set power %s after power fail\n", on?"on":"off");
-
+        
        /* Throttle the CPU speed down for testing */
        on = SLOW_CPU_OFF;
        get_option(&on, "slow_cpu");
@@ -166,6 +167,7 @@ static struct smbus_bus_operations lops_smbus_bus = {
        .read_byte  = lsmbus_read_byte,
        .write_byte = lsmbus_write_byte,
 };
+
 static struct pci_operations lops_pci = {
        .set_subsystem = lpci_set_subsystem,
 };