x86: Unify arch/io.h and arch/romcc_io.h

Here's the great news: From now on you don't have to worry about
hitting the right io.h include anymore. Just forget about romcc_io.h
and use io.h instead. This cleanup has a number of advantages, like
you don't have to guard device/ includes for SMM and pre RAM
anymore. This allows to get rid of a number of ifdefs and will
generally make the code more readable and understandable.

Potentially in the future some of the code in the io.h __PRE_RAM__
path should move to device.h or other device/ includes instead,
but that's another incremental change.

Change-Id: I356f06110e2e355e9a5b4b08c132591f36fec7d9
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/2872
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

src/ec/acpi/ec.c

@@ -138,6 +138,8 @@ void ec_set_ports(u16 cmd_reg, u16 data_reg)
 	ec_data_reg = data_reg;
 }
 
+#if !defined(__SMM__) && !defined(__PRE_RAM__)
 struct chip_operations ec_acpi_ops = {
 	CHIP_NAME("ACPI Embedded Controller")
 };
+#endif

src/ec/google/chromeec/ec.c

@@ -21,12 +21,9 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <delay.h>
-
-#ifdef __PRE_RAM__
-#include <arch/romcc_io.h>
-#else
 #include <device/device.h>
 #include <device/pnp.h>
+#ifndef __PRE_RAM__
 #include <elog.h>
 #include <stdlib.h>
 #include <string.h>

src/ec/quanta/ene_kb3940q/ec.c

@@ -22,10 +22,10 @@
 #ifndef __PRE_RAM__
 
 #include <console/console.h>
+#include <arch/io.h>
 #include <device/device.h>
 #include <device/pnp.h>
 #include <stdlib.h>
-#include <arch/io.h>
 #include <delay.h>
 #include <elog.h>
 #include "ec.h"

src/ec/smsc/mec1308/ec.c

@@ -119,6 +119,7 @@ void ec_set_ports(u16 cmd_reg, u16 data_reg)
 	ec_data_reg = data_reg;
 }
 
+#if !defined(__PRE_RAM__) && !defined(__SMM__)
 static void mec1308_enable(device_t dev)
 {
 	struct ec_smsc_mec1308_config *conf = dev->chip_info;
@@ -133,3 +134,4 @@ struct chip_operations ec_smsc_mec1308_ops = {
 	CHIP_NAME("SMSC MEC1308 EC Mailbox Interface")
 	.enable_dev = mec1308_enable
 };
+#endif