|
356 | 356 | * @param node_id node identifier
|
357 | 357 | * @return a node identifier for the node's parent
|
358 | 358 | */
|
359 |
| -#define DT_PARENT(node_id) UTIL_CAT(node_id, _PARENT) |
| 359 | +#define DT_PARENT(node_id) DT_CAT(node_id, _PARENT) |
360 | 360 |
|
361 | 361 | /**
|
362 | 362 | * @brief Get a node identifier for a grandparent node
|
|
3087 | 3087 | */
|
3088 | 3088 | #define DT_FOREACH_STATUS_OKAY(compat, fn) \
|
3089 | 3089 | COND_CODE_1(DT_HAS_COMPAT_STATUS_OKAY(compat), \
|
3090 |
| - (UTIL_CAT(DT_FOREACH_OKAY_, compat)(fn)), \ |
| 3090 | + (DT_CAT(DT_FOREACH_OKAY_, compat)(fn)), \ |
3091 | 3091 | ())
|
3092 | 3092 |
|
3093 | 3093 | /**
|
|
3136 | 3136 | */
|
3137 | 3137 | #define DT_FOREACH_STATUS_OKAY_VARGS(compat, fn, ...) \
|
3138 | 3138 | COND_CODE_1(DT_HAS_COMPAT_STATUS_OKAY(compat), \
|
3139 |
| - (UTIL_CAT(DT_FOREACH_OKAY_VARGS_, \ |
| 3139 | + (DT_CAT(DT_FOREACH_OKAY_VARGS_, \ |
3140 | 3140 | compat)(fn, __VA_ARGS__)), \
|
3141 | 3141 | ())
|
3142 | 3142 |
|
|
4107 | 4107 | * 0 otherwise
|
4108 | 4108 | */
|
4109 | 4109 | #define DT_HAS_COMPAT_ON_BUS_STATUS_OKAY(compat, bus) \
|
4110 |
| - IS_ENABLED(UTIL_CAT(DT_CAT(DT_COMPAT_, compat), _BUS_##bus)) |
| 4110 | + IS_ENABLED(DT_CAT4(DT_COMPAT_, compat, _BUS_, bus)) |
4111 | 4111 |
|
4112 | 4112 | /**
|
4113 | 4113 | * @brief Test if any `DT_DRV_COMPAT` node is on a bus of a given type
|
|
0 commit comments