[coreboot-gerrit] Patch set updated for coreboot: cbec9c2 lenovo/x60: Enable Infrared port.

[Vladimir Serbinenko]

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

-gerrit

commit cbec9c2f6b70167e3e3805d615fadd4731378553
Author: Vladimir Serbinenko 
Date:   Sat Feb 15 19:13:00 2014 +0100

lenovo/x60: Enable Infrared port.

Change-Id: I8ce0195bc85a983627826b31eb9879c3dbc80dd9
    Signed-off-by: Vladimir Serbinenko 
---
 src/mainboard/lenovo/x201/acpi_tables.c | 2 +-
 src/mainboard/lenovo/x60/acpi_tables.c  | 2 +-
 src/mainboard/lenovo/x60/devicetree.cb  | 4 ++++
 src/mainboard/lenovo/x60/romstage.c     | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/mainboard/lenovo/x201/acpi_tables.c b/src/mainboard/lenovo/x201/acpi_tables.c
index 981c52e..26c8f02 100644
--- a/src/mainboard/lenovo/x201/acpi_tables.c
+++ b/src/mainboard/lenovo/x201/acpi_tables.c
@@ -94,7 +94,7 @@ unsigned long acpi_fill_ssdt_generator(unsigned long current,
    			       const char *oem_table_id)
 {
    generate_cpu_entries();
-	drivers_lenovo_serial_ports_ssdt_generate("\_SB.PCI0.LPCB", 0);
+	drivers_lenovo_serial_ports_ssdt_generate("\_SB.PCI0.LPCB", 0, 0);
    return (unsigned long)(acpigen_get_current());
 }

diff --git a/src/mainboard/lenovo/x60/acpi_tables.c b/src/mainboard/lenovo/x60/acpi_tables.c
index d6ce4ba..c7c0a1a 100644
--- a/src/mainboard/lenovo/x60/acpi_tables.c
+++ b/src/mainboard/lenovo/x60/acpi_tables.c
@@ -87,7 +87,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id)
 {
    generate_cpu_entries();
-	drivers_lenovo_serial_ports_ssdt_generate("\_SB.PCI0.LPCB", 1);
+	drivers_lenovo_serial_ports_ssdt_generate("\_SB.PCI0.LPCB", 1, 1);
    return (unsigned long) (acpigen_get_current());
 }

diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb
index 5b4e37f..acd5af3 100644
--- a/src/mainboard/lenovo/x60/devicetree.cb
+++ b/src/mainboard/lenovo/x60/devicetree.cb
@@ -125,6 +125,10 @@ chip northbridge/intel/i945
    			chip superio/nsc/pc87382
    				device pnp 164e.2 on # IR
    					io 0x60 = 0x2f8
+						irq 0x29 = 0xb0
+						irq 0x70 = 0x3
+						drq 0x74 = 0x1
+						irq 0xf0 = 0x82
    				end

device pnp 164e.3 on # Digitizer
diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
index 1198fb2..8eca464 100644
--- a/src/mainboard/lenovo/x60/romstage.c
+++ b/src/mainboard/lenovo/x60/romstage.c
@@ -86,7 +86,7 @@ static void ich7_enable_lpc(void)
    // decode range
    pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x80, 0x0210);
    // decode range
-	pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x1f0d);
+	pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x1f0f);

/* range 0x1600 - 0x167f */
    pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x84, 0x1601);