diff --git a/scripts/dts/edtlib.py b/scripts/dts/edtlib.py
index 88a4b191ee7..37c704a7bb0 100644
--- a/scripts/dts/edtlib.py
+++ b/scripts/dts/edtlib.py
@@ -1357,7 +1357,7 @@ def _gpios(node):
     res = {}
 
     for name, prop in node.props.items():
-        if name.endswith("gpios"):
+        if name.endswith("-gpios") or name == "gpios":
             # Get the prefix from the property name:
             #   - gpios     -> "" (deprecated, should have a prefix)
             #   - foo-gpios -> "foo"
diff --git a/scripts/dts/extract_dts_includes.py b/scripts/dts/extract_dts_includes.py
index e3ceff1b2b3..1e95e4650d1 100755
--- a/scripts/dts/extract_dts_includes.py
+++ b/scripts/dts/extract_dts_includes.py
@@ -84,7 +84,7 @@ def generate_prop_defines(node_path, prop):
         compatible.extract(node_path, prop, def_label)
     elif 'clocks' in prop:
         clocks.extract(node_path, prop, def_label)
-    elif 'pwms' in prop or 'gpios' in prop:
+    elif 'pwms' in prop or '-gpios' in prop or prop == "gpios":
         prop_values = reduced[node_path]['props'][prop]
         generic = prop[:-1]  # Drop the 's' from the prop