X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fsouthbridge%2Fnvidia%2Fck804%2Fck804_smbus.c;h=9b51712db56eb84607595e78b866e637145d5219;hb=8af6d5574ba6d9ea847b27ae582396240b3e8d41;hp=d86dbbaed6adc4ce4627843a35201ba33274e3ef;hpb=f1cf1f7c3aba660e4a174e966c4ef366d908565c;p=coreboot.git

diff --git a/src/southbridge/nvidia/ck804/ck804_smbus.c b/src/southbridge/nvidia/ck804/ck804_smbus.c
index d86dbbaed..9b51712db 100644
--- a/src/southbridge/nvidia/ck804/ck804_smbus.c
+++ b/src/southbridge/nvidia/ck804/ck804_smbus.c
@@ -1,7 +1,23 @@
 /*
- * Copyright 2004 Tyan Computer
- *  by yhlu@tyan.com
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2004 Tyan Computer
+ * Written by Yinghai Lu <yhlu@tyan.com> for Tyan Computer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
+
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
@@ -15,88 +31,90 @@
 
 static int lsmbus_recv_byte(device_t dev)
 {
-        unsigned device;
-        struct resource *res;
+	unsigned device;
+	struct resource *res;
 	struct bus *pbus;
 
-        device = dev->path.u.i2c.device;
+	device = dev->path.i2c.device;
 	pbus = get_pbus_smbus(dev);
 
-        res = find_resource(pbus->dev, 0x20 + (pbus->link * 4));
+	res = find_resource(pbus->dev, 0x20 + (pbus->link_num * 4));
 
-        return do_smbus_recv_byte(res->base, device);
+	return do_smbus_recv_byte(res->base, device);
 }
-        
+
 static int lsmbus_send_byte(device_t dev, uint8_t val)
 {
-        unsigned device;
-        struct resource *res;
-        struct bus *pbus;
+	unsigned device;
+	struct resource *res;
+	struct bus *pbus;
 
-        device = dev->path.u.i2c.device;
-        pbus = get_pbus_smbus(dev);
+	device = dev->path.i2c.device;
+	pbus = get_pbus_smbus(dev);
 
-        res = find_resource(pbus->dev, 0x20 + (pbus->link * 4));
+	res = find_resource(pbus->dev, 0x20 + (pbus->link_num * 4));
 
-        return do_smbus_send_byte(res->base, device, val);
+	return do_smbus_send_byte(res->base, device, val);
 }
 
 static int lsmbus_read_byte(device_t dev, uint8_t address)
 {
-        unsigned device;
-        struct resource *res;
-        struct bus *pbus;
+	unsigned device;
+	struct resource *res;
+	struct bus *pbus;
 
-        device = dev->path.u.i2c.device;
-        pbus = get_pbus_smbus(dev);
+	device = dev->path.i2c.device;
+	pbus = get_pbus_smbus(dev);
 
-        res = find_resource(pbus->dev, 0x20 + (pbus->link * 4));
+	res = find_resource(pbus->dev, 0x20 + (pbus->link_num * 4));
 
-        return do_smbus_read_byte(res->base, device, address);
+	return do_smbus_read_byte(res->base, device, address);
 }
 
 static int lsmbus_write_byte(device_t dev, uint8_t address, uint8_t val)
 {
-        unsigned device;
-        struct resource *res;
-        struct bus *pbus;
+	unsigned device;
+	struct resource *res;
+	struct bus *pbus;
 
-        device = dev->path.u.i2c.device;
-        pbus = get_pbus_smbus(dev);
+	device = dev->path.i2c.device;
+	pbus = get_pbus_smbus(dev);
 
-        res = find_resource(pbus->dev, 0x20 + (pbus->link * 4));
+	res = find_resource(pbus->dev, 0x20 + (pbus->link_num * 4));
 
-        return do_smbus_write_byte(res->base, device, address, val);
+	return do_smbus_write_byte(res->base, device, address, val);
 }
+
 static struct smbus_bus_operations lops_smbus_bus = {
-        .recv_byte  = lsmbus_recv_byte,
-        .send_byte  = lsmbus_send_byte,
-        .read_byte  = lsmbus_read_byte,
-        .write_byte = lsmbus_write_byte,
+	.recv_byte  = lsmbus_recv_byte,
+	.send_byte  = lsmbus_send_byte,
+	.read_byte  = lsmbus_read_byte,
+	.write_byte = lsmbus_write_byte,
 };
 
 static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
 {
-        pci_write_config32(dev, 0x40,
-                ((device & 0xffff) << 16) | (vendor & 0xffff));
+	pci_write_config32(dev, 0x40,
+			   ((device & 0xffff) << 16) | (vendor & 0xffff));
 }
 
 static struct pci_operations lops_pci = {
-        .set_subsystem = lpci_set_subsystem,
+	.set_subsystem = lpci_set_subsystem,
 };
+
 static struct device_operations smbus_ops = {
-        .read_resources   = pci_dev_read_resources,
-        .set_resources    = pci_dev_set_resources,
-        .enable_resources = pci_dev_enable_resources,
-        .init             = 0,
-        .scan_bus         = scan_static_bus,
-//        .enable           = ck804_enable,
-        .ops_pci          = &lops_pci,
-        .ops_smbus_bus    = &lops_smbus_bus,
+	.read_resources   = pci_dev_read_resources,
+	.set_resources    = pci_dev_set_resources,
+	.enable_resources = pci_dev_enable_resources,
+	.init             = 0,
+	.scan_bus         = scan_static_bus,
+	// .enable        = ck804_enable,
+	.ops_pci          = &lops_pci,
+	.ops_smbus_bus    = &lops_smbus_bus,
 };
+
 static const struct pci_driver smbus_driver __pci_driver = {
-        .ops    = &smbus_ops,
-        .vendor = PCI_VENDOR_ID_NVIDIA,
-        .device = PCI_DEVICE_ID_NVIDIA_CK804_SM,
+	.ops    = &smbus_ops,
+	.vendor = PCI_VENDOR_ID_NVIDIA,
+	.device = PCI_DEVICE_ID_NVIDIA_CK804_SM,
 };
-