[coreboot-gerrit] New patch to review for coreboot: 0de1b5c pnp: Allow setting of misc register 0xf4 in device tree

[Isaac Christensen]

Isaac Christensen ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6910

-gerrit

commit 0de1b5ceb3b2064f35693bb8ce787c458132488a
Author: Stefan Reinauer 
Date:   Wed Dec 11 11:06:08 2013 -0800

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

Change-Id: I602f970e0ee2fd634a74fd4c25358c2e78ca58f9
    Signed-off-by: Stefan Reinauer 
    Reviewed-on: https://chromium-review.googlesource.com/179536
    Commit-Queue: Stefan Reinauer 
    Tested-by: Stefan Reinauer 
    Reviewed-by: Shawn Nematbakhsh 
    (cherry picked from commit 02b0583e632f1ba53557f8cfe4293ad4ed29ff4d)
    Signed-off-by: Isaac Christensen 
---
 src/device/pnp_device.c           | 5 +++++
 src/include/device/pnp.h          | 3 ++-
 src/include/device/pnp_def.h      | 1 +
 src/superio/ite/it8772f/superio.c | 3 ++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/device/pnp_device.c b/src/device/pnp_device.c
index 0aaadaa..e4aa4d3 100644
--- a/src/device/pnp_device.c
+++ b/src/device/pnp_device.c
@@ -300,6 +300,11 @@ static void get_resources(device_t dev, struct pnp_info *info)
    	resource->size = 1;
    	resource->flags |= IORESOURCE_IRQ;
    }
+	if (info->flags & PNP_MSC4) {
+		resource = new_resource(dev, PNP_IDX_MSC4);
+		resource->size = 1;
+		resource->flags |= IORESOURCE_IRQ;
+	}
    if (info->flags & PNP_MSC10) {
    	resource = new_resource(dev, PNP_IDX_MSC10);
    	resource->size = 1;
diff --git a/src/include/device/pnp.h b/src/include/device/pnp.h
index aed0439..d0d6fa3 100644
--- a/src/include/device/pnp.h
+++ b/src/include/device/pnp.h
@@ -48,7 +48,8 @@ struct pnp_info {
 #define PNP_EN   0x100
 #define PNP_MSC0 0x200
 #define PNP_MSC1 0x400
-#define PNP_MSC10 0x800
+#define PNP_MSC4 0x800
+#define PNP_MSC10 0x1000
    struct io_info io0, io1, io2, io3;
 };
 struct resource *pnp_get_resource(device_t dev, unsigned index);
diff --git a/src/include/device/pnp_def.h b/src/include/device/pnp_def.h
index 3258354..bbc39fd 100644
--- a/src/include/device/pnp_def.h
+++ b/src/include/device/pnp_def.h
@@ -12,6 +12,7 @@
 #define PNP_IDX_DRQ1 0x75
 #define PNP_IDX_MSC0 0xf0
 #define PNP_IDX_MSC1 0xf1
+#define PNP_IDX_MSC4 0xf4
 #define PNP_IDX_MSC10 0xfa

#endif /* DEVICE_PNP_DEF_H */
diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c
index 44bf33d..38f31c0 100644
--- a/src/superio/ite/it8772f/superio.c
+++ b/src/superio/ite/it8772f/superio.c
@@ -207,7 +207,8 @@ 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 | PNP_MSC10,
+	{ &ops, IT8772F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 |
+		PNP_MSC4 | PNP_MSC10,
      {0x0ff8, 0}, {0x0ffc, 4}, },
    /* KBC Keyboard */
    { &ops, IT8772F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0,