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,7 +2,7 @@
 
 #include <baseboard/variants.h>
 #include <bootblock_common.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 void bootblock_mainboard_early_init(void)
 {

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)

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__ */

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. */