From 1706cb3ee36e61441a6e65fb4428abdec2bcf69b Mon Sep 17 00:00:00 2001
From: Freddy Paul <freddy.paul@intel.com>
Date: Mon, 20 Jun 2016 12:29:10 -0700
Subject: soc/intel/apollolake: make gpo.h ACPI compatible

BUG=None
TEST=Build with <soc/gpio.h> included in mainboard.asl

Change-Id: Id6fdc50d09c014f930fdfd5c2fde0df827ad5181
Signed-off-by: Freddy Paul <freddy.paul@intel.com>
Reviewed-on: https://review.coreboot.org/15272
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
---
 src/soc/intel/apollolake/include/soc/gpio.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/soc/intel/apollolake/include/soc/gpio.h b/src/soc/intel/apollolake/include/soc/gpio.h
index f01284eb4e..c9d32ccf56 100644
--- a/src/soc/intel/apollolake/include/soc/gpio.h
+++ b/src/soc/intel/apollolake/include/soc/gpio.h
@@ -18,8 +18,10 @@
 #ifndef _SOC_APOLLOLAKE_GPIO_H_
 #define _SOC_APOLLOLAKE_GPIO_H_
 
-#include <types.h>
 #include <soc/gpio_defs.h>
+/* __ACPI__ guard is needed to ignore below code in ACPI/ASL compilation */
+#ifndef __ACPI__
+#include <types.h>
 
 typedef uint32_t gpio_t;
 
@@ -97,4 +99,5 @@ struct pad_config {
 void gpio_configure_pad(const struct pad_config *cfg);
 void gpio_configure_pads(const struct pad_config *cfg, size_t num_pads);
 
+#endif /* __ACPI__ */
 #endif /* _SOC_APOLLOLAKE_GPIO_H_ */
-- 
cgit v1.2.3