Author: stepan Date: Tue Apr 19 23:33:40 2011 New Revision: 6521 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6521
Log: Drop baud rate init to an arbitrary baud rate from Super I/O code.
See discussion at http://www.mail-archive.com/coreboot@coreboot.org/msg29394.html
config->com1, devicetree.cb cleanup and init_uart8250() removal will follow once this patch is comitted
Signed-off-by: Stefan Reinauer stefan.reinauer@coreboot.org Acked-by: Patrick Georgi patrick@georgi-clan.de
Updated to drop com1, com2.... from config structure and devicetree.cb
Modified: trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb trunk/src/mainboard/digitallogic/msm586seg/devicetree.cb trunk/src/mainboard/eaglelion/5bcm/devicetree.cb trunk/src/mainboard/emulation/qemu-x86/devicetree.cb trunk/src/mainboard/iei/juki-511p/devicetree.cb trunk/src/mainboard/iei/nova4899r/devicetree.cb trunk/src/mainboard/iwill/dk8s2/devicetree.cb trunk/src/mainboard/lanner/em8510/devicetree.cb trunk/src/mainboard/technologic/ts5300/devicetree.cb trunk/src/mainboard/via/epia/devicetree.cb trunk/src/superio/fintek/f71805f/chip.h trunk/src/superio/fintek/f71805f/superio.c trunk/src/superio/fintek/f71859/chip.h trunk/src/superio/fintek/f71859/superio.c trunk/src/superio/fintek/f71863fg/chip.h trunk/src/superio/fintek/f71863fg/superio.c trunk/src/superio/fintek/f71872/chip.h trunk/src/superio/fintek/f71872/superio.c trunk/src/superio/fintek/f71889/chip.h trunk/src/superio/fintek/f71889/superio.c trunk/src/superio/fintek/f81865f/chip.h trunk/src/superio/fintek/f81865f/superio.c trunk/src/superio/intel/i3100/chip.h trunk/src/superio/intel/i3100/superio.c trunk/src/superio/ite/it8661f/chip.h trunk/src/superio/ite/it8661f/superio.c trunk/src/superio/ite/it8671f/chip.h trunk/src/superio/ite/it8671f/superio.c trunk/src/superio/ite/it8673f/chip.h trunk/src/superio/ite/it8673f/superio.c trunk/src/superio/ite/it8705f/chip.h trunk/src/superio/ite/it8705f/superio.c trunk/src/superio/ite/it8712f/chip.h trunk/src/superio/ite/it8712f/superio.c trunk/src/superio/ite/it8716f/chip.h trunk/src/superio/ite/it8716f/superio.c trunk/src/superio/ite/it8718f/chip.h trunk/src/superio/ite/it8718f/superio.c trunk/src/superio/nsc/pc8374/chip.h trunk/src/superio/nsc/pc8374/superio.c trunk/src/superio/nsc/pc87309/chip.h trunk/src/superio/nsc/pc87309/superio.c trunk/src/superio/nsc/pc87351/chip.h trunk/src/superio/nsc/pc87351/superio.c trunk/src/superio/nsc/pc87360/chip.h trunk/src/superio/nsc/pc87360/superio.c trunk/src/superio/nsc/pc87366/chip.h trunk/src/superio/nsc/pc87366/superio.c trunk/src/superio/nsc/pc87382/chip.h trunk/src/superio/nsc/pc87382/superio.c trunk/src/superio/nsc/pc87384/chip.h trunk/src/superio/nsc/pc87384/superio.c trunk/src/superio/nsc/pc87392/chip.h trunk/src/superio/nsc/pc87392/superio.c trunk/src/superio/nsc/pc87417/chip.h trunk/src/superio/nsc/pc87417/superio.c trunk/src/superio/nsc/pc87427/chip.h trunk/src/superio/nsc/pc87427/superio.c trunk/src/superio/nsc/pc97307/chip.h trunk/src/superio/nsc/pc97307/superio.c trunk/src/superio/nsc/pc97317/chip.h trunk/src/superio/nsc/pc97317/superio.c trunk/src/superio/nuvoton/wpcm450/chip.h trunk/src/superio/nuvoton/wpcm450/superio.c trunk/src/superio/smsc/fdc37m60x/chip.h trunk/src/superio/smsc/fdc37m60x/superio.c trunk/src/superio/smsc/fdc37n972/chip.h trunk/src/superio/smsc/kbc1100/chip.h trunk/src/superio/smsc/lpc47b272/chip.h trunk/src/superio/smsc/lpc47b272/superio.c trunk/src/superio/smsc/lpc47b397/chip.h trunk/src/superio/smsc/lpc47b397/superio.c trunk/src/superio/smsc/lpc47m10x/chip.h trunk/src/superio/smsc/lpc47m10x/superio.c trunk/src/superio/smsc/lpc47m15x/chip.h trunk/src/superio/smsc/lpc47m15x/superio.c trunk/src/superio/smsc/lpc47n217/chip.h trunk/src/superio/smsc/lpc47n217/superio.c trunk/src/superio/smsc/lpc47n227/chip.h trunk/src/superio/smsc/lpc47n227/superio.c trunk/src/superio/smsc/sio10n268/chip.h trunk/src/superio/smsc/smscsuperio/chip.h trunk/src/superio/smsc/smscsuperio/superio.c trunk/src/superio/via/vt1211/chip.h trunk/src/superio/winbond/w83627dhg/chip.h trunk/src/superio/winbond/w83627dhg/superio.c trunk/src/superio/winbond/w83627ehg/chip.h trunk/src/superio/winbond/w83627ehg/superio.c trunk/src/superio/winbond/w83627hf/chip.h trunk/src/superio/winbond/w83627hf/superio.c trunk/src/superio/winbond/w83627thg/chip.h trunk/src/superio/winbond/w83627thg/superio.c trunk/src/superio/winbond/w83627uhg/chip.h trunk/src/superio/winbond/w83627uhg/superio.c trunk/src/superio/winbond/w83697hf/chip.h trunk/src/superio/winbond/w83697hf/superio.c trunk/src/superio/winbond/w83977f/chip.h trunk/src/superio/winbond/w83977f/superio.c trunk/src/superio/winbond/w83977tf/chip.h trunk/src/superio/winbond/w83977tf/superio.c
Modified: trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb ============================================================================== --- trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -45,9 +45,6 @@ device pnp 2e.b on # HW Monitor io 0x60 = 0x290 end - register "com1" = "{1}" - # register "com1" = "{1, 0, 0x3f8, 4}" - # register "lpt" = "{1}" end end end
Modified: trunk/src/mainboard/digitallogic/msm586seg/devicetree.cb ============================================================================== --- trunk/src/mainboard/digitallogic/msm586seg/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/digitallogic/msm586seg/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -3,8 +3,5 @@ device pci 0.0 on end device pci 12.0 on end # enet device pci 14.0 on end # 69000 -# register "com1" = "{1}" -# register "com1" = "{1, 0, 0x3f8, 4}" end - end
Modified: trunk/src/mainboard/eaglelion/5bcm/devicetree.cb ============================================================================== --- trunk/src/mainboard/eaglelion/5bcm/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/eaglelion/5bcm/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -36,8 +36,6 @@ device pnp 2e.8 on # Power Management io 0x60 = 0xe800 end - register "com1" = "{115200}" - register "com2" = "{38400}" end device pci 12.1 off end # SMI device pci 12.2 on end # IDE
Modified: trunk/src/mainboard/emulation/qemu-x86/devicetree.cb ============================================================================== --- trunk/src/mainboard/emulation/qemu-x86/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/emulation/qemu-x86/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -9,7 +9,5 @@ register "ide1_enable" = "1" end
-# register "com1" = "{1}" -# register "com1" = "{1, 0, 0x3f8, 4}" end end
Modified: trunk/src/mainboard/iei/juki-511p/devicetree.cb ============================================================================== --- trunk/src/mainboard/iei/juki-511p/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/iei/juki-511p/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -16,12 +16,10 @@ io 0x60 = 0x3f8 irq 0x70 = 4 end - register "com1" = "{115200}" device pnp 3f0.3 on # COM2 io 0x60 = 0x2f8 irq 0x70 = 3 end - register "com2" = "{115200}" device pnp 3f0.4 on # RTC io 0x60 = 0x070 irq 0x70 = 8
Modified: trunk/src/mainboard/iei/nova4899r/devicetree.cb ============================================================================== --- trunk/src/mainboard/iei/nova4899r/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/iei/nova4899r/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -19,12 +19,10 @@ io 0x60 = 0x3f8 irq 0x70 = 4 end - register "com1" = "{115200}" device pnp 2e.3 on # COM2 io 0x60 = 0x2f8 irq 0x70 = 3 end - register "com2" = "{115200}" device pnp 2e.4 off # Reserved end device pnp 2e.5 on # Keyboard
Modified: trunk/src/mainboard/iwill/dk8s2/devicetree.cb ============================================================================== --- trunk/src/mainboard/iwill/dk8s2/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/iwill/dk8s2/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -56,9 +56,6 @@ device pnp 2e.b on # HW Monitor io 0x60 = 0x290 end - register "com1" = "{1}" - # register "com1" = "{1, 0, 0x3f8, 4}" - # register "lpt" = "{1}" end end device pci 1.1 on end
Modified: trunk/src/mainboard/lanner/em8510/devicetree.cb ============================================================================== --- trunk/src/mainboard/lanner/em8510/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/lanner/em8510/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -44,9 +44,6 @@ device pnp 2e.b on # HW Monitor io 0x60 = 0x290 end - register "com1" = "{1}" - # register "com1" = "{1, 0, 0x3f8, 4}" - # register "lpt" = "{1}" end end end
Modified: trunk/src/mainboard/technologic/ts5300/devicetree.cb ============================================================================== --- trunk/src/mainboard/technologic/ts5300/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/technologic/ts5300/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -1,9 +1,6 @@ chip cpu/amd/sc520 device pci_domain 0 on device pci 0.0 on end - -# register "com1" = "{1}" -# register "com1" = "{1, 0, 0x3f8, 4}" end
end
Modified: trunk/src/mainboard/via/epia/devicetree.cb ============================================================================== --- trunk/src/mainboard/via/epia/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/via/epia/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -33,7 +33,6 @@ irq 0x70 = 1 irq 0x72 = 12 end - register "com1" = "{CONFIG_TTYS0_BAUD}" end device pnp 2e.6 off end # CIR device pnp 2e.7 off end # GAME_MIDI_GIPO1
Modified: trunk/src/superio/fintek/f71805f/chip.h ============================================================================== --- trunk/src/superio/fintek/f71805f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71805f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_fintek_f71805f_ops;
struct superio_fintek_f71805f_config { - struct uart8250 com1, com2; + };
#endif
Modified: trunk/src/superio/fintek/f71805f/superio.c ============================================================================== --- trunk/src/superio/fintek/f71805f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71805f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -40,23 +40,10 @@
static void f71805f_init(device_t dev) { - struct superio_fintek_f71805f_config *conf = dev->chip_info; - struct resource *res0; - if (!dev->enabled) return;
- switch(dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ - case F71805F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case F71805F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - } }
static void f71805f_pnp_set_resources(device_t dev)
Modified: trunk/src/superio/fintek/f71859/chip.h ============================================================================== --- trunk/src/superio/fintek/f71859/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71859/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_fintek_f71859_ops;
struct superio_fintek_f71859_config { - struct uart8250 com1, com2; + };
#endif
Modified: trunk/src/superio/fintek/f71859/superio.c ============================================================================== --- trunk/src/superio/fintek/f71859/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71859/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -41,19 +41,10 @@
static void f71859_init(device_t dev) { - struct superio_fintek_f71859_config *conf = dev->chip_info; - struct resource *res0; - if (!dev->enabled) return;
- switch(dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ - case F71859_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - } }
static void f71859_pnp_set_resources(device_t dev)
Modified: trunk/src/superio/fintek/f71863fg/chip.h ============================================================================== --- trunk/src/superio/fintek/f71863fg/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71863fg/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_fintek_f71863fg_ops;
struct superio_fintek_f71863fg_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/fintek/f71863fg/superio.c ============================================================================== --- trunk/src/superio/fintek/f71863fg/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71863fg/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -48,14 +48,6 @@
switch(dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ - case F71863FG_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case F71863FG_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case F71863FG_KBC: res0 = find_resource(dev, PNP_IDX_IO0); pc_keyboard_init(&conf->keyboard);
Modified: trunk/src/superio/fintek/f71872/chip.h ============================================================================== --- trunk/src/superio/fintek/f71872/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71872/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_fintek_f71872_ops;
struct superio_fintek_f71872_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/fintek/f71872/superio.c ============================================================================== --- trunk/src/superio/fintek/f71872/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71872/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -40,21 +40,12 @@ static void f71872_init(device_t dev) { struct superio_fintek_f71872_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ - case F71872_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case F71872_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case F71872_KBC: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/fintek/f71889/chip.h ============================================================================== --- trunk/src/superio/fintek/f71889/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71889/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_fintek_f71889_ops;
struct superio_fintek_f71889_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/fintek/f71889/superio.c ============================================================================== --- trunk/src/superio/fintek/f71889/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71889/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -41,21 +41,12 @@ static void f71889_init(device_t dev) { struct superio_fintek_f71889_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch (dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ - case F71889_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case F71889_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case F71889_KBC: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/fintek/f81865f/chip.h ============================================================================== --- trunk/src/superio/fintek/f81865f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f81865f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_fintek_f81865f_ops;
struct superio_fintek_f81865f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/fintek/f81865f/superio.c ============================================================================== --- trunk/src/superio/fintek/f81865f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f81865f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -40,21 +40,12 @@ static void f81865f_init(device_t dev) { struct superio_fintek_f81865f_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch (dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ - case F81865F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case F81865F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case F81865F_KBC: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/intel/i3100/chip.h ============================================================================== --- trunk/src/superio/intel/i3100/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/intel/i3100/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,6 @@ extern struct chip_operations superio_intel_i3100_ops;
struct superio_intel_i3100_config { - struct uart8250 com1, com2; };
#endif
Modified: trunk/src/superio/intel/i3100/superio.c ============================================================================== --- trunk/src/superio/intel/i3100/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/intel/i3100/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -40,24 +40,8 @@
static void i3100_init(device_t dev) { - struct superio_intel_i3100_config *conf; - struct resource *res0; - if (!dev->enabled) return; - - conf = dev->chip_info; - - switch (dev->path.pnp.device) { - case I3100_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case I3100_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - } }
static void i3100_pnp_set_resources(device_t dev)
Modified: trunk/src/superio/ite/it8661f/chip.h ============================================================================== --- trunk/src/superio/ite/it8661f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8661f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_ite_it8661f_ops;
struct superio_ite_it8661f_config { - struct uart8250 com1, com2; + };
#endif
Modified: trunk/src/superio/ite/it8661f/superio.c ============================================================================== --- trunk/src/superio/ite/it8661f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8661f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,23 +29,12 @@
static void init(device_t dev) { - struct superio_ite_it8661f_config *conf = dev->chip_info; - struct resource *res0; - if (!dev->enabled) return;
switch (dev->path.pnp.device) { case IT8661F_FDC: /* TODO. */ break; - case IT8661F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8661F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8661F_PP: /* TODO. */ break; case IT8661F_IR: /* TODO. */
Modified: trunk/src/superio/ite/it8671f/chip.h ============================================================================== --- trunk/src/superio/ite/it8671f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8671f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_ite_it8671f_ops;
struct superio_ite_it8671f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/ite/it8671f/superio.c ============================================================================== --- trunk/src/superio/ite/it8671f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8671f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,6 @@ static void init(device_t dev) { struct superio_ite_it8671f_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return; @@ -37,14 +36,6 @@ switch (dev->path.pnp.device) { case IT8671F_FDC: /* TODO. */ break; - case IT8671F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8671F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8671F_PP: /* TODO. */ break; case IT8671F_KBCK:
Modified: trunk/src/superio/ite/it8673f/chip.h ============================================================================== --- trunk/src/superio/ite/it8673f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8673f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_ite_it8673f_ops;
struct superio_ite_it8673f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/ite/it8673f/superio.c ============================================================================== --- trunk/src/superio/ite/it8673f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8673f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,6 @@ static void init(device_t dev) { struct superio_ite_it8673f_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return; @@ -37,14 +36,6 @@ switch (dev->path.pnp.device) { case IT8673F_FDC: /* TODO. */ break; - case IT8673F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8673F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8673F_PP: /* TODO. */ break; case IT8673F_FAN: /* TODO. */
Modified: trunk/src/superio/ite/it8705f/chip.h ============================================================================== --- trunk/src/superio/ite/it8705f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8705f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_ite_it8705f_ops;
struct superio_ite_it8705f_config { - struct uart8250 com1, com2; + };
#endif
Modified: trunk/src/superio/ite/it8705f/superio.c ============================================================================== --- trunk/src/superio/ite/it8705f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8705f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,6 @@ static void init(device_t dev) { struct superio_ite_it8705f_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return; @@ -36,14 +35,6 @@ switch (dev->path.pnp.device) { case IT8705F_FDC: /* TODO. */ break; - case IT8705F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8705F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8705F_PP: /* TODO. */ break; case IT8705F_EC: /* TODO. */
Modified: trunk/src/superio/ite/it8712f/chip.h ============================================================================== --- trunk/src/superio/ite/it8712f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8712f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_ite_it8712f_ops;
struct superio_ite_it8712f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/ite/it8712f/superio.c ============================================================================== --- trunk/src/superio/ite/it8712f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8712f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -46,7 +46,6 @@ static void it8712f_init(device_t dev) { struct superio_ite_it8712f_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return; @@ -54,14 +53,6 @@ switch (dev->path.pnp.device) { case IT8712F_FDC: /* TODO. */ break; - case IT8712F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8712F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8712F_PP: /* TODO. */ break; case IT8712F_EC: /* TODO. */
Modified: trunk/src/superio/ite/it8716f/chip.h ============================================================================== --- trunk/src/superio/ite/it8716f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8716f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_ite_it8716f_ops;
struct superio_ite_it8716f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/ite/it8716f/superio.c ============================================================================== --- trunk/src/superio/ite/it8716f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8716f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -85,14 +85,6 @@
/* TODO: FDC, PP, KBCM, MIDI, GAME, IR. */ switch (dev->path.pnp.device) { - case IT8716F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8716F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8716F_EC: res0 = find_resource(dev, PNP_IDX_IO0); #define EC_INDEX_PORT 5
Modified: trunk/src/superio/ite/it8718f/chip.h ============================================================================== --- trunk/src/superio/ite/it8718f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8718f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_ite_it8718f_ops;
struct superio_ite_it8718f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/ite/it8718f/superio.c ============================================================================== --- trunk/src/superio/ite/it8718f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8718f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,6 @@ static void init(device_t dev) { struct superio_ite_it8718f_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return; @@ -37,14 +36,6 @@ switch (dev->path.pnp.device) { case IT8718F_FDC: /* TODO. */ break; - case IT8718F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8718F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8718F_PP: /* TODO. */ break; case IT8718F_EC: /* TODO. */
Modified: trunk/src/superio/nsc/pc8374/chip.h ============================================================================== --- trunk/src/superio/nsc/pc8374/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc8374/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ #include <uart8250.h>
struct superio_nsc_pc8374_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/nsc/pc8374/superio.c ============================================================================== --- trunk/src/superio/nsc/pc8374/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc8374/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -34,20 +34,11 @@ static void init(device_t dev) { struct superio_nsc_pc8374_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case PC8374_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC8374_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC8374_KBCK: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/nsc/pc87309/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87309/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87309/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_nsc_pc87309_ops;
struct superio_nsc_pc87309_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/nsc/pc87309/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87309/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87309/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -30,20 +30,11 @@ static void init(device_t dev) { struct superio_nsc_pc87309_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch (dev->path.pnp.device) { - case PC87309_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87309_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC87309_KBCK: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/nsc/pc87351/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87351/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87351/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ #include <uart8250.h>
struct superio_nsc_pc87351_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/nsc/pc87351/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87351/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87351/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -34,20 +34,11 @@ static void init(device_t dev) { struct superio_nsc_pc87351_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case PC87351_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87351_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC87351_KBCK: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/nsc/pc87360/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87360/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87360/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ #include <uart8250.h>
struct superio_nsc_pc87360_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/nsc/pc87360/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87360/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87360/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -34,20 +34,11 @@ static void init(device_t dev) { struct superio_nsc_pc87360_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case PC87360_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87360_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC87360_KBCK: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/nsc/pc87366/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87366/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87366/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ #include <uart8250.h>
struct superio_nsc_pc87366_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/nsc/pc87366/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87366/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87366/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -34,20 +34,11 @@ static void init(device_t dev) { struct superio_nsc_pc87366_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case PC87366_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87366_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC87366_KBCK: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/nsc/pc87382/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87382/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87382/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -25,7 +25,7 @@ extern struct chip_operations superio_nsc_pc87382_ops;
struct superio_nsc_pc87382_config { - struct uart8250 com1, com2; + };
#endif
Modified: trunk/src/superio/nsc/pc87382/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87382/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87382/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -33,21 +33,11 @@ static void init(device_t dev) { struct superio_nsc_pc87382_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case PC87382_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87382_IR: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - case PC87382_DOCK: break;
Modified: trunk/src/superio/nsc/pc87384/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87384/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87384/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -25,7 +25,7 @@ extern struct chip_operations superio_nsc_pc87384_ops;
struct superio_nsc_pc87384_config { - struct uart8250 com1, com2; + };
#endif
Modified: trunk/src/superio/nsc/pc87384/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87384/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87384/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -33,21 +33,11 @@ static void init(device_t dev) { struct superio_nsc_pc87384_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case PC87384_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87384_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - case PC87384_GPIO: break; }
Modified: trunk/src/superio/nsc/pc87392/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87392/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87392/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -26,7 +26,7 @@ #include <uart8250.h>
struct superio_nsc_pc87392_config { - struct uart8250 com1, com2; + };
#endif
Modified: trunk/src/superio/nsc/pc87392/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87392/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87392/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -31,23 +31,8 @@
static void init(device_t dev) { - struct superio_nsc_pc87392_config *conf = dev->chip_info; - struct resource *res0; - if (!dev->enabled) return; - - switch(dev->path.pnp.device) { - case PC87392_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - - case PC87392_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - } }
static struct device_operations ops = {
Modified: trunk/src/superio/nsc/pc87417/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87417/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87417/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ #include <uart8250.h>
struct superio_nsc_pc87417_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/nsc/pc87417/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87417/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87417/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -35,20 +35,11 @@ static void init(device_t dev) { struct superio_nsc_pc87417_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case PC87417_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87417_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC87417_KBCK: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/nsc/pc87427/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87427/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87427/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ #include <uart8250.h>
struct superio_nsc_pc87427_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/nsc/pc87427/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87427/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87427/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -32,20 +32,11 @@ static void init(device_t dev) { struct superio_nsc_pc87427_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case PC87427_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87427_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC87427_KBCK: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/nsc/pc97307/chip.h ============================================================================== --- trunk/src/superio/nsc/pc97307/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc97307/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -34,7 +34,7 @@ #include <uart8250.h>
struct superio_nsc_pc97307_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; #endif
Modified: trunk/src/superio/nsc/pc97307/superio.c ============================================================================== --- trunk/src/superio/nsc/pc97307/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc97307/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,21 +29,12 @@ static void init(device_t dev) { struct superio_nsc_pc97307_config *conf = dev->chip_info; - struct resource *res0; u8 reg8;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case PC97307_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC97307_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC97307_KBCK: pnp_set_logical_device(dev); pnp_set_enable(dev, 0); /* Disable keyboard */
Modified: trunk/src/superio/nsc/pc97317/chip.h ============================================================================== --- trunk/src/superio/nsc/pc97317/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc97317/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -34,7 +34,7 @@ #include <uart8250.h>
struct superio_nsc_pc97317_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/nsc/pc97317/superio.c ============================================================================== --- trunk/src/superio/nsc/pc97317/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc97317/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,20 +29,11 @@ static void init(device_t dev) { struct superio_nsc_pc97317_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case PC97317_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC97317_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC97317_KBCK: pnp_set_logical_device(dev); pnp_set_enable(dev, 0); /* Disable keyboard */
Modified: trunk/src/superio/nuvoton/wpcm450/chip.h ============================================================================== --- trunk/src/superio/nuvoton/wpcm450/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nuvoton/wpcm450/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ #include <uart8250.h>
struct superio_nuvoton_wpcm450_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/nuvoton/wpcm450/superio.c ============================================================================== --- trunk/src/superio/nuvoton/wpcm450/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nuvoton/wpcm450/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -33,20 +33,11 @@ static void init(device_t dev) { struct superio_nuvoton_wpcm450_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case WPCM450_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case WPCM450_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case WPCM450_KBCK: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/smsc/fdc37m60x/chip.h ============================================================================== --- trunk/src/superio/smsc/fdc37m60x/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/fdc37m60x/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_smsc_fdc37m60x_ops;
struct superio_smsc_fdc37m60x_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/smsc/fdc37m60x/superio.c ============================================================================== --- trunk/src/superio/smsc/fdc37m60x/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/fdc37m60x/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,6 @@ static void init(device_t dev) { struct superio_smsc_fdc37m60x_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return; @@ -39,14 +38,6 @@ break; case FDC37M60X_PP: /* TODO. */ break; - case FDC37M60X_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case FDC37M60X_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case FDC37M60X_KBCK: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/smsc/fdc37n972/chip.h ============================================================================== --- trunk/src/superio/smsc/fdc37n972/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/fdc37n972/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_smsc_fdc37n972_ops;
struct superio_smsc_fdc37n972_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/smsc/kbc1100/chip.h ============================================================================== --- trunk/src/superio/smsc/kbc1100/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/kbc1100/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_smsc_kbc1100_ops;
struct superio_smsc_kbc1100_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/smsc/lpc47b272/chip.h ============================================================================== --- trunk/src/superio/smsc/lpc47b272/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47b272/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ #include <uart8250.h>
struct superio_smsc_lpc47b272_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/smsc/lpc47b272/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47b272/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47b272/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -120,20 +120,11 @@ static void lpc47b272_init(device_t dev) { struct superio_smsc_lpc47b272_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case LPC47B272_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case LPC47B272_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case LPC47B272_KBC: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/smsc/lpc47b397/chip.h ============================================================================== --- trunk/src/superio/smsc/lpc47b397/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47b397/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -30,7 +30,7 @@ #include <uart8250.h>
struct superio_smsc_lpc47b397_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/smsc/lpc47b397/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47b397/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47b397/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -68,20 +68,11 @@ static void lpc47b397_init(device_t dev) { struct superio_smsc_lpc47b397_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case LPC47B397_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case LPC47B397_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case LPC47B397_KBC: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/smsc/lpc47m10x/chip.h ============================================================================== --- trunk/src/superio/smsc/lpc47m10x/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47m10x/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -32,7 +32,7 @@ #include <uart8250.h>
struct superio_smsc_lpc47m10x_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/smsc/lpc47m10x/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47m10x/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47m10x/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -118,20 +118,11 @@ static void lpc47m10x_init(device_t dev) { struct superio_smsc_lpc47m10x_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case LPC47M10X2_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case LPC47M10X2_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case LPC47M10X2_KBC: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/smsc/lpc47m15x/chip.h ============================================================================== --- trunk/src/superio/smsc/lpc47m15x/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47m15x/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ #include <uart8250.h>
struct superio_smsc_lpc47m15x_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/smsc/lpc47m15x/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47m15x/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47m15x/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -94,20 +94,11 @@ static void lpc47m15x_init(device_t dev) { struct superio_smsc_lpc47m15x_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case LPC47M15X_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case LPC47M15X_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case LPC47M15X_KBC: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/smsc/lpc47n217/chip.h ============================================================================== --- trunk/src/superio/smsc/lpc47n217/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47n217/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ #include <uart8250.h>
struct superio_smsc_lpc47n217_config { - struct uart8250 com1, com2; + };
#endif
Modified: trunk/src/superio/smsc/lpc47n217/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47n217/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47n217/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -134,21 +134,9 @@ static void lpc47n217_init(device_t dev) { struct superio_smsc_lpc47n217_config* conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return; - - switch(dev->path.pnp.device) { - case LPC47N217_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case LPC47N217_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - } }
static void lpc47n217_pnp_set_resource(device_t dev, struct resource *resource)
Modified: trunk/src/superio/smsc/lpc47n227/chip.h ============================================================================== --- trunk/src/superio/smsc/lpc47n227/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47n227/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_smsc_lpc47n227_ops;
struct superio_smsc_lpc47n227_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/smsc/lpc47n227/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47n227/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47n227/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -131,20 +131,11 @@ static void lpc47n227_init(device_t dev) { struct superio_smsc_lpc47n227_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch (dev->path.pnp.device) { - case LPC47N227_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case LPC47N227_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case LPC47N227_KBDC: printk(BIOS_DEBUG, "LPC47N227: Initializing keyboard.\n"); pc_keyboard_init(&conf->keyboard);
Modified: trunk/src/superio/smsc/sio10n268/chip.h ============================================================================== --- trunk/src/superio/smsc/sio10n268/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/sio10n268/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_smsc_sio10n268_ops;
struct superio_smsc_sio10n268_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/smsc/smscsuperio/chip.h ============================================================================== --- trunk/src/superio/smsc/smscsuperio/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/smscsuperio/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_smsc_smscsuperio_ops;
struct superio_smsc_smscsuperio_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/smsc/smscsuperio/superio.c ============================================================================== --- trunk/src/superio/smsc/smscsuperio/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/smscsuperio/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -205,7 +205,6 @@ static void smsc_init(device_t dev) { struct superio_smsc_smscsuperio_config *conf = dev->chip_info; - struct resource *res0; int i, ld;
/* Do not initialize disabled devices. */ @@ -223,13 +222,7 @@
/* A Super I/O was found, so initialize the respective device. */ ld = dev->path.pnp.device; - if (ld == logical_device_table[i].devs[LD_SP1]) { - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - } else if (ld == logical_device_table[i].devs[LD_SP2]) { - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - } else if (ld == logical_device_table[i].devs[LD_KBC]) { + if (ld == logical_device_table[i].devs[LD_KBC]) { pc_keyboard_init(&conf->keyboard); } }
Modified: trunk/src/superio/via/vt1211/chip.h ============================================================================== --- trunk/src/superio/via/vt1211/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/via/vt1211/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -26,7 +26,7 @@ extern struct chip_operations superio_via_vt1211_ops;
struct superio_via_vt1211_config { - struct uart8250 com1, com2; + };
#endif
Modified: trunk/src/superio/winbond/w83627dhg/chip.h ============================================================================== --- trunk/src/superio/winbond/w83627dhg/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627dhg/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_winbond_w83627dhg_ops;
struct superio_winbond_w83627dhg_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/winbond/w83627dhg/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627dhg/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627dhg/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -40,20 +40,11 @@ static void w83627dhg_init(device_t dev) { struct superio_winbond_w83627dhg_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case W83627DHG_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83627DHG_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case W83627DHG_KBC: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/winbond/w83627ehg/chip.h ============================================================================== --- trunk/src/superio/winbond/w83627ehg/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627ehg/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_winbond_w83627ehg_ops;
struct superio_winbond_w83627ehg_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/winbond/w83627ehg/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627ehg/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627ehg/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -114,14 +114,6 @@ return;
switch(dev->path.pnp.device) { - case W83627EHG_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83627EHG_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case W83627EHG_KBC: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/winbond/w83627hf/chip.h ============================================================================== --- trunk/src/superio/winbond/w83627hf/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627hf/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_winbond_w83627hf_ops;
struct superio_winbond_w83627hf_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/winbond/w83627hf/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627hf/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627hf/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -135,14 +135,6 @@ return;
switch(dev->path.pnp.device) { - case W83627HF_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83627HF_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case W83627HF_KBC: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/winbond/w83627thg/chip.h ============================================================================== --- trunk/src/superio/winbond/w83627thg/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627thg/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_winbond_w83627thg_ops;
struct superio_winbond_w83627thg_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/winbond/w83627thg/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627thg/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627thg/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -45,20 +45,11 @@ static void w83627thg_init(device_t dev) { struct superio_winbond_w83627thg_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case W83627THG_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83627THG_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case W83627THG_KBC: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/winbond/w83627uhg/chip.h ============================================================================== --- trunk/src/superio/winbond/w83627uhg/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627uhg/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_winbond_w83627uhg_ops;
struct superio_winbond_w83627uhg_config { - struct uart8250 com1, com2, com3, com4, com5, com6; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/winbond/w83627uhg/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627uhg/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627uhg/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -73,41 +73,28 @@ static void w83627uhg_init(device_t dev) { struct superio_winbond_w83627uhg_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { case W83627UHG_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); /* set_uart_clock_source(dev, 0); */ - init_uart8250(res0->base, &conf->com1); break; case W83627UHG_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); /* set_uart_clock_source(dev, 0); */ - init_uart8250(res0->base, &conf->com2); break; case W83627UHG_SP3: - res0 = find_resource(dev, PNP_IDX_IO0); /* set_uart_clock_source(dev, 0); */ - init_uart8250(res0->base, &conf->com3); break; case W83627UHG_SP4: - res0 = find_resource(dev, PNP_IDX_IO0); /* set_uart_clock_source(dev, 0); */ - init_uart8250(res0->base, &conf->com4); break; case W83627UHG_SP5: - res0 = find_resource(dev, PNP_IDX_IO0); /* set_uart_clock_source(dev, 0); */ - init_uart8250(res0->base, &conf->com5); break; case W83627UHG_SP6: - res0 = find_resource(dev, PNP_IDX_IO0); /* set_uart_clock_source(dev, 0); */ - init_uart8250(res0->base, &conf->com6); break; case W83627UHG_KBC: pc_keyboard_init(&conf->keyboard);
Modified: trunk/src/superio/winbond/w83697hf/chip.h ============================================================================== --- trunk/src/superio/winbond/w83697hf/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83697hf/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -26,7 +26,7 @@ extern struct chip_operations superio_winbond_w83697hf_ops;
struct superio_winbond_w83697hf_config { - struct uart8250 com1, com2; + };
#endif
Modified: trunk/src/superio/winbond/w83697hf/superio.c ============================================================================== --- trunk/src/superio/winbond/w83697hf/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83697hf/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -43,22 +43,8 @@
static void w83697hf_init(device_t dev) { - struct superio_winbond_w83697hf_config *conf = dev->chip_info; - struct resource *res0; - if (!dev->enabled) return; - - switch(dev->path.pnp.device) { - case W83697HF_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83697HF_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - } }
static void w83697hf_pnp_set_resources(device_t dev)
Modified: trunk/src/superio/winbond/w83977f/chip.h ============================================================================== --- trunk/src/superio/winbond/w83977f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83977f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_winbond_w83977f_ops;
struct superio_winbond_w83977f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/winbond/w83977f/superio.c ============================================================================== --- trunk/src/superio/winbond/w83977f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83977f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -44,20 +44,11 @@ static void w83977f_init(device_t dev) { struct superio_winbond_w83977f_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case W83977F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83977F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case W83977F_KBC: pc_keyboard_init(&conf->keyboard); break;
Modified: trunk/src/superio/winbond/w83977tf/chip.h ============================================================================== --- trunk/src/superio/winbond/w83977tf/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83977tf/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_winbond_w83977tf_ops;
struct superio_winbond_w83977tf_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; };
Modified: trunk/src/superio/winbond/w83977tf/superio.c ============================================================================== --- trunk/src/superio/winbond/w83977tf/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83977tf/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -46,20 +46,11 @@ static void w83977tf_init(device_t dev) { struct superio_winbond_w83977tf_config *conf = dev->chip_info; - struct resource *res0;
if (!dev->enabled) return;
switch(dev->path.pnp.device) { - case W83977TF_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83977TF_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case W83977TF_KBC: pc_keyboard_init(&conf->keyboard); break;