summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Nino Diaz <antonio.ninodiaz@arm.com>2016-02-17 11:00:37 +0000
committerAntonio Nino Diaz <antonio.ninodiaz@arm.com>2016-02-17 17:23:46 +0000
commite0ea0928d5b7779cd9c3dfb1aec4879ae35c0625 (patch)
treef19066d6f04a833e45fc6cb8f2ab7899655b5879
parent4a9663062cef254e79189e4fbde85172eb58f9ce (diff)
Fix gpio includes of mt8173 platform to avoid collision.
All files including plat/mediatek/mt8173/drivers/gpio/gpio.h were using system includes instead of user includes, which may cause the wrong version of the header to be included. Said includes have been changed to user includes to make sure that the included file is the wanted one. Change-Id: I29bdfe96fbd9a7900875e2357bbb43f3ea431fa5
-rw-r--r--plat/mediatek/mt8173/drivers/gpio/gpio.c2
-rw-r--r--plat/mediatek/mt8173/plat_pm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/plat/mediatek/mt8173/drivers/gpio/gpio.c b/plat/mediatek/mt8173/drivers/gpio/gpio.c
index 20473b91..f19c9315 100644
--- a/plat/mediatek/mt8173/drivers/gpio/gpio.c
+++ b/plat/mediatek/mt8173/drivers/gpio/gpio.c
@@ -28,10 +28,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <debug.h>
-#include <gpio.h>
#include <mmio.h>
#include <mt8173_def.h>
#include <pmic_wrap_init.h>
+#include "gpio.h"
enum {
MAX_GPIO_REG_BITS = 16,
diff --git a/plat/mediatek/mt8173/plat_pm.c b/plat/mediatek/mt8173/plat_pm.c
index f28f8edc..be33c911 100644
--- a/plat/mediatek/mt8173/plat_pm.c
+++ b/plat/mediatek/mt8173/plat_pm.c
@@ -36,7 +36,6 @@
#include <console.h>
#include <debug.h>
#include <errno.h>
-#include <gpio.h>
#include <mcucfg.h>
#include <mmio.h>
#include <mt8173_def.h>
@@ -49,6 +48,7 @@
#include <spm_hotplug.h>
#include <spm_mcdi.h>
#include <spm_suspend.h>
+#include "drivers/gpio/gpio.h"
struct core_context {
unsigned long timer_data[8];