diff options
author | Samuel Holland <samuel@sholland.org> | 2017-06-06 22:55:01 -0500 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2017-06-13 15:21:58 +0200 |
commit | 7daac912367c4b308038ae56f78c0a07e8a03082 (patch) | |
tree | 24e70aa5e3beadc942c7aab9c76120d6a6d943e9 /src/superio/smsc | |
parent | c21ba2cd3e6af194cc4d933d4f7bd434dfb2ff04 (diff) | |
download | coreboot-7daac912367c4b308038ae56f78c0a07e8a03082.tar.xz |
device/pnp: remove struct io_info
The 'set' field was not used anywhere. Replace the struct with a simple
integer representing the mask.
initializer updates performed with:
sed -i -r 's/\{ ?0(x([[:digit:]abcdefABCDEF]{3,4}))?, (0x)?[04]? ?\}/0\1/g' \
src/ec/*/*/ec.c
sed -i -r 's/\{ ?0(x([[:digit:]abcdefABCDEF]{3,4}))?, (0x)?[04] ?\}/0\1/g' \
src/ec/*/*/ec_lpc.c \
src/superio/*/*/superio.c \
src/superio/smsc/fdc37n972/fdc37n972.c \
src/superio/smsc/sio10n268/sio10n268.c \
src/superio/via/vt1211/vt1211.c
src/ec/kontron/it8516e/ec.c was manually updated. The previous value for
IT8516E_LDN_SWUC appears to have been a typo, as it was out of range and
had a zero bit in the middle of the mask.
Change-Id: I1e7853844605cd2a6d568caf05488e1218fb53f9
Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-on: https://review.coreboot.org/20078
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Myles Watson <mylesgw@gmail.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/superio/smsc')
-rw-r--r-- | src/superio/smsc/dme1737/superio.c | 12 | ||||
-rw-r--r-- | src/superio/smsc/fdc37n972/fdc37n972.c | 6 | ||||
-rw-r--r-- | src/superio/smsc/kbc1100/superio.c | 2 | ||||
-rw-r--r-- | src/superio/smsc/lpc47b272/superio.c | 12 | ||||
-rw-r--r-- | src/superio/smsc/lpc47b397/superio.c | 14 | ||||
-rw-r--r-- | src/superio/smsc/lpc47m10x/superio.c | 12 | ||||
-rw-r--r-- | src/superio/smsc/lpc47m15x/superio.c | 10 | ||||
-rw-r--r-- | src/superio/smsc/lpc47n217/superio.c | 6 | ||||
-rw-r--r-- | src/superio/smsc/lpc47n227/superio.c | 8 | ||||
-rw-r--r-- | src/superio/smsc/mec1308/superio.c | 14 | ||||
-rw-r--r-- | src/superio/smsc/sch4037/superio.c | 2 | ||||
-rw-r--r-- | src/superio/smsc/sio1036/superio.c | 2 | ||||
-rw-r--r-- | src/superio/smsc/sio10n268/sio10n268.c | 2 | ||||
-rw-r--r-- | src/superio/smsc/smscsuperio/superio.c | 14 |
14 files changed, 58 insertions, 58 deletions
diff --git a/src/superio/smsc/dme1737/superio.c b/src/superio/smsc/dme1737/superio.c index 802735bde5..7b4b947aed 100644 --- a/src/superio/smsc/dme1737/superio.c +++ b/src/superio/smsc/dme1737/superio.c @@ -50,12 +50,12 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, DME1737_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, DME1737_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, DME1737_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, DME1737_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, DME1737_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, {0x07ff, 0}, {0x07ff, 4}, }, - { &ops, DME1737_RT, PNP_IO0, {0x0780, 0}, }, + { &ops, DME1737_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, DME1737_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, DME1737_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, DME1737_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, DME1737_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x07ff, 0x07ff, }, + { &ops, DME1737_RT, PNP_IO0, 0x0780, }, }; static void enable_dev(struct device *dev) diff --git a/src/superio/smsc/fdc37n972/fdc37n972.c b/src/superio/smsc/fdc37n972/fdc37n972.c index f2218f191e..e3edcea506 100644 --- a/src/superio/smsc/fdc37n972/fdc37n972.c +++ b/src/superio/smsc/fdc37n972/fdc37n972.c @@ -46,9 +46,9 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, FDC37N972_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, FDC37N972_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x07f8, 0}, }, - { &ops, FDC37N972_KBDC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x07f8, 0}, {0x07f8, 4}, }, + { &ops, FDC37N972_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, FDC37N972_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, 0x07f8, }, + { &ops, FDC37N972_KBDC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, }, }; static void enable_dev(struct device *dev) diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c index aa17473edc..448070a8ce 100644 --- a/src/superio/smsc/kbc1100/superio.c +++ b/src/superio/smsc/kbc1100/superio.c @@ -45,7 +45,7 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, KBC1100_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, }, + { &ops, KBC1100_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x7ff, 0x7ff, }, }; static void enable_dev(struct device *dev) diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c index 00df880e97..a269b3b26c 100644 --- a/src/superio/smsc/lpc47b272/superio.c +++ b/src/superio/smsc/lpc47b272/superio.c @@ -61,12 +61,12 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, LPC47B272_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, LPC47B272_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, LPC47B272_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, LPC47B272_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, LPC47B272_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, {0x07ff, 0}, {0x07ff, 4}, }, - { &ops, LPC47B272_RT, PNP_IO0, {0x0780, 0}, }, + { &ops, LPC47B272_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, LPC47B272_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, LPC47B272_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, LPC47B272_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, LPC47B272_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x07ff, 0x07ff, }, + { &ops, LPC47B272_RT, PNP_IO0, 0x0780, }, }; /** diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c index a4ab46acd2..93e453fe23 100644 --- a/src/superio/smsc/lpc47b397/superio.c +++ b/src/superio/smsc/lpc47b397/superio.c @@ -135,13 +135,13 @@ static struct device_operations ops_hwm = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, LPC47B397_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, LPC47B397_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, LPC47B397_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, LPC47B397_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, LPC47B397_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, {0x07ff, 0}, {0x07ff, 4}, }, - { &ops_hwm, LPC47B397_HWM, PNP_IO0, {0x07f0, 0}, }, - { &ops, LPC47B397_RT, PNP_IO0, {0x0780, 0}, }, + { &ops, LPC47B397_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, LPC47B397_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, LPC47B397_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, LPC47B397_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, LPC47B397_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x07ff, 0x07ff, }, + { &ops_hwm, LPC47B397_HWM, PNP_IO0, 0x07f0, }, + { &ops, LPC47B397_RT, PNP_IO0, 0x0780, }, }; static void enable_dev(struct device *dev) diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c index 1fc56d4144..58e7c95127 100644 --- a/src/superio/smsc/lpc47m10x/superio.c +++ b/src/superio/smsc/lpc47m10x/superio.c @@ -59,12 +59,12 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, LPC47M10X2_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, LPC47M10X2_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, LPC47M10X2_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, LPC47M10X2_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, LPC47M10X2_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, {0x07ff, 0}, {0x07ff, 4}, }, - { &ops, LPC47M10X2_PME, PNP_IO0, { 0x0f80, 0 }, }, + { &ops, LPC47M10X2_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, LPC47M10X2_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, LPC47M10X2_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, LPC47M10X2_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, LPC47M10X2_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x07ff, 0x07ff, }, + { &ops, LPC47M10X2_PME, PNP_IO0, 0x0f80, }, }; /** diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c index 7486938985..814b70ef69 100644 --- a/src/superio/smsc/lpc47m15x/superio.c +++ b/src/superio/smsc/lpc47m15x/superio.c @@ -45,11 +45,11 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, LPC47M15X_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, LPC47M15X_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, LPC47M15X_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, LPC47M15X_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, LPC47M15X_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, {0x07ff, 0}, {0x07ff, 4}, }, + { &ops, LPC47M15X_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, LPC47M15X_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, LPC47M15X_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, LPC47M15X_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, LPC47M15X_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x07ff, 0x07ff, }, }; static void enable_dev(struct device *dev) diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c index 86912a027a..9c5dff06e6 100644 --- a/src/superio/smsc/lpc47n217/superio.c +++ b/src/superio/smsc/lpc47n217/superio.c @@ -57,9 +57,9 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, LPC47N217_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, LPC47N217_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, LPC47N217_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, } + { &ops, LPC47N217_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, LPC47N217_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, LPC47N217_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, } }; /** diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c index af4c7ef7b1..c83195730d 100644 --- a/src/superio/smsc/lpc47n227/superio.c +++ b/src/superio/smsc/lpc47n227/superio.c @@ -55,10 +55,10 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, LPC47N227_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, LPC47N227_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, LPC47N227_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, LPC47N227_KBDC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x07f8, 0}, {0x07f8, 4}, }, + { &ops, LPC47N227_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, LPC47N227_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, LPC47N227_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, LPC47N227_KBDC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07f8, 0x07f8, }, }; /** diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c index fe2135f4c2..b11374c83a 100644 --- a/src/superio/smsc/mec1308/superio.c +++ b/src/superio/smsc/mec1308/superio.c @@ -49,13 +49,13 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, MEC1308_PM1, PNP_IO0, { 0x7ff, 0 } }, - { &ops, MEC1308_EC1, PNP_IO0, { 0x7ff, 0 } }, - { &ops, MEC1308_EC2, PNP_IO0, { 0x7ff, 0 } }, - { &ops, MEC1308_UART, PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, }, - { &ops, MEC1308_KBC, PNP_IRQ0, { 0, 0 } /* IO Fixed at 0x60/0x64 */ }, - { &ops, MEC1308_EC0, PNP_IO0, { 0x7ff, 0 } }, - { &ops, MEC1308_MBX, PNP_IO0, { 0x7ff, 0 } }, + { &ops, MEC1308_PM1, PNP_IO0, 0x7ff }, + { &ops, MEC1308_EC1, PNP_IO0, 0x7ff }, + { &ops, MEC1308_EC2, PNP_IO0, 0x7ff }, + { &ops, MEC1308_UART, PNP_IO0 | PNP_IRQ0, 0x0ff8, }, + { &ops, MEC1308_KBC, PNP_IRQ0, 0 /* IO Fixed at 0x60/0x64 */ }, + { &ops, MEC1308_EC0, PNP_IO0, 0x7ff }, + { &ops, MEC1308_MBX, PNP_IO0, 0x7ff }, }; static void enable_dev(struct device *dev) diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c index 26fdba2012..78c61487d1 100644 --- a/src/superio/smsc/sch4037/superio.c +++ b/src/superio/smsc/sch4037/superio.c @@ -48,7 +48,7 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, SCH4037_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, }, + { &ops, SCH4037_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x7ff, 0x7ff, }, }; static void enable_dev(struct device *dev) diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c index b3ad0480b3..c1bfae348c 100644 --- a/src/superio/smsc/sio1036/superio.c +++ b/src/superio/smsc/sio1036/superio.c @@ -41,7 +41,7 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, SIO1036_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, + { &ops, SIO1036_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, }; static void enable_dev(struct device *dev) diff --git a/src/superio/smsc/sio10n268/sio10n268.c b/src/superio/smsc/sio10n268/sio10n268.c index 590f66d839..704e91857f 100644 --- a/src/superio/smsc/sio10n268/sio10n268.c +++ b/src/superio/smsc/sio10n268/sio10n268.c @@ -47,7 +47,7 @@ static struct device_operations ops = { /* TODO: FDC, PP, AUX. */ static struct pnp_info pnp_dev_info[] = { - { &ops, SIO10N268_KBDC, PNP_IO0 | PNP_IO1, {0x07f8, 0}, {0x07f8, 4}, }, + { &ops, SIO10N268_KBDC, PNP_IO0 | PNP_IO1, 0x07f8, 0x07f8, }, }; static void enable_dev(struct device *dev) diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c index 6cd3382648..414ae8d8be 100644 --- a/src/superio/smsc/smscsuperio/superio.c +++ b/src/superio/smsc/smscsuperio/superio.c @@ -194,19 +194,19 @@ static struct device_operations ops = { * TODO: FDC, PP, SP1, SP2, and KBC should work, the rest probably not (yet). */ static struct pnp_info pnp_dev_info[] = { - { &ops, LD_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, LD_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, LD_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, LD_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, + { &ops, LD_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, LD_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, 0x07f8, }, + { &ops, LD_SP1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { &ops, LD_SP2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, { &ops, LD_RTC, }, - { &ops, LD_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, {0x07ff, 0}, {0x07ff, 4}, }, + { &ops, LD_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x07ff, 0x07ff, }, { &ops, LD_AUX, }, { &ops, LD_XBUS, }, - { &ops, LD_HWM, PNP_IO0, {0x07f0, 0}, }, + { &ops, LD_HWM, PNP_IO0, 0x07f0, }, { &ops, LD_GAME, }, { &ops, LD_PME, }, { &ops, LD_MPU401, }, - { &ops, LD_RT, PNP_IO0, {0x0780, 0}, }, + { &ops, LD_RT, PNP_IO0, 0x0780, }, { &ops, LD_ACPI, }, { &ops, LD_SMB, }, }; |