From 9db833bec394b886ca990965970cdb100b65d9ac Mon Sep 17 00:00:00 2001 From: Zheng Bao Date: Mon, 28 Dec 2009 09:59:44 +0000 Subject: trival. All the changes is about comment and spaces. In superio folder. 1. Delete trailing white spaces. 2. Change the // comment to /* */. 3. Add some copyright header. 4. reindent. 5. delete multi blank lines. I tried my best to find them. If anything left, please fix it or tell me. Signed-off-by: Zheng Bao Acked-by: Zheng Bao git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4993 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/superio/ite/it8661f/Config.lb | 1 - src/superio/ite/it8661f/Makefile.inc | 1 - src/superio/ite/it8661f/chip.h | 1 - src/superio/ite/it8661f/it8661f.h | 1 - src/superio/ite/it8661f/it8661f_early_serial.c | 1 - src/superio/ite/it8661f/superio.c | 5 ++--- src/superio/ite/it8671f/Config.lb | 1 - src/superio/ite/it8671f/Makefile.inc | 1 - src/superio/ite/it8671f/chip.h | 1 - src/superio/ite/it8671f/it8671f.h | 1 - src/superio/ite/it8671f/it8671f_early_serial.c | 1 - src/superio/ite/it8671f/superio.c | 7 +++---- src/superio/ite/it8673f/Config.lb | 1 - src/superio/ite/it8673f/Makefile.inc | 1 - src/superio/ite/it8673f/chip.h | 1 - src/superio/ite/it8673f/it8673f.h | 1 - src/superio/ite/it8673f/it8673f_early_serial.c | 1 - src/superio/ite/it8673f/superio.c | 1 - src/superio/ite/it8705f/Config.lb | 1 - src/superio/ite/it8705f/Makefile.inc | 1 - src/superio/ite/it8705f/chip.h | 1 - src/superio/ite/it8705f/it8705f.h | 1 - src/superio/ite/it8705f/it8705f_early_serial.c | 5 ++--- src/superio/ite/it8705f/superio.c | 5 ++--- src/superio/ite/it8712f/Config.lb | 1 - src/superio/ite/it8712f/Makefile.inc | 1 - src/superio/ite/it8712f/chip.h | 1 - src/superio/ite/it8712f/it8712f.h | 1 - src/superio/ite/it8712f/it8712f_early_serial.c | 11 ++++------- src/superio/ite/it8712f/superio.c | 1 - src/superio/ite/it8716f/Config.lb | 1 - src/superio/ite/it8716f/Makefile.inc | 1 - src/superio/ite/it8716f/chip.h | 1 - src/superio/ite/it8716f/it8716f.h | 1 - src/superio/ite/it8716f/it8716f_early_init.c | 1 - src/superio/ite/it8716f/it8716f_early_serial.c | 3 +-- src/superio/ite/it8718f/Config.lb | 1 - src/superio/ite/it8718f/Makefile.inc | 1 - src/superio/ite/it8718f/chip.h | 1 - src/superio/ite/it8718f/it8718f_early_serial.c | 5 ++--- src/superio/ite/it8718f/superio.c | 7 +++---- 41 files changed, 19 insertions(+), 62 deletions(-) (limited to 'src/superio/ite') diff --git a/src/superio/ite/it8661f/Config.lb b/src/superio/ite/it8661f/Config.lb index e1290e2fad..8e91c171ce 100644 --- a/src/superio/ite/it8661f/Config.lb +++ b/src/superio/ite/it8661f/Config.lb @@ -20,4 +20,3 @@ config chip.h object superio.o - diff --git a/src/superio/ite/it8661f/Makefile.inc b/src/superio/ite/it8661f/Makefile.inc index 8a17ae2c86..5bd564216a 100644 --- a/src/superio/ite/it8661f/Makefile.inc +++ b/src/superio/ite/it8661f/Makefile.inc @@ -20,4 +20,3 @@ #config chip.h obj-$(CONFIG_SUPERIO_ITE_IT8661F) += superio.o - diff --git a/src/superio/ite/it8661f/chip.h b/src/superio/ite/it8661f/chip.h index 5a173b1f3e..f00e49e851 100644 --- a/src/superio/ite/it8661f/chip.h +++ b/src/superio/ite/it8661f/chip.h @@ -33,4 +33,3 @@ struct superio_ite_it8661f_config { }; #endif /* _SUPERIO_ITE_IT8661F */ - diff --git a/src/superio/ite/it8661f/it8661f.h b/src/superio/ite/it8661f/it8661f.h index 07327d8338..453627ae6d 100644 --- a/src/superio/ite/it8661f/it8661f.h +++ b/src/superio/ite/it8661f/it8661f.h @@ -29,4 +29,3 @@ #define IT8661F_PP 0x03 /* Parallel port */ #define IT8661F_IR 0x04 /* IR */ #define IT8661F_GPIO 0x05 /* GPIO & Alternate Function Configuration */ - diff --git a/src/superio/ite/it8661f/it8661f_early_serial.c b/src/superio/ite/it8661f/it8661f_early_serial.c index b6826a7dab..12da301616 100644 --- a/src/superio/ite/it8661f/it8661f_early_serial.c +++ b/src/superio/ite/it8661f/it8661f_early_serial.c @@ -91,4 +91,3 @@ static void it8661f_enable_serial(device_t dev, unsigned iobase) /* (3) Exit the configuration state (MB PnP mode). */ it8661f_sio_write(0x00, IT8661F_CONFIG_REG_CC, 0x02); } - diff --git a/src/superio/ite/it8661f/superio.c b/src/superio/ite/it8661f/superio.c index 20e5070678..7c5294d65b 100644 --- a/src/superio/ite/it8661f/superio.c +++ b/src/superio/ite/it8661f/superio.c @@ -66,8 +66,8 @@ static struct device_operations ops = { /* TODO: FDC, PP, IR, GPIO. */ static struct pnp_info pnp_dev_info[] = { - { &ops, IT8661F_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, - { &ops, IT8661F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, }, + { &ops, IT8661F_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, + { &ops, IT8661F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, }, }; static void enable_dev(struct device *dev) @@ -80,4 +80,3 @@ struct chip_operations superio_ite_it8661f_ops = { CHIP_NAME("ITE IT8661F Super I/O") .enable_dev = enable_dev, }; - diff --git a/src/superio/ite/it8671f/Config.lb b/src/superio/ite/it8671f/Config.lb index e1290e2fad..8e91c171ce 100644 --- a/src/superio/ite/it8671f/Config.lb +++ b/src/superio/ite/it8671f/Config.lb @@ -20,4 +20,3 @@ config chip.h object superio.o - diff --git a/src/superio/ite/it8671f/Makefile.inc b/src/superio/ite/it8671f/Makefile.inc index 32c26227de..18edd9b81c 100644 --- a/src/superio/ite/it8671f/Makefile.inc +++ b/src/superio/ite/it8671f/Makefile.inc @@ -20,4 +20,3 @@ #config chip.h obj-$(CONFIG_SUPERIO_ITE_IT8671F) += superio.o - diff --git a/src/superio/ite/it8671f/chip.h b/src/superio/ite/it8671f/chip.h index b4c4d3f21d..7d0e5acb6a 100644 --- a/src/superio/ite/it8671f/chip.h +++ b/src/superio/ite/it8671f/chip.h @@ -33,4 +33,3 @@ struct superio_ite_it8671f_config { }; #endif /* _SUPERIO_ITE_IT8671F */ - diff --git a/src/superio/ite/it8671f/it8671f.h b/src/superio/ite/it8671f/it8671f.h index b77c77f1ec..07b4d542cc 100644 --- a/src/superio/ite/it8671f/it8671f.h +++ b/src/superio/ite/it8671f/it8671f.h @@ -27,4 +27,3 @@ #define IT8671F_PP 0x03 /* Parallel port */ #define IT8671F_KBCK 0x05 /* Keyboard */ #define IT8671F_KBCM 0x06 /* Mouse */ - diff --git a/src/superio/ite/it8671f/it8671f_early_serial.c b/src/superio/ite/it8671f/it8671f_early_serial.c index f894562ca9..56d1d8c2dd 100644 --- a/src/superio/ite/it8671f/it8671f_early_serial.c +++ b/src/superio/ite/it8671f/it8671f_early_serial.c @@ -91,4 +91,3 @@ static void it8671f_enable_serial(device_t dev, unsigned iobase) /* (3) Exit the configuration state (MB PnP mode). */ it8671f_sio_write(0x00, IT8671F_CONFIG_REG_CC, 0x02); } - diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c index f77c8bddb1..e0007c56d6 100644 --- a/src/superio/ite/it8671f/superio.c +++ b/src/superio/ite/it8671f/superio.c @@ -70,9 +70,9 @@ static struct device_operations ops = { /* TODO: FDC, PP, KBCM. */ static struct pnp_info pnp_dev_info[] = { - { &ops, IT8671F_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, - { &ops, IT8671F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, }, - { &ops, IT8671F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7f8, 0 }, { 0x7f8, 0x4}, }, + { &ops, IT8671F_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, + { &ops, IT8671F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, }, + { &ops, IT8671F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7f8, 0 }, { 0x7f8, 0x4}, }, }; static void enable_dev(struct device *dev) @@ -85,4 +85,3 @@ struct chip_operations superio_ite_it8671f_ops = { CHIP_NAME("ITE IT8671F Super I/O") .enable_dev = enable_dev, }; - diff --git a/src/superio/ite/it8673f/Config.lb b/src/superio/ite/it8673f/Config.lb index e1290e2fad..8e91c171ce 100644 --- a/src/superio/ite/it8673f/Config.lb +++ b/src/superio/ite/it8673f/Config.lb @@ -20,4 +20,3 @@ config chip.h object superio.o - diff --git a/src/superio/ite/it8673f/Makefile.inc b/src/superio/ite/it8673f/Makefile.inc index f4ee01cec6..3bb5b1c4bc 100644 --- a/src/superio/ite/it8673f/Makefile.inc +++ b/src/superio/ite/it8673f/Makefile.inc @@ -20,4 +20,3 @@ #config chip.h obj-$(CONFIG_SUPERIO_ITE_IT8673F) += superio.o - diff --git a/src/superio/ite/it8673f/chip.h b/src/superio/ite/it8673f/chip.h index 02bc33dece..6967059317 100644 --- a/src/superio/ite/it8673f/chip.h +++ b/src/superio/ite/it8673f/chip.h @@ -33,4 +33,3 @@ struct superio_ite_it8673f_config { }; #endif /* _SUPERIO_ITE_IT8673F */ - diff --git a/src/superio/ite/it8673f/it8673f.h b/src/superio/ite/it8673f/it8673f.h index 46bc31f78d..6734c0e259 100644 --- a/src/superio/ite/it8673f/it8673f.h +++ b/src/superio/ite/it8673f/it8673f.h @@ -28,4 +28,3 @@ #define IT8673F_FAN 0x04 /* Fan controller */ #define IT8673F_KBCK 0x05 /* Keyboard */ #define IT8673F_KBCM 0x06 /* Mouse */ - diff --git a/src/superio/ite/it8673f/it8673f_early_serial.c b/src/superio/ite/it8673f/it8673f_early_serial.c index 44cac26d01..9edbfb9adc 100644 --- a/src/superio/ite/it8673f/it8673f_early_serial.c +++ b/src/superio/ite/it8673f/it8673f_early_serial.c @@ -89,4 +89,3 @@ static void it8673f_enable_serial(device_t dev, unsigned iobase) /* (3) Exit the configuration state (MB PnP mode). */ it8673f_sio_write(0x00, IT8673F_CONFIG_REG_CC, 0x02); } - diff --git a/src/superio/ite/it8673f/superio.c b/src/superio/ite/it8673f/superio.c index f4dff1403a..a5c99b1dba 100644 --- a/src/superio/ite/it8673f/superio.c +++ b/src/superio/ite/it8673f/superio.c @@ -87,4 +87,3 @@ struct chip_operations superio_ite_it8673f_ops = { CHIP_NAME("ITE IT8673F Super I/O") .enable_dev = enable_dev, }; - diff --git a/src/superio/ite/it8705f/Config.lb b/src/superio/ite/it8705f/Config.lb index e1290e2fad..8e91c171ce 100644 --- a/src/superio/ite/it8705f/Config.lb +++ b/src/superio/ite/it8705f/Config.lb @@ -20,4 +20,3 @@ config chip.h object superio.o - diff --git a/src/superio/ite/it8705f/Makefile.inc b/src/superio/ite/it8705f/Makefile.inc index 468c0e8aec..6c20a41300 100644 --- a/src/superio/ite/it8705f/Makefile.inc +++ b/src/superio/ite/it8705f/Makefile.inc @@ -20,4 +20,3 @@ #config chip.h obj-$(CONFIG_SUPERIO_ITE_IT8705F) += superio.o - diff --git a/src/superio/ite/it8705f/chip.h b/src/superio/ite/it8705f/chip.h index c970ca8820..7702247ed9 100644 --- a/src/superio/ite/it8705f/chip.h +++ b/src/superio/ite/it8705f/chip.h @@ -33,4 +33,3 @@ struct superio_ite_it8705f_config { }; #endif /* _SUPERIO_ITE_IT8705F */ - diff --git a/src/superio/ite/it8705f/it8705f.h b/src/superio/ite/it8705f/it8705f.h index 541b1a5dfa..68172d5aec 100644 --- a/src/superio/ite/it8705f/it8705f.h +++ b/src/superio/ite/it8705f/it8705f.h @@ -33,4 +33,3 @@ #define IT8705F_GAME 0x06 /* GAME port */ #define IT8705F_IR 0x07 /* Consumer IR */ #define IT8705F_MIDI 0x08 /* MIDI port */ - diff --git a/src/superio/ite/it8705f/it8705f_early_serial.c b/src/superio/ite/it8705f/it8705f_early_serial.c index a8615d3984..8930d1b8df 100644 --- a/src/superio/ite/it8705f/it8705f_early_serial.c +++ b/src/superio/ite/it8705f/it8705f_early_serial.c @@ -63,8 +63,8 @@ static void it8705f_enable_serial(device_t dev, unsigned iobase) /* (2) Modify the data of configuration registers. */ /* Select the chip to configure (if there's more than one). - Set bit 7 to select JP3=1, clear bit 7 to select JP3=0. - If this register is not written, both chips are configured. */ + Set bit 7 to select JP3=1, clear bit 7 to select JP3=0. + If this register is not written, both chips are configured. */ /* it8705f_sio_write(0x00, IT8705F_CONFIG_REG_CONFIGSEL, 0x00); */ /* Enable serial port(s). */ @@ -80,4 +80,3 @@ static void it8705f_enable_serial(device_t dev, unsigned iobase) /* (3) Exit the configuration state (MB PnP mode). */ it8705f_sio_write(0x00, IT8705F_CONFIG_REG_CC, 0x02); } - diff --git a/src/superio/ite/it8705f/superio.c b/src/superio/ite/it8705f/superio.c index fda705c27a..27f66c3bf5 100644 --- a/src/superio/ite/it8705f/superio.c +++ b/src/superio/ite/it8705f/superio.c @@ -74,8 +74,8 @@ static struct device_operations ops = { /* TODO: FDC, PP, EC, GPIO, GAME, IR, MIDI. */ static struct pnp_info pnp_dev_info[] = { - { &ops, IT8705F_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, - { &ops, IT8705F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, }, + { &ops, IT8705F_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, + { &ops, IT8705F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, }, }; static void enable_dev(struct device *dev) @@ -88,4 +88,3 @@ struct chip_operations superio_ite_it8705f_ops = { CHIP_NAME("ITE IT8705F Super I/O") .enable_dev = enable_dev, }; - diff --git a/src/superio/ite/it8712f/Config.lb b/src/superio/ite/it8712f/Config.lb index e1290e2fad..8e91c171ce 100644 --- a/src/superio/ite/it8712f/Config.lb +++ b/src/superio/ite/it8712f/Config.lb @@ -20,4 +20,3 @@ config chip.h object superio.o - diff --git a/src/superio/ite/it8712f/Makefile.inc b/src/superio/ite/it8712f/Makefile.inc index 898c87906e..a7078e101b 100644 --- a/src/superio/ite/it8712f/Makefile.inc +++ b/src/superio/ite/it8712f/Makefile.inc @@ -20,4 +20,3 @@ #config chip.h obj-$(CONFIG_SUPERIO_ITE_IT8712F) += superio.o - diff --git a/src/superio/ite/it8712f/chip.h b/src/superio/ite/it8712f/chip.h index f47e3cc33c..22dfa8dcc8 100644 --- a/src/superio/ite/it8712f/chip.h +++ b/src/superio/ite/it8712f/chip.h @@ -33,4 +33,3 @@ struct superio_ite_it8712f_config { }; #endif /* _SUPERIO_ITE_IT8712F */ - diff --git a/src/superio/ite/it8712f/it8712f.h b/src/superio/ite/it8712f/it8712f.h index d4231972aa..260b12d798 100644 --- a/src/superio/ite/it8712f/it8712f.h +++ b/src/superio/ite/it8712f/it8712f.h @@ -32,4 +32,3 @@ #define IT8712F_MIDI 0x08 /* MIDI port */ #define IT8712F_GAME 0x09 /* GAME port */ #define IT8712F_IR 0x0a /* Consumer IR */ - diff --git a/src/superio/ite/it8712f/it8712f_early_serial.c b/src/superio/ite/it8712f/it8712f_early_serial.c index 03899625bf..e0bfafd4ac 100644 --- a/src/superio/ite/it8712f/it8712f_early_serial.c +++ b/src/superio/ite/it8712f/it8712f_early_serial.c @@ -47,7 +47,6 @@ static void it8712f_sio_write(uint8_t ldn, uint8_t index, uint8_t value) outb(value, SIO_DATA); } - static void it8712f_enter_conf(void) { /* Enter the configuration state (MB PnP mode). */ @@ -67,7 +66,6 @@ static void it8712f_exit_conf(void) it8712f_sio_write(0x00, IT8712F_CONFIG_REG_CC, 0x02); } - static void it8712f_24mhz_clkin(void) { it8712f_enter_conf(); @@ -76,10 +74,10 @@ static void it8712f_24mhz_clkin(void) it8712f_sio_write(0x00, IT8712F_CONFIG_REG_CLOCKSEL, 0x1); it8712f_exit_conf(); - } -static void it8712f_enable_3vsbsw(void) { +static void it8712f_enable_3vsbsw(void) +{ /* We need to set enable 3VSBSW#, this was documented only in IT8712F_V0.9.2! LDN 7, reg 0x2a - needed for S3, or memory power will be cut off. @@ -93,7 +91,6 @@ static void it8712f_enable_3vsbsw(void) { it8712f_exit_conf(); } - static void it8712f_kill_watchdog(void) { it8712f_enter_conf(); @@ -114,8 +111,8 @@ static void it8712f_enable_serial(device_t dev, unsigned iobase) /* (2) Modify the data of configuration registers. */ /* Select the chip to configure (if there's more than one). - Set bit 7 to select JP3=1, clear bit 7 to select JP3=0. - If this register is not written, both chips are configured. */ + Set bit 7 to select JP3=1, clear bit 7 to select JP3=0. + If this register is not written, both chips are configured. */ /* it8712f_sio_write(0x00, IT8712F_CONFIG_REG_CONFIGSEL, 0x00); */ /* Enable serial port(s). */ diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c index 6a461f74d8..1636d1987a 100644 --- a/src/superio/ite/it8712f/superio.c +++ b/src/superio/ite/it8712f/superio.c @@ -145,4 +145,3 @@ struct chip_operations superio_ite_it8712f_ops = { CHIP_NAME("ITE IT8712F Super I/O") .enable_dev = enable_dev, }; - diff --git a/src/superio/ite/it8716f/Config.lb b/src/superio/ite/it8716f/Config.lb index e1290e2fad..8e91c171ce 100644 --- a/src/superio/ite/it8716f/Config.lb +++ b/src/superio/ite/it8716f/Config.lb @@ -20,4 +20,3 @@ config chip.h object superio.o - diff --git a/src/superio/ite/it8716f/Makefile.inc b/src/superio/ite/it8716f/Makefile.inc index cb7ac32c40..fe0dab0699 100644 --- a/src/superio/ite/it8716f/Makefile.inc +++ b/src/superio/ite/it8716f/Makefile.inc @@ -20,4 +20,3 @@ #config chip.h obj-$(CONFIG_SUPERIO_ITE_IT8716F) += superio.o - diff --git a/src/superio/ite/it8716f/chip.h b/src/superio/ite/it8716f/chip.h index d0991b700d..b7136f7a59 100644 --- a/src/superio/ite/it8716f/chip.h +++ b/src/superio/ite/it8716f/chip.h @@ -33,4 +33,3 @@ struct superio_ite_it8716f_config { }; #endif /* _SUPERIO_ITE_IT8716F */ - diff --git a/src/superio/ite/it8716f/it8716f.h b/src/superio/ite/it8716f/it8716f.h index d3a6d58c61..cc6ad9c4e3 100644 --- a/src/superio/ite/it8716f/it8716f.h +++ b/src/superio/ite/it8716f/it8716f.h @@ -32,4 +32,3 @@ #define IT8716F_MIDI 0x08 /* MIDI port */ #define IT8716F_GAME 0x09 /* GAME port */ #define IT8716F_IR 0x0a /* Consumer IR */ - diff --git a/src/superio/ite/it8716f/it8716f_early_init.c b/src/superio/ite/it8716f/it8716f_early_init.c index e8fdeb8d8f..5a621f19c1 100644 --- a/src/superio/ite/it8716f/it8716f_early_init.c +++ b/src/superio/ite/it8716f/it8716f_early_init.c @@ -35,4 +35,3 @@ static void it8716f_enable_dev(device_t dev, unsigned iobase) pnp_set_iobase(dev, PNP_IDX_IO0, iobase); pnp_set_enable(dev, 1); } - diff --git a/src/superio/ite/it8716f/it8716f_early_serial.c b/src/superio/ite/it8716f/it8716f_early_serial.c index e34cf4210c..37a79a1594 100644 --- a/src/superio/ite/it8716f/it8716f_early_serial.c +++ b/src/superio/ite/it8716f/it8716f_early_serial.c @@ -41,7 +41,7 @@ /* Perform MB PnP setup to put the SIO chip at 0x2e. */ /* Base address 0x2e: 0x87 0x01 0x55 0x55. */ /* Base address 0x4e: 0x87 0x01 0x55 0xaa. */ -static inline void pnp_enter_ext_func_mode(device_t dev) +static inline void pnp_enter_ext_func_mode(device_t dev) { unsigned port = dev >> 8; outb(0x87, port); @@ -68,4 +68,3 @@ static void it8716f_enable_serial(device_t dev, unsigned iobase) pnp_set_enable(dev, 1); pnp_exit_ext_func_mode(dev); } - diff --git a/src/superio/ite/it8718f/Config.lb b/src/superio/ite/it8718f/Config.lb index e1290e2fad..8e91c171ce 100644 --- a/src/superio/ite/it8718f/Config.lb +++ b/src/superio/ite/it8718f/Config.lb @@ -20,4 +20,3 @@ config chip.h object superio.o - diff --git a/src/superio/ite/it8718f/Makefile.inc b/src/superio/ite/it8718f/Makefile.inc index 9b28eb92fb..257afc9240 100644 --- a/src/superio/ite/it8718f/Makefile.inc +++ b/src/superio/ite/it8718f/Makefile.inc @@ -20,4 +20,3 @@ #config chip.h obj-$(CONFIG_SUPERIO_ITE_IT8718F) += superio.o - diff --git a/src/superio/ite/it8718f/chip.h b/src/superio/ite/it8718f/chip.h index 9bea3a58c3..c230014b2f 100644 --- a/src/superio/ite/it8718f/chip.h +++ b/src/superio/ite/it8718f/chip.h @@ -33,4 +33,3 @@ struct superio_ite_it8718f_config { }; #endif /* _SUPERIO_ITE_IT8718F */ - diff --git a/src/superio/ite/it8718f/it8718f_early_serial.c b/src/superio/ite/it8718f/it8718f_early_serial.c index f4fa04ef23..6aae54d65e 100644 --- a/src/superio/ite/it8718f/it8718f_early_serial.c +++ b/src/superio/ite/it8718f/it8718f_early_serial.c @@ -83,8 +83,8 @@ static void it8718f_enable_serial(device_t dev, unsigned iobase) /* (2) Modify the data of configuration registers. */ /* Select the chip to configure (if there's more than one). - Set bit 7 to select JP3=1, clear bit 7 to select JP3=0. - If this register is not written, both chips are configured. */ + Set bit 7 to select JP3=1, clear bit 7 to select JP3=0. + If this register is not written, both chips are configured. */ /* it8718f_sio_write(0x00, IT8718F_CONFIG_REG_CONFIGSEL, 0x00); */ /* Enable serial port(s). */ @@ -97,4 +97,3 @@ static void it8718f_enable_serial(device_t dev, unsigned iobase) /* (3) Exit the configuration state (MB PnP mode). */ it8718f_exit_conf(); } - diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c index 3c1f541b13..1d1d31fcd3 100644 --- a/src/superio/ite/it8718f/superio.c +++ b/src/superio/ite/it8718f/superio.c @@ -74,9 +74,9 @@ static struct device_operations ops = { /* TODO: FDC, PP, EC, KBCM, IR. */ static struct pnp_info pnp_dev_info[] = { - { &ops, IT8718F_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, - { &ops, IT8718F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, }, - { &ops, IT8718F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7f8, 0 }, { 0x7f8, 0x4}, }, + { &ops, IT8718F_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, + { &ops, IT8718F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, }, + { &ops, IT8718F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7f8, 0 }, { 0x7f8, 0x4}, }, }; static void enable_dev(struct device *dev) @@ -89,4 +89,3 @@ struct chip_operations superio_ite_it8718f_ops = { CHIP_NAME("ITE IT8718F Super I/O") .enable_dev = enable_dev, }; - -- cgit v1.2.3