devicetree: Add model name helpers based on compat

Follow up to e1e1664 adding model name
helpers to access generated macros based on a compatible's matching
entries in vendor prefixes.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>

Author: MaureenHelm

include/zephyr/devicetree.h

@@ -1864,7 +1864,7 @@
  */
 
 /**
- * @defgroup devicetree-generic-vendor Vendor name helpers
+ * @defgroup devicetree-generic-vendor Vendor and model name helpers
  * @ingroup devicetree
  * @{
  */
@@ -1951,6 +1951,82 @@
 #define DT_NODE_VENDOR_OR(node_id, default_value) \
 	DT_NODE_VENDOR_BY_IDX_OR(node_id, 0, default_value)
 
+/**
+ * @brief Get the model at index "idx" as a string literal
+ *
+ * The model is a string extracted from the compatible after the vendor prefix.
+ *
+ * Example vendor-prefixes.txt:
+ *
+ *	vnd	A stand-in for a real vendor
+ *	zephyr	Zephyr-specific binding
+ *
+ * Example devicetree fragment:
+ *
+ *	n1: node-1 {
+ *		compatible = "vnd,model1", "gpio", "zephyr,model2";
+ *	};
+ *
+ * Example usage:
+ *
+ *	DT_NODE_MODEL_BY_IDX(DT_NODELABEL(n1), 0) // "model1"
+ *	DT_NODE_MODEL_BY_IDX(DT_NODELABEL(n1), 2) // "model2"
+ *
+ * Notice that the compatible at index 1 doesn't match any entries in the
+ * vendor prefix file and therefore index 1 is not a valid model index. Use
+ * DT_NODE_MODEL_HAS_IDX(node_id, idx) to determine if an index is valid.
+ *
+ * @param node_id node identifier
+ * @param idx index of the model to return
+ * @return string literal of the idx-th model
+ */
+#define DT_NODE_MODEL_BY_IDX(node_id, idx) \
+	DT_CAT3(node_id, _COMPAT_MODEL_IDX_, idx)
+
+/**
+ * @brief Does a node's compatible property have a model at an index?
+ *
+ * If this returns 1, then DT_NODE_MODEL_BY_IDX(node_id, idx) is valid. If it
+ * returns 0, it is an error to use DT_NODE_MODEL_BY_IDX(node_id, idx) with
+ * index "idx".
+ *
+ * @param node_id node identifier
+ * @param idx index of the model to check
+ * @return 1 if "idx" is a valid model index,
+ *         0 otherwise.
+ */
+#define DT_NODE_MODEL_HAS_IDX(node_id, idx) \
+	IS_ENABLED(DT_CAT4(node_id, _COMPAT_MODEL_IDX_, idx, _EXISTS))
+
+/**
+ * @brief Like DT_NODE_MODEL_BY_IDX(), but with a fallback to default_value.
+ *
+ * If the value exists, this expands to DT_NODE_MODEL_BY_IDX(node_id, idx).
+ * The default_value parameter is not expanded in this case.
+ *
+ * Otherwise, this expands to default_value.
+ *
+ * @param node_id node identifier
+ * @param idx index of the model to return
+ * @return string literal of the idx-th model
+ * @param default_value a fallback value to expand to
+ * @return string literal of the idx-th model or "default_value"
+ */
+#define DT_NODE_MODEL_BY_IDX_OR(node_id, idx, default_value) \
+	COND_CODE_1(DT_NODE_MODEL_HAS_IDX(node_id, idx), \
+		    (DT_NODE_MODEL_BY_IDX(node_id, idx)), (default_value))
+
+/**
+ * @brief Get the node's (only) model as a string literal
+ *
+ * Equivalent to DT_NODE_MODEL_BY_IDX_OR(node_id, 0, default_value).
+ *
+ * @param node_id node identifier
+ * @param default_value a fallback value to expand to
+ */
+#define DT_NODE_MODEL_OR(node_id, default_value) \
+	DT_NODE_MODEL_BY_IDX_OR(node_id, 0, default_value)
+
 /**
  * @}
  */

tests/lib/devicetree/api/src/main.c

@@ -37,6 +37,7 @@
 #define TEST_TEMP	DT_NODELABEL(test_temp_sensor)
 #define TEST_REG	DT_NODELABEL(test_reg)
 #define TEST_VENDOR	DT_NODELABEL(test_vendor)
+#define TEST_MODEL	DT_NODELABEL(test_vendor)
 #define TEST_ENUM_0	DT_NODELABEL(test_enum_0)
 
 #define TEST_I2C DT_NODELABEL(test_i2c)
@@ -475,6 +476,34 @@ ZTEST(devicetree_api, test_vendor)
 	zassert_true(!strcmp(DT_NODE_VENDOR_OR(TEST_VENDOR, NULL), VND_VENDOR), "");
 }
 
+#define VND_MODEL "model1"
+#define ZEP_MODEL "model2"
+
+ZTEST(devicetree_api, test_model)
+{
+	/* DT_NODE_MODEL_HAS_IDX */
+	zassert_true(DT_NODE_MODEL_HAS_IDX(TEST_MODEL, 0), "");
+	zassert_false(DT_NODE_MODEL_HAS_IDX(TEST_MODEL, 1), "");
+	zassert_true(DT_NODE_MODEL_HAS_IDX(TEST_MODEL, 2), "");
+	zassert_false(DT_NODE_MODEL_HAS_IDX(TEST_MODEL, 3), "");
+
+	/* DT_NODE_MODEL_BY_IDX */
+	zassert_true(!strcmp(DT_NODE_MODEL_BY_IDX(TEST_MODEL, 0), VND_MODEL), "");
+	zassert_true(!strcmp(DT_NODE_MODEL_BY_IDX(TEST_MODEL, 2), ZEP_MODEL), "");
+
+	/* DT_NODE_MODEL_BY_IDX_OR */
+	zassert_true(!strcmp(DT_NODE_MODEL_BY_IDX_OR(TEST_MODEL, 0, NULL), VND_MODEL), "");
+	zassert_is_null(DT_NODE_MODEL_BY_IDX_OR(TEST_MODEL, 1, NULL), "");
+	zassert_true(!strcmp(DT_NODE_MODEL_BY_IDX_OR(TEST_MODEL, 2, NULL), ZEP_MODEL), "");
+	zassert_is_null(DT_NODE_MODEL_BY_IDX_OR(TEST_MODEL, 3, NULL), "");
+
+	/* DT_NODE_MODEL_OR */
+	zassert_true(!strcmp(DT_NODE_MODEL_OR(TEST_MODEL, NULL), VND_MODEL), "");
+}
+
+#undef ZEP_MODEL
+#undef VND_MODEL
+
 #undef DT_DRV_COMPAT
 #define DT_DRV_COMPAT vnd_reg_holder
 ZTEST(devicetree_api, test_reg)