[nrf fromlist] devicetree: Fix ADDRESS macro for non-nv-flash

Currently the DT_FIXED_PARTITION_ADDR as well as
DT_FIXED_SUBPARTITION_ADDR works only for partitions under the
soc,nv-flash -compatible nodes.
This commit adds a conditional expression, so the macro covers all types
of partitions.

Upstream PR #: 96808

Signed-off-by: Tomasz Chyrowicz <[email protected]>

Author: tomchy

include/zephyr/devicetree/fixed-partitions.h

@@ -131,7 +131,9 @@ extern "C" {
  * node containing it.
  */
 #define DT_FIXED_PARTITION_ADDR(node_id)                                                           \
-	(DT_REG_ADDR(DT_MEM_FROM_FIXED_PARTITION(node_id)) + DT_REG_ADDR(node_id))
+	(DT_REG_ADDR(node_id) + (DT_REG_ADDR(COND_CODE_1(                                          \
+		DT_NODE_EXISTS(DT_MEM_FROM_FIXED_PARTITION(node_id)),                              \
+		    (DT_MEM_FROM_FIXED_PARTITION(node_id)), (DT_GPARENT(node_id))))))
 
 /**
  * @brief Test if fixed-subpartitions compatible node exists
@@ -207,7 +209,9 @@ extern "C" {
  * node containing it.
  */
 #define DT_FIXED_SUBPARTITION_ADDR(node_id)                                                        \
-	(DT_REG_ADDR(DT_MEM_FROM_FIXED_SUBPARTITION(node_id)) + DT_REG_ADDR(node_id))
+	(DT_REG_ADDR(node_id) + (DT_REG_ADDR(COND_CODE_1(                                          \
+		DT_NODE_EXISTS(DT_MEM_FROM_FIXED_SUBPARTITION(node_id)),                           \
+		    (DT_MEM_FROM_FIXED_SUBPARTITION(node_id)), (DT_GPARENT(DT_PARENT(node_id)))))))
 
 /**
  * @}

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

@@ -3271,13 +3271,7 @@ ZTEST(devicetree_api, test_fixed_partitions)
 	/* Test DT_FIXED_PARTITION_ADDR. */
 	zassert_equal(DT_FIXED_PARTITION_ADDR(TEST_PARTITION_0), 0x20000000);
 	zassert_equal(DT_FIXED_PARTITION_ADDR(TEST_PARTITION_1), 0x200000c0);
-
-	/* DT_FIXED_PARTITION_ADDR(TEST_PARTITION_2) expands to an invalid expression.
-	 * Test this by way of string comparison.
-	 */
-	zassert_true(!strcmp(TO_STRING(DT_FIXED_PARTITION_ADDR(TEST_PARTITION_2)),
-			     "(__REG_IDX_0_VAL_ADDRESSU + 458624U)"));
-	zassert_equal(DT_REG_ADDR(TEST_PARTITION_2), 458624);
+	zassert_equal(DT_FIXED_PARTITION_ADDR(TEST_PARTITION_2), 0x33291080);
 
 	/* Test that all DT_FIXED_PARTITION_ID are defined and unique. */
 #define FIXED_PARTITION_ID_COMMA(node_id) DT_FIXED_PARTITION_ID(node_id),