summaryrefslogtreecommitdiff
path: root/src/superio/winbond/w83627hf
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2008-10-02 19:21:30 +0000
committerMyles Watson <mylesgw@gmail.com>2008-10-02 19:21:30 +0000
commitcee94384364999a696e3b78a3fe4e2b24f87ea19 (patch)
treea5acb69a52c680f2351311516be0e152f431749c /src/superio/winbond/w83627hf
parentd61ada6555ed2e8b5693b987faae1624ec4cbde6 (diff)
downloadcoreboot-cee94384364999a696e3b78a3fe4e2b24f87ea19.tar.xz
Whitespace cleanup (trivial).
Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3633 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/superio/winbond/w83627hf')
-rw-r--r--src/superio/winbond/w83627hf/superio.c118
-rw-r--r--src/superio/winbond/w83627hf/w83627hf.h36
-rw-r--r--src/superio/winbond/w83627hf/w83627hf_early_serial.c12
3 files changed, 84 insertions, 82 deletions
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 5f26768adf..bbdb7bffa9 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -1,6 +1,6 @@
/* Copyright 2000 AG Electronics Ltd. */
/* Copyright 2003-2004 Linux Networx */
-/* Copyright 2004 Tyan
+/* Copyright 2004 Tyan
By LYH change from PC87360 */
/* This code is distributed without warranty under the GPL v2 (see COPYING) */
@@ -18,27 +18,27 @@
#include "w83627hf.h"
-static void pnp_enter_ext_func_mode(device_t dev)
+static void pnp_enter_ext_func_mode(device_t dev)
{
- outb(0x87, dev->path.u.pnp.port);
- outb(0x87, dev->path.u.pnp.port);
+ outb(0x87, dev->path.u.pnp.port);
+ outb(0x87, dev->path.u.pnp.port);
}
-static void pnp_exit_ext_func_mode(device_t dev)
+static void pnp_exit_ext_func_mode(device_t dev)
{
- outb(0xaa, dev->path.u.pnp.port);
+ outb(0xaa, dev->path.u.pnp.port);
}
static void pnp_write_index(unsigned long port_base, uint8_t reg, uint8_t value)
{
- outb(reg, port_base);
- outb(value, port_base + 1);
+ outb(reg, port_base);
+ outb(value, port_base + 1);
}
static uint8_t pnp_read_index(unsigned long port_base, uint8_t reg)
{
- outb(reg, port_base);
- return inb(port_base + 1);
-}
+ outb(reg, port_base);
+ return inb(port_base + 1);
+}
static void enable_hwm_smbus(device_t dev) {
/* set the pin 91,92 as I2C bus */
@@ -56,14 +56,14 @@ static void init_acpi(device_t dev)
get_option(&power_on, "power_on_after_fail");
pnp_enter_ext_func_mode(dev);
- pnp_write_index(dev->path.u.pnp.port,7,0x0a);
+ pnp_write_index(dev->path.u.pnp.port,7,0x0a);
value = pnp_read_config(dev, 0xE4);
value &= ~(3<<5);
if(power_on) {
value |= (1<<5);
}
pnp_write_config(dev, 0xE4, value);
- pnp_exit_ext_func_mode(dev);
+ pnp_exit_ext_func_mode(dev);
}
static void init_hwm(unsigned long base)
@@ -72,16 +72,16 @@ static void init_hwm(unsigned long base)
int i;
unsigned hwm_reg_values[] = {
-/* reg mask data */
- 0x40, 0xff, 0x81, /* start HWM */
- 0x48, 0xaa, 0x2a, /* set SMBus base to 0x54>>1 */
- 0x4a, 0x21, 0x21, /* set T2 SMBus base to 0x92>>1 and T3 SMBus base to 0x94>>1 */
- 0x4e, 0x80, 0x00,
- 0x43, 0x00, 0xff,
- 0x44, 0x00, 0x3f,
- 0x4c, 0xbf, 0x18,
- 0x4d, 0xff, 0x80 /* turn off beep */
-
+/* reg mask data */
+ 0x40, 0xff, 0x81, /* start HWM */
+ 0x48, 0xaa, 0x2a, /* set SMBus base to 0x54>>1 */
+ 0x4a, 0x21, 0x21, /* set T2 SMBus base to 0x92>>1 and T3 SMBus base to 0x94>>1 */
+ 0x4e, 0x80, 0x00,
+ 0x43, 0x00, 0xff,
+ 0x44, 0x00, 0x3f,
+ 0x4c, 0xbf, 0x18,
+ 0x4d, 0xff, 0x80 /* turn off beep */
+
};
for(i = 0; i< ARRAY_SIZE(hwm_reg_values); i+=3 ) {
@@ -105,7 +105,7 @@ static void w83627hf_init(device_t dev)
}
conf = dev->chip_info;
switch(dev->path.u.pnp.device) {
- case W83627HF_SP1:
+ case W83627HF_SP1:
res0 = find_resource(dev, PNP_IDX_IO0);
init_uart8250(res0->base, &conf->com1);
break;
@@ -118,50 +118,50 @@ static void w83627hf_init(device_t dev)
res1 = find_resource(dev, PNP_IDX_IO1);
init_pc_keyboard(res0->base, res1->base, &conf->keyboard);
break;
- case W83627HF_HWM:
- res0 = find_resource(dev, PNP_IDX_IO0);
+ case W83627HF_HWM:
+ res0 = find_resource(dev, PNP_IDX_IO0);
#define HWM_INDEX_PORT 5
- init_hwm(res0->base + HWM_INDEX_PORT);
- break;
- case W83627HF_ACPI:
- init_acpi(dev);
- break;
+ init_hwm(res0->base + HWM_INDEX_PORT);
+ break;
+ case W83627HF_ACPI:
+ init_acpi(dev);
+ break;
}
}
void w83627hf_pnp_set_resources(device_t dev)
{
- pnp_enter_ext_func_mode(dev);
+ pnp_enter_ext_func_mode(dev);
pnp_set_resources(dev);
- pnp_exit_ext_func_mode(dev);
-
-}
-
+ pnp_exit_ext_func_mode(dev);
+
+}
+
void w83627hf_pnp_enable_resources(device_t dev)
-{
- pnp_enter_ext_func_mode(dev);
- pnp_enable_resources(dev);
- switch(dev->path.u.pnp.device) {
+{
+ pnp_enter_ext_func_mode(dev);
+ pnp_enable_resources(dev);
+ switch(dev->path.u.pnp.device) {
case W83627HF_HWM:
printk_debug("w83627hf hwm smbus enabled\n");
enable_hwm_smbus(dev);
break;
}
- pnp_exit_ext_func_mode(dev);
+ pnp_exit_ext_func_mode(dev);
}
void w83627hf_pnp_enable(device_t dev)
{
- if (!dev->enabled) {
- pnp_enter_ext_func_mode(dev);
+ if (!dev->enabled) {
+ pnp_enter_ext_func_mode(dev);
- pnp_set_logical_device(dev);
- pnp_set_enable(dev, 0);
+ pnp_set_logical_device(dev);
+ pnp_set_enable(dev, 0);
- pnp_exit_ext_func_mode(dev);
- }
+ pnp_exit_ext_func_mode(dev);
+ }
}
static struct device_operations ops = {
@@ -173,18 +173,18 @@ static struct device_operations ops = {
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, W83627HF_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
- { &ops, W83627HF_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
- { &ops, W83627HF_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
- { &ops, W83627HF_SP2, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
- // No 4 { 0,},
- { &ops, W83627HF_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, },
- { &ops, W83627HF_CIR, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
- { &ops, W83627HF_GAME_MIDI_GPIO1, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7ff, 0 }, {0x7fe, 0x4}, },
- { &ops, W83627HF_GPIO2, },
- { &ops, W83627HF_GPIO3, },
- { &ops, W83627HF_ACPI, },
- { &ops, W83627HF_HWM, PNP_IO0 | PNP_IRQ0, { 0xff8, 0 }, },
+ { &ops, W83627HF_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
+ { &ops, W83627HF_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
+ { &ops, W83627HF_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
+ { &ops, W83627HF_SP2, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
+ // No 4 { 0,},
+ { &ops, W83627HF_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, },
+ { &ops, W83627HF_CIR, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
+ { &ops, W83627HF_GAME_MIDI_GPIO1, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7ff, 0 }, {0x7fe, 0x4}, },
+ { &ops, W83627HF_GPIO2, },
+ { &ops, W83627HF_GPIO3, },
+ { &ops, W83627HF_ACPI, },
+ { &ops, W83627HF_HWM, PNP_IO0 | PNP_IRQ0, { 0xff8, 0 }, },
};
static void enable_dev(struct device *dev)
diff --git a/src/superio/winbond/w83627hf/w83627hf.h b/src/superio/winbond/w83627hf/w83627hf.h
index 7cd664cd16..21af050268 100644
--- a/src/superio/winbond/w83627hf/w83627hf.h
+++ b/src/superio/winbond/w83627hf/w83627hf.h
@@ -18,10 +18,10 @@
#define W83627HF_GPEVR 0xf2
#define W83627HF_GPCFG2 0xf3
#define W83627HF_EXTCFG 0xf4
-#define W83627HF_IOEXT1A 0xf5
-#define W83627HF_IOEXT1B 0xf6
-#define W83627HF_IOEXT2A 0xf7
-#define W83627HF_IOEXT2B 0xf8
+#define W83627HF_IOEXT1A 0xf5
+#define W83627HF_IOEXT1B 0xf6
+#define W83627HF_IOEXT2A 0xf7
+#define W83627HF_IOEXT2B 0xf8
#define W83627HF_GPDO_0 0x00
#define W83627HF_GPDI_0 0x01
@@ -40,26 +40,26 @@
#define W83627HF_GPDO_5 0x0e
#define W83627HF_GPDI_5 0x0f
#define W83627HF_GPDO_6 0x10
-#define W83627HF_GPDO_7A 0x11
-#define W83627HF_GPDO_7B 0x12
-#define W83627HF_GPDO_7C 0x13
-#define W83627HF_GPDO_7D 0x14
-#define W83627HF_GPDI_7A 0x15
-#define W83627HF_GPDI_7B 0x16
-#define W83627HF_GPDI_7C 0x17
-#define W83627HF_GPDI_7D 0x18
+#define W83627HF_GPDO_7A 0x11
+#define W83627HF_GPDO_7B 0x12
+#define W83627HF_GPDO_7C 0x13
+#define W83627HF_GPDO_7D 0x14
+#define W83627HF_GPDI_7A 0x15
+#define W83627HF_GPDI_7B 0x16
+#define W83627HF_GPDI_7C 0x17
+#define W83627HF_GPDI_7D 0x18
#define W83627HF_XIOCNF 0xf0
-#define W83627HF_XIOBA1H 0xf1
-#define W83627HF_XIOBA1L 0xf2
+#define W83627HF_XIOBA1H 0xf1
+#define W83627HF_XIOBA1L 0xf2
#define W83627HF_XIOSIZE1 0xf3
-#define W83627HF_XIOBA2H 0xf4
-#define W83627HF_XIOBA2L 0xf5
+#define W83627HF_XIOBA2H 0xf4
+#define W83627HF_XIOBA2L 0xf5
#define W83627HF_XIOSIZE2 0xf6
#define W83627HF_XMEMCNF1 0xf7
#define W83627HF_XMEMCNF2 0xf8
-#define W83627HF_XMEMBAH 0xf9
-#define W83627HF_XMEMBAL 0xfa
+#define W83627HF_XMEMBAH 0xf9
+#define W83627HF_XMEMBAL 0xfa
#define W83627HF_XMEMSIZE 0xfb
#define W83627HF_XIRQMAP1 0xfc
#define W83627HF_XIRQMAP2 0xfd
diff --git a/src/superio/winbond/w83627hf/w83627hf_early_serial.c b/src/superio/winbond/w83627hf/w83627hf_early_serial.c
index 6ca089ac50..826937e59e 100644
--- a/src/superio/winbond/w83627hf/w83627hf_early_serial.c
+++ b/src/superio/winbond/w83627hf/w83627hf_early_serial.c
@@ -1,17 +1,19 @@
#include <arch/romcc_io.h>
#include "w83627hf.h"
-static inline void pnp_enter_ext_func_mode(device_t dev)
+static inline void pnp_enter_ext_func_mode(device_t dev)
{
unsigned port = dev>>8;
- outb(0x87, port);
- outb(0x87, port);
+ outb(0x87, port);
+ outb(0x87, port);
}
-static void pnp_exit_ext_func_mode(device_t dev)
+
+static void pnp_exit_ext_func_mode(device_t dev)
{
unsigned port = dev>>8;
- outb(0xaa, port);
+ outb(0xaa, port);
}
+
static void w83627hf_enable_serial(device_t dev, unsigned iobase)
{
pnp_enter_ext_func_mode(dev);