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

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6521 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/digitallogic/adl855pc/devicetree.cb b/src/mainboard/digitallogic/adl855pc/devicetree.cb
index 756cb50f9e76eb196dbc6ceeda84eeb386aea4ea..c514aca3b95a9ca69e5efdb866551f4ac2ee7efd 100644 (file)
--- a/src/mainboard/digitallogic/adl855pc/devicetree.cb
+++ b/src/mainboard/digitallogic/adl855pc/devicetree.cb
@@ -45,9 +45,6 @@ chip northbridge/intel/i855
                                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

diff --git a/src/mainboard/digitallogic/msm586seg/devicetree.cb b/src/mainboard/digitallogic/msm586seg/devicetree.cb
index 1ccf39f5b80700b20f75b39f4aa0b5a9a89b6881..9579b1166e14a2c743c90e55c015e41ebacd6420 100644 (file)
--- a/src/mainboard/digitallogic/msm586seg/devicetree.cb
+++ b/src/mainboard/digitallogic/msm586seg/devicetree.cb
@@ -3,8 +3,5 @@ chip cpu/amd/sc520
                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

diff --git a/src/mainboard/eaglelion/5bcm/devicetree.cb b/src/mainboard/eaglelion/5bcm/devicetree.cb
index 7e55bca54d0e6467b5d6f84b8e775d2b0bb70495..a08ffd4e3db880a26e3d86d2fc1940151f92fd2f 100644 (file)
--- a/src/mainboard/eaglelion/5bcm/devicetree.cb
+++ b/src/mainboard/eaglelion/5bcm/devicetree.cb
@@ -36,8 +36,6 @@ chip northbridge/amd/gx1
             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

diff --git a/src/mainboard/emulation/qemu-x86/devicetree.cb b/src/mainboard/emulation/qemu-x86/devicetree.cb
index 471cc331e13f80ff0280bd7665ebc84ffd8deb69..4c64d4a1d9e50782883932c6c3d542939b662d0c 100644 (file)
--- a/src/mainboard/emulation/qemu-x86/devicetree.cb
+++ b/src/mainboard/emulation/qemu-x86/devicetree.cb
@@ -9,7 +9,5 @@ chip mainboard/emulation/qemu-x86
                        register "ide1_enable" = "1"
                end
 
-#              register "com1" = "{1}"
-#              register "com1" = "{1, 0, 0x3f8, 4}"
        end
 end

diff --git a/src/mainboard/iei/juki-511p/devicetree.cb b/src/mainboard/iei/juki-511p/devicetree.cb
index 486fbd5131aca5e739702f08d9ef56b74bad4f5a..be5f064b5c6969f0e0419e58f0aaf3be735a6f9f 100644 (file)
--- a/src/mainboard/iei/juki-511p/devicetree.cb
+++ b/src/mainboard/iei/juki-511p/devicetree.cb
@@ -16,12 +16,10 @@ chip northbridge/amd/gx1
               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

diff --git a/src/mainboard/iei/nova4899r/devicetree.cb b/src/mainboard/iei/nova4899r/devicetree.cb
index f26db4258a2828fa4b33aaff1960b76b46b36723..e6a0c8000afe1587de2d720da10abeed1f6e9131 100644 (file)
--- a/src/mainboard/iei/nova4899r/devicetree.cb
+++ b/src/mainboard/iei/nova4899r/devicetree.cb
@@ -19,12 +19,10 @@ chip northbridge/amd/gx1
                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

diff --git a/src/mainboard/iwill/dk8s2/devicetree.cb b/src/mainboard/iwill/dk8s2/devicetree.cb
index 35b230735f02c74159874b9aa9c06c163d2877c3..f234c35030995c00a0c55eb48420edb9603213f4 100644 (file)
--- a/src/mainboard/iwill/dk8s2/devicetree.cb
+++ b/src/mainboard/iwill/dk8s2/devicetree.cb
@@ -56,9 +56,6 @@ chip northbridge/amd/amdk8/root_complex
                                                        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

diff --git a/src/mainboard/lanner/em8510/devicetree.cb b/src/mainboard/lanner/em8510/devicetree.cb
index 5784a16981151aa3f3521872f00388cd3a9a5955..5f17fba36ab8dbf49b45aa956a149f379952039a 100644 (file)
--- a/src/mainboard/lanner/em8510/devicetree.cb
+++ b/src/mainboard/lanner/em8510/devicetree.cb
@@ -44,9 +44,6 @@ chip northbridge/intel/i855
                                        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

diff --git a/src/mainboard/technologic/ts5300/devicetree.cb b/src/mainboard/technologic/ts5300/devicetree.cb
index a0f05791af2bfb8ccdd6aa6beaffaffe761c9e85..9fddf734ddff3fb96d47d1838ea9bc0550808216 100644 (file)
--- a/src/mainboard/technologic/ts5300/devicetree.cb
+++ b/src/mainboard/technologic/ts5300/devicetree.cb
@@ -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

diff --git a/src/mainboard/via/epia/devicetree.cb b/src/mainboard/via/epia/devicetree.cb
index 1e19a32c22012c0d631366112b6568c3a1e84e3f..b883e56d889b0f232c23d4f74284b1c5f70200e9 100644 (file)
--- a/src/mainboard/via/epia/devicetree.cb
+++ b/src/mainboard/via/epia/devicetree.cb
@@ -33,7 +33,6 @@ chip northbridge/via/vt8601
                                          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

diff --git a/src/superio/fintek/f71805f/chip.h b/src/superio/fintek/f71805f/chip.h
index 3ab1a7c2e258faed90ea09c51cfba5d0fa6aeee3..6e9c6c92419bcafd0164793397d617bd7b01938f 100644 (file)
--- a/src/superio/fintek/f71805f/chip.h
+++ b/src/superio/fintek/f71805f/chip.h
@@ -29,7 +29,7 @@
 extern struct chip_operations superio_fintek_f71805f_ops;
 
 struct superio_fintek_f71805f_config {
-       struct uart8250 com1, com2;
+       
 };
 
 #endif

diff --git a/src/superio/fintek/f71805f/superio.c b/src/superio/fintek/f71805f/superio.c
index 6b2b9c2df65dd97f29a8039f5fc0d33e94de2b35..5f179466ca0f7e1ef68dbd66d4fc917a42f401ec 100644 (file)
--- a/src/superio/fintek/f71805f/superio.c
+++ b/src/superio/fintek/f71805f/superio.c
@@ -40,23 +40,10 @@ static void pnp_exit_conf_state(device_t dev)
 
 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)

diff --git a/src/superio/fintek/f71859/chip.h b/src/superio/fintek/f71859/chip.h
index a0de2d59825a880504c80bc0a653e0d209f424a2..84008623e1dcabf39c8b3b770af06c1032c31daf 100755 (executable)
--- a/src/superio/fintek/f71859/chip.h
+++ b/src/superio/fintek/f71859/chip.h
@@ -27,7 +27,7 @@
 extern struct chip_operations superio_fintek_f71859_ops;
 
 struct superio_fintek_f71859_config {
-       struct uart8250 com1, com2;
+       
 };
 
 #endif

diff --git a/src/superio/fintek/f71859/superio.c b/src/superio/fintek/f71859/superio.c
index 6c74d815169306befea1f67ceef2067877511c00..809140b5a1834ff4fb2f47fc66dd6f172f381b2e 100755 (executable)
--- a/src/superio/fintek/f71859/superio.c
+++ b/src/superio/fintek/f71859/superio.c
@@ -41,19 +41,10 @@ static void pnp_exit_conf_state(device_t dev)
 
 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)

diff --git a/src/superio/fintek/f71863fg/chip.h b/src/superio/fintek/f71863fg/chip.h
index 5ccfa5bd764534f0e9167c6452edfd09f5a66baa..ce9fd480b22e6f5805213f02c3b4a6720672309d 100644 (file)
--- a/src/superio/fintek/f71863fg/chip.h
+++ b/src/superio/fintek/f71863fg/chip.h
@@ -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;
 };
 

diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c
index 3c7ebd277af1518794abe49621ef655add6a1559..62f5f8cfa1574fa6c7e09484b1cae914f6718c03 100644 (file)
--- a/src/superio/fintek/f71863fg/superio.c
+++ b/src/superio/fintek/f71863fg/superio.c
@@ -48,14 +48,6 @@ static void f71863fg_init(device_t dev)
 
        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);

diff --git a/src/superio/fintek/f71872/chip.h b/src/superio/fintek/f71872/chip.h
index 6625711a68fcb635e3efe7254694b0c7ee6d8401..58ee4217ca0cb41401cb17988513ad1204632e17 100644 (file)
--- a/src/superio/fintek/f71872/chip.h
+++ b/src/superio/fintek/f71872/chip.h
@@ -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;
 };
 

diff --git a/src/superio/fintek/f71872/superio.c b/src/superio/fintek/f71872/superio.c
index 0e1f4d0169f750ddb7e18266294e76641946ef41..987f53691b08e6456a0977f2b03321a0b71d0d64 100644 (file)
--- a/src/superio/fintek/f71872/superio.c
+++ b/src/superio/fintek/f71872/superio.c
@@ -40,21 +40,12 @@ static void pnp_exit_conf_state(device_t dev)
 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;

diff --git a/src/superio/fintek/f71889/chip.h b/src/superio/fintek/f71889/chip.h
index b4357b201836caa4fded1124132f0a128a9d2157..c7752164cbe7519ad2e7b3e7791c99f30cf4f466 100644 (file)
--- a/src/superio/fintek/f71889/chip.h
+++ b/src/superio/fintek/f71889/chip.h
@@ -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;
 };
 

diff --git a/src/superio/fintek/f71889/superio.c b/src/superio/fintek/f71889/superio.c
index 5f4ca3fc23ff7633293c9393ef18c03d3f0ff84e..bed421aa24e2c384a4fac85f133d08f599db82b1 100644 (file)
--- a/src/superio/fintek/f71889/superio.c
+++ b/src/superio/fintek/f71889/superio.c
@@ -41,21 +41,12 @@ static void pnp_exit_conf_state(device_t dev)
 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;

diff --git a/src/superio/fintek/f81865f/chip.h b/src/superio/fintek/f81865f/chip.h
index 2789e2805fa258be233b784acff82843a092e51a..6ff30012ca10ff164bb22cfaa5affc409b589fa5 100644 (file)
--- a/src/superio/fintek/f81865f/chip.h
+++ b/src/superio/fintek/f81865f/chip.h
@@ -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;
 };
 

diff --git a/src/superio/fintek/f81865f/superio.c b/src/superio/fintek/f81865f/superio.c
index dd964e4e23760af8c237a34ad4bbd3af3ff6413c..7c5c2d22051db661f702fb16f35191bd36e85c5f 100644 (file)
--- a/src/superio/fintek/f81865f/superio.c
+++ b/src/superio/fintek/f81865f/superio.c
@@ -40,21 +40,12 @@ static void pnp_exit_conf_state(device_t dev)
 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;

diff --git a/src/superio/intel/i3100/chip.h b/src/superio/intel/i3100/chip.h
index e6666e5bbf87c7ec4886e5b4345cec65c7d409b2..4ed322527af2c079b30d936133c584fcc9f8d633 100644 (file)
--- a/src/superio/intel/i3100/chip.h
+++ b/src/superio/intel/i3100/chip.h
@@ -27,7 +27,6 @@
 extern struct chip_operations superio_intel_i3100_ops;
 
 struct superio_intel_i3100_config {
-       struct uart8250 com1, com2;
 };
 
 #endif

diff --git a/src/superio/intel/i3100/superio.c b/src/superio/intel/i3100/superio.c
index 143e649ed7e4a6e7d9168f266ad38eea27d80d5c..74862eb6ffad5d13e02d7c8e38fa2a8f45c88e85 100644 (file)
--- a/src/superio/intel/i3100/superio.c
+++ b/src/superio/intel/i3100/superio.c
@@ -40,24 +40,8 @@ static void pnp_exit_ext_func_mode(device_t dev)
 
 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)

diff --git a/src/superio/ite/it8661f/chip.h b/src/superio/ite/it8661f/chip.h
index 81cf1fc03d7b8135dfebee3b18c53ffcfdcb2263..744316e0e43574c588100ba5389512fcec13f6e3 100644 (file)
--- a/src/superio/ite/it8661f/chip.h
+++ b/src/superio/ite/it8661f/chip.h
@@ -29,7 +29,7 @@
 extern struct chip_operations superio_ite_it8661f_ops;
 
 struct superio_ite_it8661f_config {
-       struct uart8250 com1, com2;
+       
 };
 
 #endif

diff --git a/src/superio/ite/it8661f/superio.c b/src/superio/ite/it8661f/superio.c
index 165a6384d2d9fcb7962c2a85f071871fdb2f68fd..fcf54e7dc326543d7c64b4170ac751e512a85128 100644 (file)
--- a/src/superio/ite/it8661f/superio.c
+++ b/src/superio/ite/it8661f/superio.c
@@ -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. */

diff --git a/src/superio/ite/it8671f/chip.h b/src/superio/ite/it8671f/chip.h
index 529c6b44580bf574deac4e6a609f6196a8de8529..3dd2d81a5b2d81faa78cf0943b73e7f6168776d2 100644 (file)
--- a/src/superio/ite/it8671f/chip.h
+++ b/src/superio/ite/it8671f/chip.h
@@ -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;
 };
 

diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c
index 1045a2ad073ffb8800ec2cdb4d506aef003db0bd..4b5577257ebc56269fb7b4bd1132e08b56c709b5 100644 (file)
--- a/src/superio/ite/it8671f/superio.c
+++ b/src/superio/ite/it8671f/superio.c
@@ -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 @@ static void init(device_t dev)
        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:

diff --git a/src/superio/ite/it8673f/chip.h b/src/superio/ite/it8673f/chip.h
index bfb6d72b37e6188e9377d70b1731a03f6948e4d8..431098e4337b1a756b6699aa9b147f4513f34cbe 100644 (file)
--- a/src/superio/ite/it8673f/chip.h
+++ b/src/superio/ite/it8673f/chip.h
@@ -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;
 };
 

diff --git a/src/superio/ite/it8673f/superio.c b/src/superio/ite/it8673f/superio.c
index 8acca88baecb232497bebd2dc705e48c850030c2..910380021019ec4a9a2a7b4e80fd63cbf3c87397 100644 (file)
--- a/src/superio/ite/it8673f/superio.c
+++ b/src/superio/ite/it8673f/superio.c
@@ -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 @@ static void init(device_t dev)
        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. */

diff --git a/src/superio/ite/it8705f/chip.h b/src/superio/ite/it8705f/chip.h
index 0697ac77b4058e34b12e578312c6c3f01ff92cfa..be4a8d7b6d5a11a262afc4e6aaf371ae875fe81f 100644 (file)
--- a/src/superio/ite/it8705f/chip.h
+++ b/src/superio/ite/it8705f/chip.h
@@ -29,7 +29,7 @@
 extern struct chip_operations superio_ite_it8705f_ops;
 
 struct superio_ite_it8705f_config {
-       struct uart8250 com1, com2;
+       
 };
 
 #endif

diff --git a/src/superio/ite/it8705f/superio.c b/src/superio/ite/it8705f/superio.c
index 1797023a2b78e0ea9b088f40ebdea90816d5e0fe..8f14a34c537bc9a24795544e2897e38527616d1a 100644 (file)
--- a/src/superio/ite/it8705f/superio.c
+++ b/src/superio/ite/it8705f/superio.c
@@ -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 @@ static void init(device_t dev)
        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. */

diff --git a/src/superio/ite/it8712f/chip.h b/src/superio/ite/it8712f/chip.h
index 844d4df7a0ef8c292fe9933b020e1dc5b87173af..76401099dff6a1d5ffd7f269d3247b1e7bace00c 100644 (file)
--- a/src/superio/ite/it8712f/chip.h
+++ b/src/superio/ite/it8712f/chip.h
@@ -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;
 };
 

diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c
index c84a92916fc4f26637ad79dc302e366b5fea05c5..0265d35f5f1bf2f82f45e4628353fff94ccb9e18 100644 (file)
--- a/src/superio/ite/it8712f/superio.c
+++ b/src/superio/ite/it8712f/superio.c
@@ -46,7 +46,6 @@ static void pnp_exit_ext_func_mode(device_t dev)
 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 @@ static void it8712f_init(device_t dev)
        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. */

diff --git a/src/superio/ite/it8716f/chip.h b/src/superio/ite/it8716f/chip.h
index be6e0a10c19ffb22b65244de5629b73aaf8d8f50..0c2f387a3e7a6608862db0f1c98643b57ed73e2f 100644 (file)
--- a/src/superio/ite/it8716f/chip.h
+++ b/src/superio/ite/it8716f/chip.h
@@ -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;
 };
 

diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c
index c7109465b55c84b757507227890de5835da4e63a..46d5c979fd1253c88b377b848634c61eacce37cc 100644 (file)
--- a/src/superio/ite/it8716f/superio.c
+++ b/src/superio/ite/it8716f/superio.c
@@ -85,14 +85,6 @@ static void it8716f_init(device_t dev)
 
        /* 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

diff --git a/src/superio/ite/it8718f/chip.h b/src/superio/ite/it8718f/chip.h
index b0ee40566c429df2d0eb2cd8d546da8d2e577eb7..78044aa1d792a1f44d61b97866b39f3ee1bbdd55 100644 (file)
--- a/src/superio/ite/it8718f/chip.h
+++ b/src/superio/ite/it8718f/chip.h
@@ -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;
 };
 

diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c
index 2190578f6a648017aba78cd0319580e44effb631..8a6c8b813ca18c45a9a4e1e4232988ffc908bf12 100644 (file)
--- a/src/superio/ite/it8718f/superio.c
+++ b/src/superio/ite/it8718f/superio.c
@@ -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 @@ static void init(device_t dev)
        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. */

diff --git a/src/superio/nsc/pc8374/chip.h b/src/superio/nsc/pc8374/chip.h
index 9e5e8dda856469188cd1a31a2fba40059383fa57..ec0a57a61797e9cdd106e3e57feadb2617a75a3e 100644 (file)
--- a/src/superio/nsc/pc8374/chip.h
+++ b/src/superio/nsc/pc8374/chip.h
@@ -29,7 +29,7 @@ extern struct chip_operations superio_nsc_pc8374_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc8374_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 

diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c
index 0dd33d597e6d40875cd745835950501dd8b7b1ca..d5060c4d0595b5968c7921db7688718cf08bd3ca 100644 (file)
--- a/src/superio/nsc/pc8374/superio.c
+++ b/src/superio/nsc/pc8374/superio.c
@@ -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;

diff --git a/src/superio/nsc/pc87309/chip.h b/src/superio/nsc/pc87309/chip.h
index fd4c0cc9c6f690ed80149b977a74a8edd0cfe12d..8a612245bd6719662683313cf8eb17df5025a159 100644 (file)
--- a/src/superio/nsc/pc87309/chip.h
+++ b/src/superio/nsc/pc87309/chip.h
@@ -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;
 };
 

diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index e3f7b7b0fef3dc4dfa2b3165ae0ae41ee5008189..6e56e38e86a5ed7d67e37c7186c56f3d2f10c0b6 100644 (file)
--- a/src/superio/nsc/pc87309/superio.c
+++ b/src/superio/nsc/pc87309/superio.c
@@ -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;

diff --git a/src/superio/nsc/pc87351/chip.h b/src/superio/nsc/pc87351/chip.h
index 44af196c64e588c14c48aeea7a8cddfe0570ccfd..cb835c7963043ff494d8bcc546f1380745b3729f 100644 (file)
--- a/src/superio/nsc/pc87351/chip.h
+++ b/src/superio/nsc/pc87351/chip.h
@@ -29,7 +29,7 @@ extern struct chip_operations superio_nsc_pc87351_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc87351_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 

diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c
index aa8c6fdae05c2f00086efc46918c843b5765470c..259430e0f592d863ab82a46abb0858e7c9f2b493 100644 (file)
--- a/src/superio/nsc/pc87351/superio.c
+++ b/src/superio/nsc/pc87351/superio.c
@@ -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;

diff --git a/src/superio/nsc/pc87360/chip.h b/src/superio/nsc/pc87360/chip.h
index 57bc26ac660caefbd603324b03f61ebe351f52bb..712176dd8afe8338d038d013b87d3bcead468f2b 100644 (file)
--- a/src/superio/nsc/pc87360/chip.h
+++ b/src/superio/nsc/pc87360/chip.h
@@ -29,7 +29,7 @@ extern struct chip_operations superio_nsc_pc87360_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc87360_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 

diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index b6cd729e8136badaa348c812865f6ffb4772be40..5da68e2c119c430105bbd33959623f5aa4c3a4fb 100644 (file)
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -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;

diff --git a/src/superio/nsc/pc87366/chip.h b/src/superio/nsc/pc87366/chip.h
index ec37a3d93e65aaa362b96d74b065cab4fd89b0c7..75ce691ac0f440b2e6d7bea360f7916aa1bdc16e 100644 (file)
--- a/src/superio/nsc/pc87366/chip.h
+++ b/src/superio/nsc/pc87366/chip.h
@@ -28,7 +28,7 @@ extern struct chip_operations superio_nsc_pc87366_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc87366_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 

diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index af8f8993a2fdb8b1fcfeeb0690369477698facb3..b5f28700ec9c2654a3702fe08f1ed86d60b1c595 100644 (file)
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -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;

diff --git a/src/superio/nsc/pc87382/chip.h b/src/superio/nsc/pc87382/chip.h
index 316f9645a3a64ef09cb8d48b48caaaea1096fb69..18d570ad1e49f160300568ed66d917ecb01a3774 100644 (file)
--- a/src/superio/nsc/pc87382/chip.h
+++ b/src/superio/nsc/pc87382/chip.h
@@ -25,7 +25,7 @@
 extern struct chip_operations superio_nsc_pc87382_ops;
 
 struct superio_nsc_pc87382_config {
-       struct uart8250 com1, com2;
+       
 };
 
 #endif

diff --git a/src/superio/nsc/pc87382/superio.c b/src/superio/nsc/pc87382/superio.c
index fd9fdc55d729bbbe79a5b233990215c1e8b283d5..4a4fbde38747c0fc88fa1855a427bfb8f20b5e1c 100644 (file)
--- a/src/superio/nsc/pc87382/superio.c
+++ b/src/superio/nsc/pc87382/superio.c
@@ -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;
 

diff --git a/src/superio/nsc/pc87384/chip.h b/src/superio/nsc/pc87384/chip.h
index 4eaa92f3ec3bffb8dec3fe3aa14c4842d5e37e82..d0064789623a1ddb10db08766e7599c6f7c0f247 100644 (file)
--- a/src/superio/nsc/pc87384/chip.h
+++ b/src/superio/nsc/pc87384/chip.h
@@ -25,7 +25,7 @@
 extern struct chip_operations superio_nsc_pc87384_ops;
 
 struct superio_nsc_pc87384_config {
-       struct uart8250 com1, com2;
+       
 };
 
 #endif

diff --git a/src/superio/nsc/pc87384/superio.c b/src/superio/nsc/pc87384/superio.c
index 5bd318fb3d9f7b64982e6a5f50ab6b735ea59481..b6ac07c7fd58d6a3881751df4c0aea2a8e38dca0 100644 (file)
--- a/src/superio/nsc/pc87384/superio.c
+++ b/src/superio/nsc/pc87384/superio.c
@@ -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;
        }

diff --git a/src/superio/nsc/pc87392/chip.h b/src/superio/nsc/pc87392/chip.h
index 0465d21b7fec29171e6c922e5630a586ac9a67db..1241cb2f44a86e23c352fcd878d277869c7fa2e2 100644 (file)
--- a/src/superio/nsc/pc87392/chip.h
+++ b/src/superio/nsc/pc87392/chip.h
@@ -26,7 +26,7 @@ extern struct chip_operations superio_nsc_pc87392_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc87392_config {
-       struct uart8250 com1, com2;
+       
 };
 
 #endif

diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c
index 30bf563897ca740c4a6e21b6c9c2a5ba17b1a8af..1b527ad679d874a53db6ff522d1065ff8abb3567 100644 (file)
--- a/src/superio/nsc/pc87392/superio.c
+++ b/src/superio/nsc/pc87392/superio.c
@@ -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 = {

diff --git a/src/superio/nsc/pc87417/chip.h b/src/superio/nsc/pc87417/chip.h
index 1b661ef8af6ee04c413918b42cfa8e0ffa9058be..a66bb40a97c757540b4adf45048fb21dd5bf8564 100644 (file)
--- a/src/superio/nsc/pc87417/chip.h
+++ b/src/superio/nsc/pc87417/chip.h
@@ -29,7 +29,7 @@ extern struct chip_operations superio_nsc_pc87417_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc87417_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 

diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index fede61e6bd74a2e0a9d778d72a36274f34d5f2a9..9cd0e6bd4d208dd51f59f861fc8703e0e79441e0 100644 (file)
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -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;

diff --git a/src/superio/nsc/pc87427/chip.h b/src/superio/nsc/pc87427/chip.h
index 531e2df58e1bed80432367ae771c7b593c820227..d044fe09ff73304587b875fedc0a179e333b0c51 100644 (file)
--- a/src/superio/nsc/pc87427/chip.h
+++ b/src/superio/nsc/pc87427/chip.h
@@ -28,7 +28,7 @@ extern struct chip_operations superio_nsc_pc87427_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc87427_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 

diff --git a/src/superio/nsc/pc87427/superio.c b/src/superio/nsc/pc87427/superio.c
index 088fd0aa6f76d13c83dd48183389c7b347bc1aa8..3646fd1e1af4ce9ce0b37a76956403966a340ed2 100644 (file)
--- a/src/superio/nsc/pc87427/superio.c
+++ b/src/superio/nsc/pc87427/superio.c
@@ -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;

diff --git a/src/superio/nsc/pc97307/chip.h b/src/superio/nsc/pc97307/chip.h
index 43e8044ea5edc77178072064ee91c39ecbb190d5..838d36b9e2131a95a65d56158a302e2bea160206 100644 (file)
--- a/src/superio/nsc/pc97307/chip.h
+++ b/src/superio/nsc/pc97307/chip.h
@@ -34,7 +34,7 @@ extern struct chip_operations superio_nsc_pc97307_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc97307_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 #endif

diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c
index b8ae944153920b8fff3bb7d4ef9c39adc36f6399..db10a75c979dd49982656c772d92370886dc6e04 100644 (file)
--- a/src/superio/nsc/pc97307/superio.c
+++ b/src/superio/nsc/pc97307/superio.c
@@ -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 */

diff --git a/src/superio/nsc/pc97317/chip.h b/src/superio/nsc/pc97317/chip.h
index 798561ba36c7103bca59bac83472c0431c5f2ea3..6c415f6aee0eba0090c2bcb55c712419975c6184 100644 (file)
--- a/src/superio/nsc/pc97317/chip.h
+++ b/src/superio/nsc/pc97317/chip.h
@@ -34,7 +34,7 @@ extern struct chip_operations superio_nsc_pc97317_ops;
 #include <uart8250.h>
 
 struct superio_nsc_pc97317_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 

diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index 5d7824f11794711007375e54d881541ebdcb217a..7157f9b5622206c7bbdea297b6e95f3b49c4f0ce 100644 (file)
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -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 */

diff --git a/src/superio/nuvoton/wpcm450/chip.h b/src/superio/nuvoton/wpcm450/chip.h
index a5fdba76e2fabbd9451f52970632aec05d270c39..2afc2de5975a907c55e265c9feef2d7942f2be16 100644 (file)
--- a/src/superio/nuvoton/wpcm450/chip.h
+++ b/src/superio/nuvoton/wpcm450/chip.h
@@ -28,7 +28,7 @@ extern struct chip_operations superio_nuvoton_wpcm450_ops;
 #include <uart8250.h>
 
 struct superio_nuvoton_wpcm450_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 

diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c
index e97be7a1989ed19568cf995ed2468758b14d038b..879f40591eb91b0a1901e5230f08cf604bc2cdb0 100644 (file)
--- a/src/superio/nuvoton/wpcm450/superio.c
+++ b/src/superio/nuvoton/wpcm450/superio.c
@@ -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;

diff --git a/src/superio/smsc/fdc37m60x/chip.h b/src/superio/smsc/fdc37m60x/chip.h
index eca64223424eff79fde1a4e250e333a6f3ad0516..2a1186fe0eea3ef687e3964781141961efd8bcd8 100644 (file)
--- a/src/superio/smsc/fdc37m60x/chip.h
+++ b/src/superio/smsc/fdc37m60x/chip.h
@@ -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;
 };
 

diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c
index d074c648deed9439a9bcfd758098e8f9cc65c0ee..c49e978d041343d32d8eaf80227ef1a1615ab3d9 100644 (file)
--- a/src/superio/smsc/fdc37m60x/superio.c
+++ b/src/superio/smsc/fdc37m60x/superio.c
@@ -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 @@ static void init(device_t dev)
                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;

diff --git a/src/superio/smsc/fdc37n972/chip.h b/src/superio/smsc/fdc37n972/chip.h
index 0d8c18a8cba8db16a6a2f020fd86df5eded84914..abaf76515347b41dcf6acf45589fad5d12ddb317 100644 (file)
--- a/src/superio/smsc/fdc37n972/chip.h
+++ b/src/superio/smsc/fdc37n972/chip.h
@@ -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;
 };
 

diff --git a/src/superio/smsc/kbc1100/chip.h b/src/superio/smsc/kbc1100/chip.h
index 4ca90e360f4d6311dd174ce1a3c9353224c863ca..020224f6505150219a333a770b3b7802f6c9a530 100644 (file)
--- a/src/superio/smsc/kbc1100/chip.h
+++ b/src/superio/smsc/kbc1100/chip.h
@@ -27,7 +27,7 @@ struct chip_operations;
 extern struct chip_operations superio_smsc_kbc1100_ops;
 
 struct superio_smsc_kbc1100_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 

diff --git a/src/superio/smsc/lpc47b272/chip.h b/src/superio/smsc/lpc47b272/chip.h
index b96063c7f74cd3687f0f186565515171f39dc96a..031cd20f55e1c3e9f709514cd2ecc1164b892246 100644 (file)
--- a/src/superio/smsc/lpc47b272/chip.h
+++ b/src/superio/smsc/lpc47b272/chip.h
@@ -28,7 +28,7 @@ extern struct chip_operations superio_smsc_lpc47b272_ops;
 #include <uart8250.h>
 
 struct superio_smsc_lpc47b272_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 

diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index 0f5ea9272b826d361ea85907abe8721074c2d9cb..f57c306d9857de901640860b6a96d2322d43f56d 100644 (file)
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -120,20 +120,11 @@ static void lpc47b272_pnp_enable(device_t dev)
 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;

diff --git a/src/superio/smsc/lpc47b397/chip.h b/src/superio/smsc/lpc47b397/chip.h
index b18b6a556fe259c824724f7523d5722734b9b112..3f3c719bf45fdaecb764690216334d556bcea563 100644 (file)
--- a/src/superio/smsc/lpc47b397/chip.h
+++ b/src/superio/smsc/lpc47b397/chip.h
@@ -30,7 +30,7 @@ extern struct chip_operations superio_smsc_lpc47b397_ops;
 #include <uart8250.h>
 
 struct superio_smsc_lpc47b397_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 

diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index a0a6c1db19eccc15e54ba87ca1e429bc34e85050..fa549db46b6f27b6ef88380fb81a918267ac81e7 100644 (file)
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -68,20 +68,11 @@ static void enable_hwm_smbus(device_t dev)
 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;

diff --git a/src/superio/smsc/lpc47m10x/chip.h b/src/superio/smsc/lpc47m10x/chip.h
index ace92f1c2f95e15ea55a77cb4960c884e926ba12..79b72dae43a4dcc380c2e3c8a3c6a2327f31de36 100644 (file)
--- a/src/superio/smsc/lpc47m10x/chip.h
+++ b/src/superio/smsc/lpc47m10x/chip.h
@@ -32,7 +32,7 @@ extern struct chip_operations superio_smsc_lpc47m10x_ops;
 #include <uart8250.h>
 
 struct superio_smsc_lpc47m10x_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 

diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index 04140b13f84b1cdd458d937309d8528ca0bd6a8b..0be8742e4502a0d38af0ae290578b3d77b1eb0e2 100644 (file)
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -118,20 +118,11 @@ static void lpc47m10x_pnp_enable(device_t dev)
 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;

diff --git a/src/superio/smsc/lpc47m15x/chip.h b/src/superio/smsc/lpc47m15x/chip.h
index a4532bb4548158af6af1d2447e06f18eb7feb841..27031f21b2a5effebf67fabca216a030fbba4bcb 100644 (file)
--- a/src/superio/smsc/lpc47m15x/chip.h
+++ b/src/superio/smsc/lpc47m15x/chip.h
@@ -27,7 +27,7 @@ extern struct chip_operations superio_smsc_lpc47m15x_ops;
 #include <uart8250.h>
 
 struct superio_smsc_lpc47m15x_config {
-       struct uart8250 com1, com2;
+       
        struct pc_keyboard keyboard;
 };
 

diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index 54762de1c164866364b16ea9976c3a8770091507..222e3c9eec4d0670fd3a33ef4412cb5d64c3249c 100644 (file)
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -94,20 +94,11 @@ static void lpc47m15x_pnp_enable(device_t dev)
 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;

diff --git a/src/superio/smsc/lpc47n217/chip.h b/src/superio/smsc/lpc47n217/chip.h
index 0eda25f6b125a13a5f2bcdb68eaade7508b9e99f..c29031a85cc5730d51dd66c5f2a5b279fd3e8293 100644 (file)
--- a/src/superio/smsc/lpc47n217/chip.h
+++ b/src/superio/smsc/lpc47n217/chip.h
@@ -27,7 +27,7 @@ extern struct chip_operations superio_smsc_lpc47n217_ops;
 #include <uart8250.h>
 
 struct superio_smsc_lpc47n217_config {
-       struct uart8250 com1, com2;
+       
 };
 
 #endif

diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c
index b1455330d0210cd84b38a7b05e2514dcac1bf9de..88832e13d65aaaefa763be1c3f4945a3e47c0fb2 100644 (file)
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -134,21 +134,9 @@ static void lpc47n217_pnp_enable(device_t dev)
 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)

diff --git a/src/superio/smsc/lpc47n227/chip.h b/src/superio/smsc/lpc47n227/chip.h
index b2d0a9218f30b194a6a691c40bdba14696d821eb..fa0269971ccfc6b3e30e20ea8af0e202cfef9e29 100644 (file)
--- a/src/superio/smsc/lpc47n227/chip.h
+++ b/src/superio/smsc/lpc47n227/chip.h
@@ -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;
 };
 

diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c
index 20345b823009300ecd4ec18a659593fea056ad67..c7ffd69624863ed0b846f3a807745ad4f595fd2f 100644 (file)
--- a/src/superio/smsc/lpc47n227/superio.c
+++ b/src/superio/smsc/lpc47n227/superio.c
@@ -131,20 +131,11 @@ void lpc47n227_pnp_enable(device_t dev)
 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);

diff --git a/src/superio/smsc/sio10n268/chip.h b/src/superio/smsc/sio10n268/chip.h
index 43ad1682238d678a65cdaf1e40cc6593ff3665dd..32703bb394b088db3b9668d1e7608455f1dc9c0d 100644 (file)
--- a/src/superio/smsc/sio10n268/chip.h
+++ b/src/superio/smsc/sio10n268/chip.h
@@ -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;
 };
 

diff --git a/src/superio/smsc/smscsuperio/chip.h b/src/superio/smsc/smscsuperio/chip.h
index 1655eea10250e7e8655150f8de3ebb2749eb299a..ffe4b21ce309fdda1dd1cb6ba333a5f022d1b9c3 100644 (file)
--- a/src/superio/smsc/smscsuperio/chip.h
+++ b/src/superio/smsc/smscsuperio/chip.h
@@ -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;
 };
 

diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c
index e618823fa404d2d99b28272d2f8b214e993fd04f..4026affa6649d362f584353c6df38eb49cd83b57 100644 (file)
--- a/src/superio/smsc/smscsuperio/superio.c
+++ b/src/superio/smsc/smscsuperio/superio.c
@@ -205,7 +205,6 @@ static void smsc_pnp_enable(device_t dev)
 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 @@ static void smsc_init(device_t dev)
 
        /* 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);
        }
 }

diff --git a/src/superio/via/vt1211/chip.h b/src/superio/via/vt1211/chip.h
index 4d88e9637ee8f85b311b6b9855699be3c8389384..2154996a44ca87abf80254ca4a92d11a39818b90 100644 (file)
--- a/src/superio/via/vt1211/chip.h
+++ b/src/superio/via/vt1211/chip.h
@@ -26,7 +26,7 @@
 extern struct chip_operations superio_via_vt1211_ops;
 
 struct superio_via_vt1211_config {
-       struct uart8250 com1, com2;
+       
 };
 
 #endif

diff --git a/src/superio/winbond/w83627dhg/chip.h b/src/superio/winbond/w83627dhg/chip.h
index 4aec1bf74149e1284b689638743c6b32056094fb..51c56e892bb99b1d80a4ac1332637c7247b9ffbb 100644 (file)
--- a/src/superio/winbond/w83627dhg/chip.h
+++ b/src/superio/winbond/w83627dhg/chip.h
@@ -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;
 };
 

diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c
index 7f7bf21d3a4b204ebd00361ce4d821b5b542026f..1771c269e2d23f40dacce6943da5fe5c0f860bb6 100644 (file)
--- a/src/superio/winbond/w83627dhg/superio.c
+++ b/src/superio/winbond/w83627dhg/superio.c
@@ -40,20 +40,11 @@ static void pnp_exit_ext_func_mode(device_t dev)
 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;

diff --git a/src/superio/winbond/w83627ehg/chip.h b/src/superio/winbond/w83627ehg/chip.h
index 21a53de4ab6729bfe8985770341f4d8dc8b9a4d6..f3fe8ce9e2aa68dc1856fdd58b1b689c7fbe6aad 100644 (file)
--- a/src/superio/winbond/w83627ehg/chip.h
+++ b/src/superio/winbond/w83627ehg/chip.h
@@ -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;
 };
 

diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index d174cace8f535afb717d25f52207a9e9730adc0d..85747f26ebad248437f84689da64758861c62c2f 100644 (file)
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -114,14 +114,6 @@ static void w83627ehg_init(device_t dev)
                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;

diff --git a/src/superio/winbond/w83627hf/chip.h b/src/superio/winbond/w83627hf/chip.h
index 3b0d4aca69250ff7b0468a015c9bc5aaf35c8637..14793ddbfe8e5634a441a6b70eb32e4498c0c1d8 100644 (file)
--- a/src/superio/winbond/w83627hf/chip.h
+++ b/src/superio/winbond/w83627hf/chip.h
@@ -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;
 };
 

diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 2a86aa8c47024812a053d081aad956b47d900726..8ecec62bbe049e3195bfe3ccb143c7b6f8fd93d0 100644 (file)
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -135,14 +135,6 @@ static void w83627hf_init(device_t dev)
                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;

diff --git a/src/superio/winbond/w83627thg/chip.h b/src/superio/winbond/w83627thg/chip.h
index a2c9a0de6d331fc80babf608248fcca3970eaf3e..8da6954b906e5e5188cb684e6b4cca3b9e4d164b 100644 (file)
--- a/src/superio/winbond/w83627thg/chip.h
+++ b/src/superio/winbond/w83627thg/chip.h
@@ -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;
 };
 

diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index 58d4d0609f16bee17f9e2d0c9cfa1e9a0a3156e1..40a232602d209cbe78b799026dd94235c0555691 100644 (file)
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -45,20 +45,11 @@ static void w83627thg_exit_ext_func_mode(device_t dev)
 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;

diff --git a/src/superio/winbond/w83627uhg/chip.h b/src/superio/winbond/w83627uhg/chip.h
index 74a41f8feba328dde5079374ae2245ebfc0d369c..ffabfa5fed6c1c913fa843de22deeb0af98bbc8d 100644 (file)
--- a/src/superio/winbond/w83627uhg/chip.h
+++ b/src/superio/winbond/w83627uhg/chip.h
@@ -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;
 };
 

diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index a132446352772bded53c32d30179278cd5a94cf4..933bde6cefe054301c6f873d219403af305c8d93 100644 (file)
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -73,41 +73,28 @@ static void set_uart_clock_source(device_t dev, u8 uart_clock)
 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);

diff --git a/src/superio/winbond/w83697hf/chip.h b/src/superio/winbond/w83697hf/chip.h
index cb7aebd9afa76de977445029453bf8df1b1ed34f..dd54a525ca5c592bbafb8a7e49c9f4127397721e 100644 (file)
--- a/src/superio/winbond/w83697hf/chip.h
+++ b/src/superio/winbond/w83697hf/chip.h
@@ -26,7 +26,7 @@
 extern struct chip_operations superio_winbond_w83697hf_ops;
 
 struct superio_winbond_w83697hf_config {
-       struct uart8250 com1, com2;
+       
 };
 
 #endif

diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c
index 9159fc2547357f6713c9a38ce89c5126057522d8..d2cbcbd6424d6395db4293ca762ee188c08d39d4 100644 (file)
--- a/src/superio/winbond/w83697hf/superio.c
+++ b/src/superio/winbond/w83697hf/superio.c
@@ -43,22 +43,8 @@ static void pnp_exit_ext_func_mode(device_t dev)
 
 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)

diff --git a/src/superio/winbond/w83977f/chip.h b/src/superio/winbond/w83977f/chip.h
index 94a8cb694a70a2fa98628222ae1368b936b0bd13..1c126971dea364128286efe28079df2127414dcb 100644 (file)
--- a/src/superio/winbond/w83977f/chip.h
+++ b/src/superio/winbond/w83977f/chip.h
@@ -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;
 };
 

diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c
index aa51577363662e4d9ed0fff75049da7129d4e4cc..e197b372f2d96b9cd1eaee3747ae034909e15e3a 100644 (file)
--- a/src/superio/winbond/w83977f/superio.c
+++ b/src/superio/winbond/w83977f/superio.c
@@ -44,20 +44,11 @@ static void w83977f_exit_ext_func_mode(device_t dev)
 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;

diff --git a/src/superio/winbond/w83977tf/chip.h b/src/superio/winbond/w83977tf/chip.h
index e50f00661f0458bc9d7da18e3d51a0702b6e75f8..cc24fc0e6239f9273df6f18f664d86556bcf7384 100644 (file)
--- a/src/superio/winbond/w83977tf/chip.h
+++ b/src/superio/winbond/w83977tf/chip.h
@@ -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;
 };
 

diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 4c99999eb4a71c880b9ef9770f98c079abb3dd98..40952d2a4b8dbe6ec027ffaee4d2a39ecdfa0a1b 100644 (file)
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -46,20 +46,11 @@ static void w83977tf_exit_ext_func_mode(device_t dev)
 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;