From 97ee153046b432d24fc7242ecbe4080ae1f1b9d8 Mon Sep 17 00:00:00 2001
From: Elyes Haouas <ehaouas@noos.fr>
Date: Tue, 4 Jun 2024 10:27:13 +0200
Subject: mb/intel/coffeelake_rvp: Prefer include <soc/gpio.h> via <gpio.h>

Change-Id: I98aa3f582963f76690f907b678ac322ed4cc99d1
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/82846
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/intel/coffeelake_rvp/bootblock.c                          | 2 +-
 src/mainboard/intel/coffeelake_rvp/mainboard.c                          | 2 +-
 .../intel/coffeelake_rvp/variants/baseboard/include/baseboard/gpio.h    | 2 +-
 .../coffeelake_rvp/variants/baseboard/include/baseboard/variants.h      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mainboard/intel/coffeelake_rvp')

diff --git a/src/mainboard/intel/coffeelake_rvp/bootblock.c b/src/mainboard/intel/coffeelake_rvp/bootblock.c
index 90833269e4..df30c471f8 100644
--- a/src/mainboard/intel/coffeelake_rvp/bootblock.c
+++ b/src/mainboard/intel/coffeelake_rvp/bootblock.c
@@ -2,7 +2,7 @@
 
 #include <baseboard/variants.h>
 #include <bootblock_common.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 void bootblock_mainboard_early_init(void)
 {
diff --git a/src/mainboard/intel/coffeelake_rvp/mainboard.c b/src/mainboard/intel/coffeelake_rvp/mainboard.c
index eb9a316a34..481f715624 100644
--- a/src/mainboard/intel/coffeelake_rvp/mainboard.c
+++ b/src/mainboard/intel/coffeelake_rvp/mainboard.c
@@ -4,7 +4,7 @@
 #include <baseboard/variants.h>
 #include <device/device.h>
 #include <nhlt.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/nhlt.h>
 
 static void mainboard_init(void *chip_info)
diff --git a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/include/baseboard/gpio.h
index 102f5e12eb..848024ec10 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/include/baseboard/gpio.h
+++ b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/include/baseboard/gpio.h
@@ -3,6 +3,6 @@
 #ifndef __BASEBOARD_GPIO_H__
 #define __BASEBOARD_GPIO_H__
 
-#include <soc/gpio.h>
+#include <gpio.h>
 
 #endif /* __BASEBOARD_GPIO_H__ */
diff --git a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/include/baseboard/variants.h b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/include/baseboard/variants.h
index 6ae25d4d84..d93c446f13 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/include/baseboard/variants.h
@@ -4,7 +4,7 @@
 #define __BASEBOARD_VARIANTS_H__
 
 #include <soc/cnl_memcfg_init.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 /* The next set of functions return the gpio table and fill in the number of
  * entries for each table. */
-- 
cgit v1.2.3