sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Whitespace cleanup (trivial).

Browse Source 
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
This commit is contained in:
Myles Watson
2008-10-02 19:21:30 +00:00
parent d61ada6555
commit cee9438436
7 changed files with 169 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/superio/smsc/lpc47b397/lpc47b397.h
View File

@@ -1,7 +1,7 @@
#define LPC47B397_FDC 0 /* Floppy */ #define LPC47B397_FDC 0 /* Floppy */
#define LPC47B397_PP 3 /* Parallel Port */ #define LPC47B397_PP 3 /* Parallel Port */
#define LPC47B397_SP1 4 /* Com1 */ #define LPC47B397_SP1 4 /* Com1 */
#define LPC47B397_SP2 5 /* Com2 */ #define LPC47B397_SP2 5 /* Com2 */
#define LPC47B397_KBC 7 /* Keyboard & Mouse */ #define LPC47B397_KBC 7 /* Keyboard & Mouse */
#define LPC47B397_HWM 8 /* HW Monitor */ #define LPC47B397_HWM 8 /* HW Monitor */
#define LPC47B397_RT 10 /* Runtime reg*/ #define LPC47B397_RT 10 /* Runtime reg*/

9
src/superio/smsc/lpc47b397/lpc47b397_early_gpio.c
View File

@@ -2,9 +2,10 @@ static void lpc47b397_gpio_offset_out(unsigned iobase, unsigned offset, unsigned
{ {
outb(value,iobase+offset); outb(value,iobase+offset);
} }
static unsigned lpc47b397_gpio_offset_in(unsigned iobase, unsigned offset) static unsigned lpc47b397_gpio_offset_in(unsigned iobase, unsigned offset)
{ {
return inb(iobase+offset); return inb(iobase+offset);
} }
//for GP60-GP64, GP66-GP85 //for GP60-GP64, GP66-GP85
@@ -13,13 +14,13 @@ static unsigned lpc47b397_gpio_offset_in(unsigned iobase, unsigned offset)
static void lpc47b397_gpio_index_out(unsigned iobase, unsigned index, unsigned value) static void lpc47b397_gpio_index_out(unsigned iobase, unsigned index, unsigned value)
{ {
outb(index,iobase+LPC47B397_GPIO_CNTL_INDEX); outb(index,iobase+LPC47B397_GPIO_CNTL_INDEX);
outb(value, iobase+LPC47B397_GPIO_CNTL_DATA); outb(value, iobase+LPC47B397_GPIO_CNTL_DATA);
} }
static unsigned lpc47b397_gpio_index_in(unsigned iobase, unsigned index) static unsigned lpc47b397_gpio_index_in(unsigned iobase, unsigned index)
{ {
outb(index,iobase+LPC47B397_GPIO_CNTL_INDEX); outb(index,iobase+LPC47B397_GPIO_CNTL_INDEX);
return inb(iobase+LPC47B397_GPIO_CNTL_DATA); return inb(iobase+LPC47B397_GPIO_CNTL_DATA);
} }

6
src/superio/smsc/lpc47b397/lpc47b397_early_serial.c
View File

@@ -3,12 +3,14 @@
static inline void pnp_enter_conf_state(device_t dev) { static inline void pnp_enter_conf_state(device_t dev) {
unsigned port = dev>>8; unsigned port = dev>>8;
outb(0x55, port); outb(0x55, port);
} }
static void pnp_exit_conf_state(device_t dev) { static void pnp_exit_conf_state(device_t dev) {
unsigned port = dev>>8; unsigned port = dev>>8;
outb(0xaa, port); outb(0xaa, port);
} }
static void lpc47b397_enable_serial(device_t dev, unsigned iobase) static void lpc47b397_enable_serial(device_t dev, unsigned iobase)
{ {
pnp_enter_conf_state(dev); pnp_enter_conf_state(dev);

98
src/superio/smsc/lpc47b397/superio.c
View File

@@ -20,31 +20,31 @@
static void pnp_enter_conf_state(device_t dev) { static void pnp_enter_conf_state(device_t dev) {
outb(0x55, dev->path.u.pnp.port); outb(0x55, dev->path.u.pnp.port);
} }
static void pnp_exit_conf_state(device_t dev) { static void pnp_exit_conf_state(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) static void pnp_write_index(unsigned long port_base, uint8_t reg, uint8_t value)
{ {
outb(reg, port_base); outb(reg, port_base);
outb(value, port_base + 1); outb(value, port_base + 1);
} }
static uint8_t pnp_read_index(unsigned long port_base, uint8_t reg) static uint8_t pnp_read_index(unsigned long port_base, uint8_t reg)
{ {
outb(reg, port_base); outb(reg, port_base);
return inb(port_base + 1); return inb(port_base + 1);
} }
static void enable_hwm_smbus(device_t dev) { static void enable_hwm_smbus(device_t dev) {
/* enable SensorBus register access */ /* enable SensorBus register access */
uint8_t reg, value; uint8_t reg, value;
reg = 0xf0; reg = 0xf0;
value = pnp_read_config(dev, reg); value = pnp_read_config(dev, reg);
value |= 0x01; value |= 0x01;
pnp_write_config(dev, reg, value); pnp_write_config(dev, reg, value);
} }
@@ -82,33 +82,33 @@ void lpc47b397_pnp_set_resources(device_t dev)
pnp_set_resources(dev); pnp_set_resources(dev);
#if 0 #if 0
dump_pnp_device(dev); dump_pnp_device(dev);
#endif #endif
pnp_exit_conf_state(dev); pnp_exit_conf_state(dev);
} }
void lpc47b397_pnp_enable_resources(device_t dev) void lpc47b397_pnp_enable_resources(device_t dev)
{ {
pnp_enter_conf_state(dev); pnp_enter_conf_state(dev);
pnp_enable_resources(dev); pnp_enable_resources(dev);
switch(dev->path.u.pnp.device) { switch(dev->path.u.pnp.device) {
case LPC47B397_HWM: case LPC47B397_HWM:
printk_debug("lpc47b397 SensorBus Register Access enabled\r\n"); printk_debug("lpc47b397 SensorBus Register Access enabled\r\n");
pnp_set_logical_device(dev); pnp_set_logical_device(dev);
enable_hwm_smbus(dev); enable_hwm_smbus(dev);
break; break;
} }
#if 0 #if 0
dump_pnp_device(dev); dump_pnp_device(dev);
#endif #endif
pnp_exit_conf_state(dev); pnp_exit_conf_state(dev);
} }
@@ -149,60 +149,60 @@ static struct device_operations ops = {
static int lsmbus_read_byte(device_t dev, uint8_t address) static int lsmbus_read_byte(device_t dev, uint8_t address)
{ {
unsigned device; unsigned device;
struct resource *res; struct resource *res;
int result; int result;
device = dev->path.u.i2c.device; device = dev->path.u.i2c.device;
res = find_resource(get_pbus_smbus(dev)->dev, PNP_IDX_IO0); res = find_resource(get_pbus_smbus(dev)->dev, PNP_IDX_IO0);
pnp_write_index(res->base+HWM_INDEX, 0, device); // why 0? pnp_write_index(res->base+HWM_INDEX, 0, device); // why 0?
result = pnp_read_index(res->base+SB_INDEX, address); // we only read it one byte one time result = pnp_read_index(res->base+SB_INDEX, address); // we only read it one byte one time
return result; return result;
} }
static int lsmbus_write_byte(device_t dev, uint8_t address, uint8_t val) static int lsmbus_write_byte(device_t dev, uint8_t address, uint8_t val)
{ {
unsigned device; unsigned device;
struct resource *res; struct resource *res;
device = dev->path.u.i2c.device; device = dev->path.u.i2c.device;
res = find_resource(get_pbus_smbus(dev)->dev, PNP_IDX_IO0); res = find_resource(get_pbus_smbus(dev)->dev, PNP_IDX_IO0);
pnp_write_index(res->base+HWM_INDEX, 0, device); // why 0? pnp_write_index(res->base+HWM_INDEX, 0, device); // why 0?
pnp_write_index(res->base+SB_INDEX, address, val); // we only write it one byte one time pnp_write_index(res->base+SB_INDEX, address, val); // we only write it one byte one time
return 0; return 0;
} }
static struct smbus_bus_operations lops_smbus_bus = { static struct smbus_bus_operations lops_smbus_bus = {
// .recv_byte = lsmbus_recv_byte, // .recv_byte = lsmbus_recv_byte,
// .send_byte = lsmbus_send_byte, // .send_byte = lsmbus_send_byte,
.read_byte = lsmbus_read_byte, .read_byte = lsmbus_read_byte,
.write_byte = lsmbus_write_byte, .write_byte = lsmbus_write_byte,
}; };
static struct device_operations ops_hwm = { static struct device_operations ops_hwm = {
.read_resources = pnp_read_resources, .read_resources = pnp_read_resources,
.set_resources = lpc47b397_pnp_set_resources, .set_resources = lpc47b397_pnp_set_resources,
.enable_resources = lpc47b397_pnp_enable_resources, .enable_resources = lpc47b397_pnp_enable_resources,
.enable = lpc47b397_pnp_enable, .enable = lpc47b397_pnp_enable,
.init = lpc47b397_init, .init = lpc47b397_init,
.scan_bus = scan_static_bus, .scan_bus = scan_static_bus,
.ops_smbus_bus = &lops_smbus_bus, .ops_smbus_bus = &lops_smbus_bus,
}; };
static struct pnp_info pnp_dev_info[] = { static struct pnp_info pnp_dev_info[] = {
{ &ops, LPC47B397_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, }, { &ops, LPC47B397_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
{ &ops, LPC47B397_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, }, { &ops, LPC47B397_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
{ &ops, LPC47B397_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, { &ops, LPC47B397_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
{ &ops, LPC47B397_SP2, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, { &ops, LPC47B397_SP2, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
{ &ops, LPC47B397_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, }, { &ops, LPC47B397_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, },
{ &ops_hwm, LPC47B397_HWM, PNP_IO0, { 0x7f0, 0 }, }, { &ops_hwm, LPC47B397_HWM, PNP_IO0, { 0x7f0, 0 }, },
{ &ops, LPC47B397_RT, PNP_IO0, { 0x780, 0 }, }, { &ops, LPC47B397_RT, PNP_IO0, { 0x780, 0 }, },
}; };
static void enable_dev(struct device *dev) static void enable_dev(struct device *dev)

92
src/superio/winbond/w83627hf/superio.c
View File

@@ -20,24 +20,24 @@
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) static void pnp_write_index(unsigned long port_base, uint8_t reg, uint8_t value)
{ {
outb(reg, port_base); outb(reg, port_base);
outb(value, port_base + 1); outb(value, port_base + 1);
} }
static uint8_t pnp_read_index(unsigned long port_base, uint8_t reg) static uint8_t pnp_read_index(unsigned long port_base, uint8_t reg)
{ {
outb(reg, port_base); outb(reg, port_base);
return inb(port_base + 1); return inb(port_base + 1);
} }
static void enable_hwm_smbus(device_t dev) { static void enable_hwm_smbus(device_t dev) {
@@ -63,7 +63,7 @@ static void init_acpi(device_t dev)
value |= (1<<5); value |= (1<<5);
} }
pnp_write_config(dev, 0xE4, value); 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) static void init_hwm(unsigned long base)
@@ -72,15 +72,15 @@ static void init_hwm(unsigned long base)
int i; int i;
unsigned hwm_reg_values[] = { unsigned hwm_reg_values[] = {
/* reg mask data */ /* reg mask data */
0x40, 0xff, 0x81, /* start HWM */ 0x40, 0xff, 0x81, /* start HWM */
0x48, 0xaa, 0x2a, /* set SMBus base to 0x54>>1 */ 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 */ 0x4a, 0x21, 0x21, /* set T2 SMBus base to 0x92>>1 and T3 SMBus base to 0x94>>1 */
0x4e, 0x80, 0x00, 0x4e, 0x80, 0x00,
0x43, 0x00, 0xff, 0x43, 0x00, 0xff,
0x44, 0x00, 0x3f, 0x44, 0x00, 0x3f,
0x4c, 0xbf, 0x18, 0x4c, 0xbf, 0x18,
0x4d, 0xff, 0x80 /* turn off beep */ 0x4d, 0xff, 0x80 /* turn off beep */
}; };
@@ -118,14 +118,14 @@ static void w83627hf_init(device_t dev)
res1 = find_resource(dev, PNP_IDX_IO1); res1 = find_resource(dev, PNP_IDX_IO1);
init_pc_keyboard(res0->base, res1->base, &conf->keyboard); init_pc_keyboard(res0->base, res1->base, &conf->keyboard);
break; break;
case W83627HF_HWM: case W83627HF_HWM:
res0 = find_resource(dev, PNP_IDX_IO0); res0 = find_resource(dev, PNP_IDX_IO0);
#define HWM_INDEX_PORT 5 #define HWM_INDEX_PORT 5
init_hwm(res0->base + HWM_INDEX_PORT); init_hwm(res0->base + HWM_INDEX_PORT);
break; break;
case W83627HF_ACPI: case W83627HF_ACPI:
init_acpi(dev); init_acpi(dev);
break; break;
} }
} }
@@ -133,35 +133,35 @@ 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_set_resources(dev);
pnp_exit_ext_func_mode(dev); pnp_exit_ext_func_mode(dev);
} }
void w83627hf_pnp_enable_resources(device_t dev) void w83627hf_pnp_enable_resources(device_t dev)
{ {
pnp_enter_ext_func_mode(dev); pnp_enter_ext_func_mode(dev);
pnp_enable_resources(dev); pnp_enable_resources(dev);
switch(dev->path.u.pnp.device) { switch(dev->path.u.pnp.device) {
case W83627HF_HWM: case W83627HF_HWM:
printk_debug("w83627hf hwm smbus enabled\n"); printk_debug("w83627hf hwm smbus enabled\n");
enable_hwm_smbus(dev); enable_hwm_smbus(dev);
break; break;
} }
pnp_exit_ext_func_mode(dev); pnp_exit_ext_func_mode(dev);
} }
void w83627hf_pnp_enable(device_t dev) void w83627hf_pnp_enable(device_t dev)
{ {
if (!dev->enabled) { if (!dev->enabled) {
pnp_enter_ext_func_mode(dev); pnp_enter_ext_func_mode(dev);
pnp_set_logical_device(dev); pnp_set_logical_device(dev);
pnp_set_enable(dev, 0); pnp_set_enable(dev, 0);
pnp_exit_ext_func_mode(dev); pnp_exit_ext_func_mode(dev);
} }
} }
static struct device_operations ops = { static struct device_operations ops = {
@@ -173,18 +173,18 @@ static struct device_operations ops = {
}; };
static struct pnp_info pnp_dev_info[] = { static struct pnp_info pnp_dev_info[] = {
{ &ops, W83627HF_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 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_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
{ &ops, W83627HF_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, { &ops, W83627HF_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
{ &ops, W83627HF_SP2, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, { &ops, W83627HF_SP2, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
// No 4 { 0,}, // No 4 { 0,},
{ &ops, W83627HF_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, }, { &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_CIR, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
{ &ops, W83627HF_GAME_MIDI_GPIO1, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7ff, 0 }, {0x7fe, 0x4}, }, { &ops, W83627HF_GAME_MIDI_GPIO1, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7ff, 0 }, {0x7fe, 0x4}, },
{ &ops, W83627HF_GPIO2, }, { &ops, W83627HF_GPIO2, },
{ &ops, W83627HF_GPIO3, }, { &ops, W83627HF_GPIO3, },
{ &ops, W83627HF_ACPI, }, { &ops, W83627HF_ACPI, },
{ &ops, W83627HF_HWM, PNP_IO0 | PNP_IRQ0, { 0xff8, 0 }, }, { &ops, W83627HF_HWM, PNP_IO0 | PNP_IRQ0, { 0xff8, 0 }, },
}; };
static void enable_dev(struct device *dev) static void enable_dev(struct device *dev)

36
src/superio/winbond/w83627hf/w83627hf.h
View File

@@ -18,10 +18,10 @@
#define W83627HF_GPEVR 0xf2 #define W83627HF_GPEVR 0xf2
#define W83627HF_GPCFG2 0xf3 #define W83627HF_GPCFG2 0xf3
#define W83627HF_EXTCFG 0xf4 #define W83627HF_EXTCFG 0xf4
#define W83627HF_IOEXT1A 0xf5 #define W83627HF_IOEXT1A 0xf5
#define W83627HF_IOEXT1B 0xf6 #define W83627HF_IOEXT1B 0xf6
#define W83627HF_IOEXT2A 0xf7 #define W83627HF_IOEXT2A 0xf7
#define W83627HF_IOEXT2B 0xf8 #define W83627HF_IOEXT2B 0xf8
#define W83627HF_GPDO_0 0x00 #define W83627HF_GPDO_0 0x00
#define W83627HF_GPDI_0 0x01 #define W83627HF_GPDI_0 0x01
@@ -40,26 +40,26 @@
#define W83627HF_GPDO_5 0x0e #define W83627HF_GPDO_5 0x0e
#define W83627HF_GPDI_5 0x0f #define W83627HF_GPDI_5 0x0f
#define W83627HF_GPDO_6 0x10 #define W83627HF_GPDO_6 0x10
#define W83627HF_GPDO_7A 0x11 #define W83627HF_GPDO_7A 0x11
#define W83627HF_GPDO_7B 0x12 #define W83627HF_GPDO_7B 0x12
#define W83627HF_GPDO_7C 0x13 #define W83627HF_GPDO_7C 0x13
#define W83627HF_GPDO_7D 0x14 #define W83627HF_GPDO_7D 0x14
#define W83627HF_GPDI_7A 0x15 #define W83627HF_GPDI_7A 0x15
#define W83627HF_GPDI_7B 0x16 #define W83627HF_GPDI_7B 0x16
#define W83627HF_GPDI_7C 0x17 #define W83627HF_GPDI_7C 0x17
#define W83627HF_GPDI_7D 0x18 #define W83627HF_GPDI_7D 0x18
#define W83627HF_XIOCNF 0xf0 #define W83627HF_XIOCNF 0xf0
#define W83627HF_XIOBA1H 0xf1 #define W83627HF_XIOBA1H 0xf1
#define W83627HF_XIOBA1L 0xf2 #define W83627HF_XIOBA1L 0xf2
#define W83627HF_XIOSIZE1 0xf3 #define W83627HF_XIOSIZE1 0xf3
#define W83627HF_XIOBA2H 0xf4 #define W83627HF_XIOBA2H 0xf4
#define W83627HF_XIOBA2L 0xf5 #define W83627HF_XIOBA2L 0xf5
#define W83627HF_XIOSIZE2 0xf6 #define W83627HF_XIOSIZE2 0xf6
#define W83627HF_XMEMCNF1 0xf7 #define W83627HF_XMEMCNF1 0xf7
#define W83627HF_XMEMCNF2 0xf8 #define W83627HF_XMEMCNF2 0xf8
#define W83627HF_XMEMBAH 0xf9 #define W83627HF_XMEMBAH 0xf9
#define W83627HF_XMEMBAL 0xfa #define W83627HF_XMEMBAL 0xfa
#define W83627HF_XMEMSIZE 0xfb #define W83627HF_XMEMSIZE 0xfb
#define W83627HF_XIRQMAP1 0xfc #define W83627HF_XIRQMAP1 0xfc
#define W83627HF_XIRQMAP2 0xfd #define W83627HF_XIRQMAP2 0xfd

8
src/superio/winbond/w83627hf/w83627hf_early_serial.c
View File

@@ -4,14 +4,16 @@
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; 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; unsigned port = dev>>8;
outb(0xaa, port); outb(0xaa, port);
} }
static void w83627hf_enable_serial(device_t dev, unsigned iobase) static void w83627hf_enable_serial(device_t dev, unsigned iobase)
{ {
pnp_enter_ext_func_mode(dev); pnp_enter_ext_func_mode(dev);