diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2010-11-10 14:53:36 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2010-11-10 14:53:36 +0000 |
| commit | 340fa9396b4b73fd894a15fe48882c98d74292ce (patch) | |
| tree | fd38d38490431ddb2c210ffbc39b4771ce08eda2 /src/superio/winbond/w83697hf/w83697hf_early_serial.c | |
| parent | 02d66fd1bf3e5548dc5edaed074d2946fe5a37df (diff) | |
Random Winbond Super I/O cosmetic and coding-style fixes.
- Whitespace, coding style, and typo fixes.
- Drop unused/obsolete "#config chip.h".
- Use u8/u16/etc. everywhere.
- Use pnp_read_config()/pnp_write_config() instead of open-coding them.
- Use pnp_set_logical_device() instead of open-coding it.
- W83627EHG: Fix incorrect enable_hwm_smbus() code comment.
- Use ARRAY_SIZE.
- w83627hf/superio.c: w83627hf_16_bit_addr_qual(): Bugfix, the code was using
'dev->path.pnp.port >> 8' as config port, which is incorrect in superio.c
(which has a "real" device_t struct, in contrast to *_early_serial.c which
uses "unsigned" as device_t where 'dev >> 8' is required).
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6057 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/superio/winbond/w83697hf/w83697hf_early_serial.c')
| -rw-r--r-- | src/superio/winbond/w83697hf/w83697hf_early_serial.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/superio/winbond/w83697hf/w83697hf_early_serial.c b/src/superio/winbond/w83697hf/w83697hf_early_serial.c index 1e05e38f40..7731804699 100644 --- a/src/superio/winbond/w83697hf/w83697hf_early_serial.c +++ b/src/superio/winbond/w83697hf/w83697hf_early_serial.c @@ -22,7 +22,7 @@ #include <arch/romcc_io.h> #include "w83697hf.h" -static inline void pnp_enter_ext_func_mode(device_t dev) +static void pnp_enter_ext_func_mode(device_t dev) { u16 port = dev >> 8; outb(0x87, port); @@ -37,11 +37,12 @@ static void pnp_exit_ext_func_mode(device_t dev) static void w83697hf_set_clksel_48(device_t dev) { - u16 port = dev >> 8; + u8 reg8; + pnp_enter_ext_func_mode(dev); - outb(0x24, port); - /* Set the clock input to 48Mhz */ - outb(inb(port+1)|0x40, port+1); + reg8 = pnp_read_config(dev, 0x24); + reg8 |= (1 << 6); /* Set the clock input to 48MHz. */ + pnp_write_config(dev, 0x24, reg8); pnp_exit_ext_func_mode(dev); } |