mainboard/google/reef: correct EC ASL includes

The superio.asl wasn't being included within the right scope.
Fix that as well as clean up the per-mainboard header includes
to be in one place.

BUG=chrome-os-partner:56677

Change-Id: I5e6a82f9f2e3c7455132263d19b32b2f06220376
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/16413
Tested-by: build bot (Jenkins)
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Shaunak Saha <shaunak.saha@intel.com>

src/mainboard/google/reef/acpi/ec.asl

@@ -13,9 +13,6 @@
  * GNU General Public License for more details.
  */
 
-/* mainboard configuration */
-#include "../ec.h"
-
 /* Enable EC backed ALS device in ACPI */
 #define EC_ENABLE_ALS_DEVICE
 

src/mainboard/google/reef/acpi/mainboard.asl

@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include "acpi/superio.asl"
+#include "../ec.h"
 #include "../gpio.h"
 
 Scope (\_SB)
@@ -37,5 +37,6 @@ Scope (\_SB)
 Scope (\_SB.PCI0.LPCB)
 {
 	/* Chrome OS Embedded Controller */
+	#include "superio.asl"
 	#include "ec.asl"
 }

src/mainboard/google/reef/acpi/superio.asl

@@ -13,9 +13,6 @@
  * GNU General Public License for more details.
  */
 
-/* mainboard configuration */
-#include "../ec.h"
-
 #define SIO_EC_MEMMAP_ENABLE     // EC Memory Map Resources
 #define SIO_EC_HOST_ENABLE       // EC Host Interface Resources
 #define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard