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/ec | |
| 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/ec')
| -rw-r--r-- | src/ec/compal/ene932/ec.c | 2 | ||||
| -rw-r--r-- | src/ec/google/chromeec/ec_lpc.c | 2 | ||||
| -rw-r--r-- | src/ec/kontron/it8516e/ec.c | 18 | ||||
| -rw-r--r-- | src/ec/quanta/ene_kb3940q/ec.c | 2 | ||||
| -rw-r--r-- | src/ec/quanta/it8518/ec.c | 2 | ||||
| -rw-r--r-- | src/ec/roda/it8518/ec.c | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c index 1587db9597..1ed3c9f2de 100644 --- a/src/ec/compal/ene932/ec.c +++ b/src/ec/compal/ene932/ec.c @@ -144,7 +144,7 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, 0, 0, { 0, 0 }, } + { &ops, 0, 0, 0, } }; static void enable_dev(struct device *dev) diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c index 51a6e53035..9ead8c8f63 100644 --- a/src/ec/google/chromeec/ec_lpc.c +++ b/src/ec/google/chromeec/ec_lpc.c @@ -471,7 +471,7 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, 0, 0, { 0, 0 }, } + { &ops, 0, 0, 0, } }; static void enable_dev(struct device *dev) diff --git a/src/ec/kontron/it8516e/ec.c b/src/ec/kontron/it8516e/ec.c index f3f355a652..5565382109 100644 --- a/src/ec/kontron/it8516e/ec.c +++ b/src/ec/kontron/it8516e/ec.c @@ -235,16 +235,16 @@ static struct device_operations it8516e_pm2_ops = { }; static struct pnp_info it8516e_dev_infos[] = { - { NULL, IT8516E_LDN_UART1, PNP_IO0 | PNP_IRQ0, { 0x07f8, }, }, - { NULL, IT8516E_LDN_UART2, PNP_IO0 | PNP_IRQ0, { 0x07f8, }, }, - { NULL, IT8516E_LDN_SWUC, PNP_IO0 | PNP_IRQ0, { 0xff7e0, }, }, + { NULL, IT8516E_LDN_UART1, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, IT8516E_LDN_UART2, PNP_IO0 | PNP_IRQ0, 0x07f8, }, + { NULL, IT8516E_LDN_SWUC, PNP_IO0 | PNP_IRQ0, 0xffe0, }, { NULL, IT8516E_LDN_MOUSE, PNP_IRQ0, }, - { NULL, IT8516E_LDN_KBD, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x07ff, }, { 0x07ff, }, }, - { NULL, IT8516E_LDN_SMFI, PNP_IO0 | PNP_IRQ0, { 0xfff0, }, }, - { NULL, IT8516E_LDN_BRAM, PNP_IO0 | PNP_IO1, { 0xfffe, }, { 0xfffe, }, }, - { NULL, IT8516E_LDN_PM1, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x07ff, }, { 0x07ff, }, }, - { &it8516e_pm2_ops, IT8516E_LDN_PM2, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x07ff, }, { 0x07ff, }, }, - { NULL, IT8516E_LDN_PM3, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x07ff, }, { 0x07ff, }, }, + { NULL, IT8516E_LDN_KBD, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07ff, 0x07ff, }, + { NULL, IT8516E_LDN_SMFI, PNP_IO0 | PNP_IRQ0, 0xfff0, }, + { NULL, IT8516E_LDN_BRAM, PNP_IO0 | PNP_IO1, 0xfffe, 0xfffe, }, + { NULL, IT8516E_LDN_PM1, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07ff, 0x07ff, }, + { &it8516e_pm2_ops, IT8516E_LDN_PM2, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07ff, 0x07ff, }, + { NULL, IT8516E_LDN_PM3, PNP_IO0 | PNP_IO1 | PNP_IRQ0, 0x07ff, 0x07ff, }, }; static void it8516e_enable(struct device *dev) diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c index 83768b12ca..8558d3de9b 100644 --- a/src/ec/quanta/ene_kb3940q/ec.c +++ b/src/ec/quanta/ene_kb3940q/ec.c @@ -154,7 +154,7 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, 0, 0, { 0, 0 }, } + { &ops, 0, 0, 0, } }; static void enable_dev(struct device *dev) diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c index 643c934c40..3a5173317d 100644 --- a/src/ec/quanta/it8518/ec.c +++ b/src/ec/quanta/it8518/ec.c @@ -167,7 +167,7 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, 0, 0, { 0, 0 }, } + { &ops, 0, 0, 0, } }; static void enable_dev(struct device *dev) diff --git a/src/ec/roda/it8518/ec.c b/src/ec/roda/it8518/ec.c index ad51945cef..99ce5062ca 100644 --- a/src/ec/roda/it8518/ec.c +++ b/src/ec/roda/it8518/ec.c @@ -53,7 +53,7 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - { &ops, 0, 0, { 0, 0 }, } + { &ops, 0, 0, 0, } }; static void enable_dev(struct device *dev) |