pnp: Allow setting of misc register 0xfa in device tree

BUG=none
TEST=boot tested on Beltino
BRANCH=none

Change-Id: I45885905f0adaa8f0ad9137d7034e6f7a0dc43de
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: https://chromium-review.googlesource.com/175356
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Commit-Queue: Stefan Reinauer <reinauer@chromium.org>
Tested-by: Stefan Reinauer <reinauer@chromium.org>
This commit is contained in:
Stefan Reinauer 2013-10-31 15:58:50 -07:00 committed by chrome-internal-fetch
commit 7fe642543a
4 changed files with 8 additions and 1 deletions

View file

@ -269,6 +269,11 @@ static void get_resources(device_t dev, struct pnp_info *info)
resource->size = 1;
resource->flags |= IORESOURCE_IRQ;
}
if (info->flags & PNP_MSC10) {
resource = new_resource(dev, PNP_IDX_MSC10);
resource->size = 1;
resource->flags |= IORESOURCE_IRQ;
}
}
void pnp_enable_devices(device_t base_dev, struct device_operations *ops,

View file

@ -45,6 +45,7 @@ struct pnp_info {
#define PNP_EN 0x100
#define PNP_MSC0 0x200
#define PNP_MSC1 0x400
#define PNP_MSC10 0x800
struct io_info io0, io1, io2, io3;
};
struct resource *pnp_get_resource(device_t dev, unsigned index);

View file

@ -12,5 +12,6 @@
#define PNP_IDX_DRQ1 0x75
#define PNP_IDX_MSC0 0xf0
#define PNP_IDX_MSC1 0xf1
#define PNP_IDX_MSC10 0xfa
#endif /* DEVICE_PNP_DEF_H */

View file

@ -224,7 +224,7 @@ static struct pnp_info pnp_dev_info[] = {
/* Serial Port 1 */
{ &ops, IT8772F_SP1, PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, },
/* Environmental Controller */
{ &ops, IT8772F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0,
{ &ops, IT8772F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_MSC10,
{0x0ff8, 0}, {0x0ffc, 4}, },
/* KBC Keyboard */
{ &ops, IT8772F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0,