mb/google/kahlee: use gpio.h include

Replace the amdblocks/gpio.h, amdblocks/gpio_defs.h and soc/gpio.h
includes with the common gpio.h which will include soc/gpio.h which will
include amdblocks/gpio.h which will include amdblocks/gpio_defs.h in the
AMD SoC case.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I13bc33b91f6e6d52867da9043bb386f3befac5fb
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70433
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>

src/mainboard/google/kahlee/bootblock/bootblock.c

@@ -2,7 +2,7 @@
 
 #include <baseboard/variants.h>
 #include <bootblock_common.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/southbridge.h>
 #include <amdblocks/lpc.h>
 #include <variant/ec.h>

src/mainboard/google/kahlee/mainboard.c

@@ -10,8 +10,8 @@
 #include <amdblocks/i2c.h>
 #include <baseboard/variants.h>
 #include <boardid.h>
+#include <gpio.h>
 #include <smbios.h>
-#include <soc/gpio.h>
 #include <soc/pci_devs.h>
 #include <soc/southbridge.h>
 #include <amdblocks/acpimmio.h>

src/mainboard/google/kahlee/romstage.c

@@ -3,7 +3,7 @@
 #include <amdblocks/dimm_spd.h>
 #include <arch/romstage.h>
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 
 int mainboard_read_spd(uint8_t spdAddress, char *buf, size_t len)
 {

src/mainboard/google/kahlee/variants/baseboard/gpio.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <baseboard/variants.h>
-#include <soc/gpio.h>
+#include <gpio.h>
 #include <soc/southbridge.h>
 #include <variant/gpio.h>
 

src/mainboard/google/kahlee/variants/baseboard/include/baseboard/gpio.h

@@ -4,8 +4,7 @@
 #define __BASEBOARD_GPIO_H__
 
 #ifndef __ACPI__
-#include <amdblocks/gpio_defs.h>
+#include <gpio.h>
-#include <soc/gpio.h>
 
 # define MEM_CONFIG0		GPIO_139
 # define MEM_CONFIG1		GPIO_142

src/mainboard/google/kahlee/variants/baseboard/tpm_tis.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <gpio.h>
 #include <security/tpm/tis.h>
-#include <soc/gpio.h>
 #include <variant/gpio.h>
 
 int tis_plat_irq_status(void)