Author: uwe Date: 2007-05-24 20:44:50 +0200 (Thu, 24 May 2007) New Revision: 2695
Modified: trunk/LinuxBIOSv2/src/superio/ite/it8712f/it8712f.h trunk/LinuxBIOSv2/src/superio/ite/it8712f/superio.c Log: Various IT8712F fixes:
- Add missing IT8712F_GPIO definition. - Add functions for entering and exiting MB PnP mode. - Add some more device init lines to pnp_dev_info[].
Signed-off-by: Philipp Degler pdegler@rumms.uni-mannheim.de Acked-by: Uwe Hermann uwe@hermann-uwe.de
Modified: trunk/LinuxBIOSv2/src/superio/ite/it8712f/it8712f.h =================================================================== --- trunk/LinuxBIOSv2/src/superio/ite/it8712f/it8712f.h 2007-05-24 13:55:45 UTC (rev 2694) +++ trunk/LinuxBIOSv2/src/superio/ite/it8712f/it8712f.h 2007-05-24 18:44:50 UTC (rev 2695) @@ -28,6 +28,7 @@ #define IT8712F_EC 0x04 /* Environment controller */ #define IT8712F_KBCK 0x05 /* Keyboard */ #define IT8712F_KBCM 0x06 /* Mouse */ +#define IT8712F_GPIO 0x07 /* GPIO */ #define IT8712F_MIDI 0x08 /* MIDI port */ #define IT8712F_GAME 0x09 /* GAME port */ #define IT8712F_IR 0x0a /* Consumer IR */
Modified: trunk/LinuxBIOSv2/src/superio/ite/it8712f/superio.c =================================================================== --- trunk/LinuxBIOSv2/src/superio/ite/it8712f/superio.c 2007-05-24 13:55:45 UTC (rev 2694) +++ trunk/LinuxBIOSv2/src/superio/ite/it8712f/superio.c 2007-05-24 18:44:50 UTC (rev 2695) @@ -2,6 +2,7 @@ * This file is part of the LinuxBIOS project. * * Copyright (C) 2006 Uwe Hermann uwe@hermann-uwe.de + * Copyright (C) 2007 Philipp Degler pdegler@rumms.uni-mannheim.de * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,11 +23,32 @@ #include <device/pnp.h> #include <uart8250.h> #include <pc80/keyboard.h> +#include <arch/io.h> #include "chip.h" #include "it8712f.h"
-static void init(device_t dev) +/* Base address 0x2e: 0x87 0x01 0x55 0x55. */ +/* Base address 0x4e: 0x87 0x01 0x55 0xaa. */ +static void pnp_enter_ext_func_mode(device_t dev) { + outb(0x87, dev->path.u.pnp.port); + outb(0x01, dev->path.u.pnp.port); + outb(0x55, dev->path.u.pnp.port); + + if (dev->path.u.pnp.port == 0x4e) { + outb(0xaa, dev->path.u.pnp.port); + } else { + outb(0x55, dev->path.u.pnp.port); + } +} + +static void pnp_exit_ext_func_mode(device_t dev) +{ + pnp_write_config(dev, 0x02, 0x02); +} + +static void it8712f_init(device_t dev) +{ struct superio_ite_it8712f_config *conf; struct resource *res0, *res1;
@@ -67,19 +89,45 @@ } }
+static void it8712f_pnp_set_resources(device_t dev) +{ + pnp_enter_ext_func_mode(dev); + pnp_set_resources(dev); + pnp_exit_ext_func_mode(dev); +} + +static void it8712f_pnp_enable_resources(device_t dev) +{ + pnp_enter_ext_func_mode(dev); + pnp_enable_resources(dev); + pnp_exit_ext_func_mode(dev); +} + +static void it8712f_pnp_enable(device_t dev) +{ + pnp_enter_ext_func_mode(dev); + pnp_set_logical_device(dev); + pnp_set_enable(dev, dev->enabled); + pnp_exit_ext_func_mode(dev); +} + static struct device_operations ops = { - .read_resources = pnp_read_resources, - .set_resources = pnp_set_resources, - .enable_resources = pnp_enable_resources, - .enable = pnp_enable, - .init = init, + .read_resources = pnp_read_resources, + .set_resources = it8712f_pnp_set_resources, + .enable_resources = it8712f_pnp_enable_resources, + .enable = it8712f_pnp_enable, + .init = it8712f_init, };
-/* TODO: FDC, PP, EC, KBCM, MIDI, GAME, IR. */ +/* TODO: FDC, MIDI, GAME, IR. */ static struct pnp_info pnp_dev_info[] = { - { &ops, IT8712F_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, - { &ops, IT8712F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, }, - { &ops, IT8712F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7f8, 0 }, { 0x7f8, 0x4}, }, + {&ops, IT8712F_SP1, PNP_IO0 | PNP_IRQ0, {0x7f8, 0}, }, + {&ops, IT8712F_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x7f8, 0}, }, + {&ops, IT8712F_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0},}, + {&ops, IT8712F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x7f8, 0}, {0x7f8, 0x4},}, + {&ops, IT8712F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x7f8, 0}, {0x7f8, 0x4}, }, + {&ops, IT8712F_KBCM, PNP_IRQ0, }, + {&ops, IT8712F_GPIO, }, };
static void enable_dev(struct device *dev)