zephyr: Remove gpio_map.h legacy include file

Remove gpio_map.h and update Kconfig references to it.

BUG=b:237716584
TEST=zmake testall
BRANCH=none

Signed-off-by: Andrew McRae <amcrae@google.com>
Change-Id: I4b21b53a4a63c6a934f9ab3bef3707e225bd01b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3750267
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>

19 files changed, 13 insertions, 139 deletions

diff --git a/zephyr/Kconfig b/zephyr/Kconfig
index 6e17b9ed13..33176c4237 100644
--- a/zephyr/Kconfig
+++ b/zephyr/Kconfig
@@ -327,7 +327,7 @@ config PLATFORM_EC_EXTPOWER_GPIO
 	  Enable shimming the extpower_gpio module, which provides
 	  GPIO-based external power presence detection features.  The
 	  project should define a GPIO pin named GPIO_AC_PRESENT, with
-	  extpower_interrupt configured as the handler in gpio_map.h.
+	  extpower_interrupt configured as the handler.
 
 config PLATFORM_EC_FLASH_CROS
 	bool
@@ -429,7 +429,7 @@ config PLATFORM_EC_LID_SWITCH
 	  behaviour. For example, when the lid is opened, the device may
 	  automatically power on.
 
-	  This requires a GPIO named GPIO_LID_OPEN to be defined in gpio_map.h.
+	  This requires a GPIO named GPIO_LID_OPEN to be defined or aliased.
 
 config PLATFORM_EC_MKBP_INPUT_DEVICES
 	bool "Input devices via MKBP"
@@ -540,7 +540,7 @@ config PLATFORM_EC_POWER_BUTTON
 	  commands in platform/ec.  This is used to implement the Chromium OS
 	  shutdown sequence.
 
-	  This requires a GPIO named GPIO_POWER_BUTTON_L in gpio_map.h.
+	  This requires a GPIO named GPIO_POWER_BUTTON_L.
 
 config PLATFORM_EC_PWM_HC
 	bool
diff --git a/zephyr/Kconfig.battery b/zephyr/Kconfig.battery
index 7b3f20da38..123c5eba58 100644
--- a/zephyr/Kconfig.battery
+++ b/zephyr/Kconfig.battery
@@ -57,19 +57,17 @@ config PLATFORM_EC_BATTERY_PRESENT_GPIO
 	  GPIO should read low if the battery is present, high if absent.
 
 	  The GPIO is hard-coded to GPIO_BATT_PRES_ODL so you should define this
-	  in the device tree and GPIO map. The convention is to use the signal
+	  in the device tree. The convention is to use the signal
 	  name from schematic as both the node name and label for the GPIO. For
 	  example:
 
 	    /* gpio.dts */
 	    ec_batt_pres_odl {
 	    	gpios = <&gpioe 5 GPIO_INPUT>;
-	    	label = "EC_BATT_PRES_ODL";
+	    	enum-name = "EC_BATT_PRES_ODL";
+		alias = "GPIO_BATT_PRES_ODL";
 	    };
 
-	    /* gpio_map.h */
-	    #define GPIO_BATT_PRES_ODL		NAMED_GPIO(ec_batt_pres_odl)
-
 endchoice # PLATFORM_EC_BATTERY_PRESENT_MODE
 
 config PLATFORM_EC_USE_BATTERY_DEVICE_CHEMISTRY
diff --git a/zephyr/Kconfig.espi b/zephyr/Kconfig.espi
index 60ea99def7..d608a164ef 100644
--- a/zephyr/Kconfig.espi
+++ b/zephyr/Kconfig.espi
@@ -8,13 +8,13 @@ config PLATFORM_EC_ESPI_VW_SLP_S3
 	bool "SLP_S3 is an eSPI virtual wire instead of a GPIO"
 	help
 	  For power sequencing, use an eSPI virtual wire instead of
-	  defining GPIO_PCH_SLP_S3 in gpio_map.h.
+	  defining GPIO_PCH_SLP_S3 in the GPIO device tree.
 
 config PLATFORM_EC_ESPI_VW_SLP_S4
 	bool "SLP_S4 is an eSPI virtual wire instead of a GPIO"
 	help
 	  For power sequencing, use an eSPI virtual wire instead of
-	  defining GPIO_PCH_SLP_S4 in gpio_map.h.
+	  defining GPIO_PCH_SLP_S4 in the GPIO device tree.
 
 config PLATFORM_EC_ESPI_VW_SLP_S5
 	bool "SLP_S5 is an eSPI virtual wire instead of an alias for SLP_S4"
diff --git a/zephyr/Kconfig.keyboard b/zephyr/Kconfig.keyboard
index 8bcc32af8e..51cf7bf433 100644
--- a/zephyr/Kconfig.keyboard
+++ b/zephyr/Kconfig.keyboard
@@ -145,8 +145,8 @@ config PLATFORM_EC_VOLUME_BUTTONS
 	  These are buttons controlled by GPIOs and are not part of the keyboard
 	  matrix.
 
-	  Your board must define GPIO_VOLUME_UP_L and GPIO_VOLUME_DOWN_L in
-	  gpio_map.h
+	  Your board must define GPIO_VOLUME_UP_L and GPIO_VOLUME_DOWN_L as
+	  GPIOs names or as aliases in the GPIO devicetree configuration.
 
 config PLATFORM_EC_BUTTONS_RUNTIME_CONFIG
 	bool "Enable buttons runtime configuration"
diff --git a/zephyr/Kconfig.mkbp_event b/zephyr/Kconfig.mkbp_event
index e24cf370d2..66dc2e0690 100644
--- a/zephyr/Kconfig.mkbp_event
+++ b/zephyr/Kconfig.mkbp_event
@@ -14,7 +14,7 @@ config PLATFORM_EC_MKBP_USE_GPIO
     bool "Use GPIO"
     help
       Select to send MKBP events via GPIO. You should define GPIO_EC_INT_L
-      in gpio_map.h as output from the EC. The GPIO is used to indicate an
+      as a GPIO output from the EC. The GPIO is used to indicate an
       event is ready for serving by the AP.
 
 config PLATFORM_EC_MKBP_USE_HOST_EVENT
diff --git a/zephyr/Kconfig.powerseq b/zephyr/Kconfig.powerseq
index f0db496082..dbc8187830 100644
--- a/zephyr/Kconfig.powerseq
+++ b/zephyr/Kconfig.powerseq
@@ -126,8 +126,8 @@ config PLATFORM_EC_POWERSEQ_RTC_RESET
 	bool "Board has an RTC reset"
 	help
 	  This project has a gpio named GPIO_PCH_RTCRST defined in
-	  gpio_map.h, which can be used to reset the AP's RTC when set
-	  high.
+	  the GPIO configuration, which can be used to reset the AP's RTC when
+	  set high.
 
 config PLATFORM_EC_POWERSEQ_S4
 	bool "Advertise S4 residency"
diff --git a/zephyr/projects/brya/include/gpio_map.h b/zephyr/projects/brya/include/gpio_map.h
deleted file mode 100644
index c2b81fe5c6..0000000000
--- a/zephyr/projects/brya/include/gpio_map.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __ZEPHYR_GPIO_MAP_H
-#define __ZEPHYR_GPIO_MAP_H
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/projects/corsola/include/gpio_map.h b/zephyr/projects/corsola/include/gpio_map.h
deleted file mode 100644
index c2b81fe5c6..0000000000
--- a/zephyr/projects/corsola/include/gpio_map.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __ZEPHYR_GPIO_MAP_H
-#define __ZEPHYR_GPIO_MAP_H
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/projects/herobrine/include/gpio_map.h b/zephyr/projects/herobrine/include/gpio_map.h
deleted file mode 100644
index c2b81fe5c6..0000000000
--- a/zephyr/projects/herobrine/include/gpio_map.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __ZEPHYR_GPIO_MAP_H
-#define __ZEPHYR_GPIO_MAP_H
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/projects/intelrvp/include/gpio_map.h b/zephyr/projects/intelrvp/include/gpio_map.h
deleted file mode 100644
index ac31d03926..0000000000
--- a/zephyr/projects/intelrvp/include/gpio_map.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __ZEPHYR_GPIO_MAP_H
-#define __ZEPHYR_GPIO_MAP_H
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/projects/it8xxx2_evb/include/gpio_map.h b/zephyr/projects/it8xxx2_evb/include/gpio_map.h
deleted file mode 100644
index c2b81fe5c6..0000000000
--- a/zephyr/projects/it8xxx2_evb/include/gpio_map.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __ZEPHYR_GPIO_MAP_H
-#define __ZEPHYR_GPIO_MAP_H
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/projects/minimal/include/gpio_map.h b/zephyr/projects/minimal/include/gpio_map.h
deleted file mode 100644
index 886e7d1ebf..0000000000
--- a/zephyr/projects/minimal/include/gpio_map.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright 2022 The ChromiumOS Authors.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __ZEPHYR_GPIO_MAP_H
-#define __ZEPHYR_GPIO_MAP_H
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/projects/nissa/include/gpio_map.h b/zephyr/projects/nissa/include/gpio_map.h
deleted file mode 100644
index e99bf2c131..0000000000
--- a/zephyr/projects/nissa/include/gpio_map.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
diff --git a/zephyr/projects/npcx_evb/npcx7/include/gpio_map.h b/zephyr/projects/npcx_evb/npcx7/include/gpio_map.h
deleted file mode 100644
index c2b81fe5c6..0000000000
--- a/zephyr/projects/npcx_evb/npcx7/include/gpio_map.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __ZEPHYR_GPIO_MAP_H
-#define __ZEPHYR_GPIO_MAP_H
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/projects/npcx_evb/npcx9/include/gpio_map.h b/zephyr/projects/npcx_evb/npcx9/include/gpio_map.h
deleted file mode 100644
index c2b81fe5c6..0000000000
--- a/zephyr/projects/npcx_evb/npcx9/include/gpio_map.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __ZEPHYR_GPIO_MAP_H
-#define __ZEPHYR_GPIO_MAP_H
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/projects/skyrim/include/gpio_map.h b/zephyr/projects/skyrim/include/gpio_map.h
deleted file mode 100644
index c2b81fe5c6..0000000000
--- a/zephyr/projects/skyrim/include/gpio_map.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __ZEPHYR_GPIO_MAP_H
-#define __ZEPHYR_GPIO_MAP_H
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/projects/skyrim/include_guybrush/gpio_map.h b/zephyr/projects/skyrim/include_guybrush/gpio_map.h
deleted file mode 100644
index 22d0eb602e..0000000000
--- a/zephyr/projects/skyrim/include_guybrush/gpio_map.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __ZEPHYR_GPIO_MAP_H
-#define __ZEPHYR_GPIO_MAP_H
-
-#include <zephyr/devicetree.h>
-#include <gpio_signal.h>
-
-/* Power input signals */
-enum power_signal {
-	X86_SLP_S0_N, /* SOC  -> SLP_S3_S0I3_L */
-	X86_SLP_S3_N, /* SOC  -> SLP_S3_L */
-	X86_SLP_S5_N, /* SOC  -> SLP_S5_L */
-
-	X86_S0_PGOOD, /* PMIC -> S0_PWROK_OD */
-	X86_S5_PGOOD, /* PMIC -> S5_PWROK */
-
-	/* Number of X86 signals */
-	POWER_SIGNAL_COUNT,
-};
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/projects/trogdor/lazor/include/gpio_map.h b/zephyr/projects/trogdor/lazor/include/gpio_map.h
deleted file mode 100644
index c2b81fe5c6..0000000000
--- a/zephyr/projects/trogdor/lazor/include/gpio_map.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __ZEPHYR_GPIO_MAP_H
-#define __ZEPHYR_GPIO_MAP_H
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/shim/include/board.h b/zephyr/shim/include/board.h
index c1a391b56a..1175ad4a28 100644
--- a/zephyr/shim/include/board.h
+++ b/zephyr/shim/include/board.h
@@ -15,11 +15,6 @@
 /* Include shimmed version of power signal */
 #include "power/power.h"
 
-/* Include board specific gpio mapping/aliases if named_pgios node exists */
-#if !defined(TEST_BUILD) && DT_NODE_EXISTS(DT_PATH(named_gpios))
-#include "gpio_map.h"
-#endif
-
 /* Include board specific i2c mapping if I2C is enabled. */
 #if defined(CONFIG_I2C)
 #include "i2c/i2c.h"