diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2007-07-12 15:56:02 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2007-07-12 15:56:02 +0000 |
| commit | 6cf687783bc9c54146cf85ce5e526e63ab7047fb (patch) | |
| tree | f12bed043cff17b88b72d8e867fcdc70eec0fd76 /src/mainboard/agami/aruma/mainboard.c | |
| parent | 3fa1363ee5d7a1400203bd1486f8e80a8cacc992 (diff) | |
some agami i2c merges
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2735 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/agami/aruma/mainboard.c')
| -rw-r--r-- | src/mainboard/agami/aruma/mainboard.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/src/mainboard/agami/aruma/mainboard.c b/src/mainboard/agami/aruma/mainboard.c index 3a4a42e906..c73761ad65 100644 --- a/src/mainboard/agami/aruma/mainboard.c +++ b/src/mainboard/agami/aruma/mainboard.c @@ -97,7 +97,7 @@ static unsigned int scan_root_bus(device_t root, unsigned int max) } #endif -#if 0 +#if 1 static void handle_smbus_error(int value, const char *msg) { if (value >= 0) { @@ -118,7 +118,7 @@ static void handle_smbus_error(int value, const char *msg) } } -#define ADM1026_DEVICE 0x2c /* 0x2e or 0x2d */ +#define ADM1026_DEVICE 0x2d /* 0x2e or 0x2c */ #define ADM1026_REG_CONFIG1 0x00 #define CFG1_MONITOR 0x01 #define CFG1_INT_ENABLE 0x02 @@ -235,7 +235,7 @@ static void verify_cpu_voltages(device_t dev) cpu_volts, delta); } -#define SMBUS_MUX 0x70 +#define SMBUS_MUX 0x71 static void do_verify_cpu_voltages(void) { @@ -250,7 +250,7 @@ static void do_verify_cpu_voltages(void) if (!smbus_dev) { die("SMBUS controller not found\n"); } - + /* Find the smbus mux */ mux_path.type = DEVICE_PATH_I2C; mux_path.u.i2c.device = SMBUS_MUX; @@ -309,31 +309,22 @@ static void mainboard_init(device_t dev) { root_dev_init(dev); - do_verify_cpu_voltages(); + printk_info("Initializing mainboard components... "); + // do_verify_cpu_voltages(); + printk_info("ok\n"); printk_info("Initializing mainboard specific functions... "); fixup_aruma(); printk_info("ok\n"); } -static struct device_operations mainboard_operations = { - .read_resources = root_dev_read_resources, - .set_resources = root_dev_set_resources, - .enable_resources = root_dev_enable_resources, - .init = mainboard_init, -#if !DEBUG - .scan_bus = root_dev_scan_bus, -#else - .scan_bus = scan_root_bus, -#endif - .enable = 0, -}; - static void enable_dev(struct device *dev) { - dev->ops = &mainboard_operations; + dev->ops->init = mainboard_init; } + struct chip_operations mainboard_agami_aruma_ops = { + CHIP_NAME("AGAMI Aruma Mainboard") .enable_dev = enable_dev, }; |