[coreboot-gerrit] Patch set updated for coreboot: fb61c12 Revert "roda/rk886ex: Move device changes to mainboard code from acpi tables code"

[Vladimir Serbinenko (phcoder@gmail.com)]

Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6844

-gerrit

commit fb61c1246bc2a39df9b97e03deee38f24dadb4f1
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date:   Fri Sep 5 22:56:37 2014 +0200

    Revert "roda/rk886ex: Move device changes to mainboard code from acpi tables code"
    
    This reverts commit 5dfd6819785590a1c4ea092160b78fe59a54a684.
    
    For the time being let's keep it how it was until we find a better solution.
    
    Change-Id: Iebd60a4c76dbc5d29c773002a94b16e33356f9f5
    Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
---
 src/mainboard/roda/rk886ex/acpi_tables.c | 4 ++++
 src/mainboard/roda/rk886ex/mainboard.c   | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mainboard/roda/rk886ex/acpi_tables.c b/src/mainboard/roda/rk886ex/acpi_tables.c
index c81c2f6..f6ed4ae 100644
--- a/src/mainboard/roda/rk886ex/acpi_tables.c
+++ b/src/mainboard/roda/rk886ex/acpi_tables.c
@@ -263,5 +263,9 @@ unsigned long write_acpi_tables(unsigned long start)
 	printk(BIOS_DEBUG, "current = %lx\n", current);
 	printk(BIOS_INFO, "ACPI: done.\n");
 
+	/* Enable Dummy DCC ON# for DVI */
+	printk(BIOS_DEBUG, "Laptop handling...\n");
+	outb(inb(0x60f) & ~(1 << 5), 0x60f);
+
 	return current;
 }
diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c
index 7158dca..7f188d4 100644
--- a/src/mainboard/roda/rk886ex/mainboard.c
+++ b/src/mainboard/roda/rk886ex/mainboard.c
@@ -131,9 +131,6 @@ static void mainboard_enable(device_t dev)
 #if DUMP_RUNTIME_REGISTERS
 	dump_runtime_registers();
 #endif
-	/* Enable Dummy DCC ON# for DVI */
-	printk(BIOS_DEBUG, "Laptop handling...\n");
-	outb(inb(0x60f) & ~(1 << 5), 0x60f);
 }
 
 struct chip_operations mainboard_ops = {