diff options
| author | Eric Biederman <ebiederm@xmission.com> | 2004-10-14 22:35:23 +0000 |
|---|---|---|
| committer | Eric Biederman <ebiederm@xmission.com> | 2004-10-14 22:35:23 +0000 |
| commit | 119e00e2e1ca7b1c9ef112f2a971cc47c76aabf7 (patch) | |
| tree | 0aa99d3862fbf1f7fb9498429e0e9f052ae31187 /src/mainboard | |
| parent | 3614eebc1380cd2d7e2c74b4274238ace9cca7fc (diff) | |
- Fix fat fingered merge
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1671 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/arima/hdama/mainboard.c | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/src/mainboard/arima/hdama/mainboard.c b/src/mainboard/arima/hdama/mainboard.c index 52a32b0adf..81f82b3d75 100644 --- a/src/mainboard/arima/hdama/mainboard.c +++ b/src/mainboard/arima/hdama/mainboard.c @@ -238,8 +238,18 @@ static void verify_cpu_voltages(device_t dev) #define SMBUS_MUX 0x70 - if (smbus_wait_until_ready(smbus_io_base) < 0) { - return -2; +static void do_verify_cpu_voltages(void) +{ + device_t smbus_dev; + device_t mux, sensor; + struct device_path mux_path, sensor_path; + int result; + int mux_setting; + + /* Find the smbus controller */ + smbus_dev = dev_find_device(0x1022, 0x746b, 0); + if (!smbus_dev) { + die("SMBUS controller not found\n"); } /* Find the smbus mux */ @@ -250,25 +260,12 @@ static void verify_cpu_voltages(device_t dev) die("SMBUS mux not found\n"); } - global_status_register = inw(smbus_io_base + SMBGSTATUS); - - /* read results of transaction */ - byte = inw(smbus_io_base + SMBHSTDAT) & 0xff; - - if (global_status_register != (1 << 4)) { - return -1; - } - return byte; -} - -#if 0 -static int smbus_read_byte(unsigned smbus_io_base, unsigned device, unsigned address) -{ - unsigned char global_status_register; - unsigned char byte; - - if (smbus_wait_until_ready(smbus_io_base) < 0) { - return -2; + /* Find the adm1026 sensor */ + sensor_path.type = DEVICE_PATH_I2C; + sensor_path.u.i2c.device = ADM1026_DEVICE; + sensor = find_dev_path(mux, &sensor_path); + if (!sensor) { + die("ADM1026 not found\n"); } /* Set the mux to see the temperature sensors */ |