From 5dfd6819785590a1c4ea092160b78fe59a54a684 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 31 Aug 2014 00:30:26 +0200
Subject: roda/rk886ex: Move device changes to mainboard code from acpi tables
 code

Change-Id: I3d694e5b3092d78bce89f6baa7b2dedffddf3012
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/6807
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
---
 src/mainboard/roda/rk886ex/acpi_tables.c | 4 ----
 src/mainboard/roda/rk886ex/mainboard.c   | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/mainboard/roda/rk886ex/acpi_tables.c b/src/mainboard/roda/rk886ex/acpi_tables.c
index f6ed4ae6dd..c81c2f6c9c 100644
--- a/src/mainboard/roda/rk886ex/acpi_tables.c
+++ b/src/mainboard/roda/rk886ex/acpi_tables.c
@@ -263,9 +263,5 @@ 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 7f188d406e..7158dca300 100644
--- a/src/mainboard/roda/rk886ex/mainboard.c
+++ b/src/mainboard/roda/rk886ex/mainboard.c
@@ -131,6 +131,9 @@ 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 = {
-- 
cgit v1.2.3