summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorFreddy Paul <freddy.paul@intel.com>2016-06-20 12:29:10 -0700
committerAaron Durbin <adurbin@chromium.org>2016-06-21 17:08:31 +0200
commit1706cb3ee36e61441a6e65fb4428abdec2bcf69b (patch)
tree6fd26dd60354204cf43e5153e4c2c12060484629 /src/soc
parent15fa992cc8467b4cbd8ebea62e3e4c947827137e (diff)
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)
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/apollolake/include/soc/gpio.h5
1 files changed, 4 insertions, 1 deletions
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_ */