diff --git a/include/devicetree/gpio.h b/include/devicetree/gpio.h
index 485c74074556d..51e08728a58e5 100644
--- a/include/devicetree/gpio.h
+++ b/include/devicetree/gpio.h
@@ -190,6 +190,94 @@ extern "C" {
 #define DT_INST_GPIO_FLAGS(inst, gpio_pha) \
 	DT_INST_GPIO_FLAGS_BY_IDX(inst, gpio_pha, 0)
 
+/**
+ * @brief Create a struct initializer for a "gpio" phandle-array element
+ *
+ * The struct initializer will be of the form:
+ *
+ * { label, pin, flags },
+ *
+ * Example devicetree fragment:
+ *
+ *     gpio1: gpio@... {
+ *             label = "GPIO_1";
+ *     };
+ *
+ *     gpio2: gpio@... {
+ *             label = "GPIO_2";
+ *     };
+ *
+ *     n: node {
+ *             gpios = <&gpio1 10 20>, <&gpio2 30 40>;
+ *     };
+ *
+ * Example usage:
+ *
+ *     DT_GPIO_ELEM(DT_NODELABEL(n), gpios, 1)
+ *
+ * Will produce the following struct initializer:
+ *
+ *     { "GPIO_2", 30, 40 },
+ *
+ * The idx element is placed first so that the macro will be usable by
+ * UTIL_LISTIFY
+ *
+ * @param idx into the gpio_pha phandle-array
+ * @param node_id node identifier
+ * @param gpio_pha lowercase-and-underscores GPIO property with
+ *        type "phandle-array"
+ * @return a struct initializer for the give index "idx" into the
+ *         "phandle-array" gpio_pha
+ */
+#define DT_GPIO_ELEM(idx, node_id, gpio_pha) \
+	{ \
+		DT_GPIO_LABEL_BY_IDX(node_id, gpio_pha, idx), \
+		DT_GPIO_PIN_BY_IDX(node_id, gpio_pha, idx), \
+		DT_GPIO_FLAGS_BY_IDX(node_id, gpio_pha, idx), \
+	},
+
+/**
+ * @brief Create an array initializer for a "gpio" phandle-array
+ *
+ * The array initializer will be of the form:
+ *
+ * {
+ *     { label[0], pin[0], flags[0] }
+ *     ...
+ *     { label[n-1], pin[n-1], flags[n-1] },
+ * }
+ *
+ * Example devicetree fragment:
+ *
+ *     gpio1: gpio@... {
+ *             label = "GPIO_1";
+ *     };
+ *
+ *     gpio2: gpio@... {
+ *             label = "GPIO_2";
+ *     };
+ *
+ *     n: node {
+ *             gpios = <&gpio1 10 20>, <&gpio2 30 40>;
+ *     };
+ *
+ * Example usage:
+ *
+ *     DT_GPIO_LISTIFY(DT_NODELABEL(n), gpios)
+ *
+ * Will produce:
+ *
+ *     { { "GPIO_1", 10, 20 }, { "GPIO_2", 30, 40 }, }
+ *
+ * @param node_id node identifier
+ * @param gpio_pha lowercase-and-underscores GPIO property with
+ *        type "phandle-array"
+ * @return an array initializer for the given "phandle-array" gpio_pha
+ */
+#define DT_GPIO_LISTIFY(node_id, gpio_pha) \
+	{ UTIL_LISTIFY(DT_PROP_LEN(node_id, gpio_pha), DT_GPIO_ELEM, \
+		       node_id, gpio_pha) }
+
 /**
  * @}
  */
diff --git a/tests/lib/devicetree/src/main.c b/tests/lib/devicetree/src/main.c
index aa6ca2f2a2af9..9eedda58ae258 100644
--- a/tests/lib/devicetree/src/main.c
+++ b/tests/lib/devicetree/src/main.c
@@ -519,17 +519,6 @@ struct gpios_struct {
 		       label) \
 	}
 
-/* Helper macro that UTIL_LISTIFY can use and produces an element with comma */
-#define DT_GPIO_ELEM(idx, node_id, prop) \
-	{ \
-		DT_PROP(DT_PHANDLE_BY_IDX(node_id, prop, idx), label), \
-		DT_PHA_BY_IDX(node_id, prop, idx, pin),\
-		DT_PHA_BY_IDX(node_id, prop, idx, flags),\
-	},
-#define DT_GPIO_LISTIFY(node_id, prop) \
-	{ UTIL_LISTIFY(DT_PROP_LEN(node_id, prop), DT_GPIO_ELEM, \
-		       node_id, prop) }
-
 #undef DT_DRV_COMPAT
 #define DT_DRV_COMPAT vnd_phandle_holder
 static void test_phandles(void)