diff options
| author | Myles Watson <mylesgw@gmail.com> | 2010-06-22 20:36:52 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2010-06-22 20:36:52 +0000 |
| commit | ad5107e5e6cb6d79e6b3e228226ffd87b72f62f1 (patch) | |
| tree | f1bb1f7c3d049b2235e14b2e6cd817f4f2bcabdf | |
| parent | ccbcc56c642cc0bb9c50514ed8384f67bd36f0d9 (diff) | |
Finish fixing Tyan s2881. Simplify ADT7463 initialization code.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Ward Vandewege <ward@gnu.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5641 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | src/drivers/i2c/adt7463/adt7463.c | 20 | ||||
| -rw-r--r-- | src/mainboard/tyan/s2881/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/tyan/s2881/devicetree.cb | 2 |
3 files changed, 5 insertions, 19 deletions
diff --git a/src/drivers/i2c/adt7463/adt7463.c b/src/drivers/i2c/adt7463/adt7463.c index 7639028784..25a65c8371 100644 --- a/src/drivers/i2c/adt7463/adt7463.c +++ b/src/drivers/i2c/adt7463/adt7463.c @@ -33,25 +33,11 @@ * See Analog Devices ADT7463 datasheet, Rev C (2004): * http://www.analog.com/en/prod/0,,766_825_ADT7463,00.html */ -static void adt7463_init(device_t dev) +static void adt7463_init(device_t adt7463) { - device_t smbus_dev, adt7463; - struct device_path path; int result; - /* Find the SMBus controller (AMD-8111). */ - smbus_dev = dev_find_device(0x1022, 0x746b, 0); - if (!smbus_dev) - die("SMBus controller not found\n"); - printk(BIOS_DEBUG, "SMBus controller found\n"); - - /* Find the ADT7463 device. */ - path.type = DEVICE_PATH_I2C; - path.i2c.device = 0x2d; - adt7463 = find_dev_path(smbus_dev->link_list, &path); - if (!adt7463) - die("ADT7463 not found\n"); - printk(BIOS_DEBUG, "ADT7463 found\n"); + printk(BIOS_DEBUG, "ADT7463 is %s\n", dev_path(adt7463)); /* Set all fans to 'Fastest Speed Calculated by All 3 Temperature * Channels Controls PWMx'. @@ -116,7 +102,7 @@ static void enable_dev(struct device *dev) dev->ops = &adt7463_operations; } -struct chip_operations mainboard_ops = { +struct chip_operations drivers_i2c_adt7463_ops = { CHIP_NAME("adt7463") .enable_dev = enable_dev, }; diff --git a/src/mainboard/tyan/s2881/Makefile.inc b/src/mainboard/tyan/s2881/Makefile.inc index 4160fecd12..31bfe0fecf 100644 --- a/src/mainboard/tyan/s2881/Makefile.inc +++ b/src/mainboard/tyan/s2881/Makefile.inc @@ -1 +1 @@ -obj-y += ../../../drivers/i2c/adm1027/adm1027.o +obj-y += ../../../drivers/i2c/adt7463/adt7463.o diff --git a/src/mainboard/tyan/s2881/devicetree.cb b/src/mainboard/tyan/s2881/devicetree.cb index 6e302f2175..86984d03a7 100644 --- a/src/mainboard/tyan/s2881/devicetree.cb +++ b/src/mainboard/tyan/s2881/devicetree.cb @@ -102,7 +102,7 @@ chip northbridge/amd/amdk8/root_complex chip drivers/generic/generic #dimm 1-1-1 device i2c 57 on end end - chip drivers/i2c/adm1027 # ADT7463A CPU0/1 temp, CPU1 vid, SYS FAN 1/2/3 + chip drivers/i2c/adt7463 # CPU0/1 temp, CPU1 vid, SYS FAN 1/2/3 device i2c 2d on end end chip drivers/generic/generic # Winbond HWM 0x54 CPU0/1 VRM temp, SYSFAN 4,CPU0 vid, CPU0/1 FAN |