diff options
Diffstat (limited to 'src/superio/nsc/pc87309')
| -rw-r--r-- | src/superio/nsc/pc87309/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/superio/nsc/pc87309/pc87309_early_serial.c | 2 | ||||
| -rw-r--r-- | src/superio/nsc/pc87309/superio.c | 27 |
3 files changed, 15 insertions, 16 deletions
diff --git a/src/superio/nsc/pc87309/Makefile.inc b/src/superio/nsc/pc87309/Makefile.inc index 87104f9daf..3db0493960 100644 --- a/src/superio/nsc/pc87309/Makefile.inc +++ b/src/superio/nsc/pc87309/Makefile.inc @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -#config chip.h ramstage-$(CONFIG_SUPERIO_NSC_PC87309) += superio.c + diff --git a/src/superio/nsc/pc87309/pc87309_early_serial.c b/src/superio/nsc/pc87309/pc87309_early_serial.c index 8e16fddafd..14c755d365 100644 --- a/src/superio/nsc/pc87309/pc87309_early_serial.c +++ b/src/superio/nsc/pc87309/pc87309_early_serial.c @@ -21,7 +21,7 @@ #include <arch/romcc_io.h> #include "pc87309.h" -static void pc87309_enable_serial(device_t dev, unsigned int iobase) +static void pc87309_enable_serial(device_t dev, u16 iobase) { pnp_set_logical_device(dev); pnp_set_enable(dev, 0); diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c index 04f75fbaa9..e3f7b7b0fe 100644 --- a/src/superio/nsc/pc87309/superio.c +++ b/src/superio/nsc/pc87309/superio.c @@ -29,13 +29,12 @@ static void init(device_t dev) { - struct superio_nsc_pc87309_config *conf; + struct superio_nsc_pc87309_config *conf = dev->chip_info; struct resource *res0; - if (!dev->enabled) { + if (!dev->enabled) return; - } - conf = dev->chip_info; + switch (dev->path.pnp.device) { case PC87309_SP1: res0 = find_resource(dev, PNP_IDX_IO0); @@ -52,21 +51,21 @@ static void init(device_t dev) } static struct device_operations ops = { - .read_resources = pnp_read_resources, - .set_resources = pnp_set_resources, + .read_resources = pnp_read_resources, + .set_resources = pnp_set_resources, .enable_resources = pnp_enable_resources, - .enable = pnp_enable, - .init = init, + .enable = pnp_enable, + .init = init, }; static struct pnp_info pnp_dev_info[] = { - {&ops, PC87309_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07fa, 0},}, - {&ops, PC87309_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x04f8, 0},}, - {&ops, PC87309_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x7f8, 0},}, - {&ops, PC87309_SP1, PNP_IO0 | PNP_IRQ0, {0x7f8, 0},}, + { &ops, PC87309_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07fa, 0}, }, + { &ops, PC87309_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x04f8, 0}, }, + { &ops, PC87309_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x07f8, 0}, }, + { &ops, PC87309_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, /* TODO: PM. */ - {&ops, PC87309_KBCM, PNP_IRQ0}, - {&ops, PC87309_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x7f8, 0}, {0x7f8, 0x4},}, + { &ops, PC87309_KBCM, PNP_IRQ0, }, + { &ops, PC87309_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x07f8, 0}, {0x7f8, 4}, }, }; static void enable_dev(struct device *dev) |