Skip to content

Commit 2d98887

Browse files
str4t0mcarlescufi
authored andcommitted
dt-bindings: use dt-bindings/dt-util.h instead of sys/util_macro.h
Replaces some usages of <zephyr/sys/util_macro.h> with <zephyr/dt-bindings/dt-util.h> such that this is done in a uniform way. The latter being a wrapper around the former, which was introduced in PR #28779 with the intention to be able to retain the pattern of only including <zephyr/dt-bindings/foo.h> files in in-tree dts files. Signed-off-by: Thomas Stranger <[email protected]>
1 parent 1018ffe commit 2d98887

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

include/zephyr/dt-bindings/dt-util.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
/*
1111
* This file exists to keep in-tree DTS clean. This means, only
12-
* #include <dt-bindings/foo.h> form should be included. The
13-
* <dt-bindings/dt-util.h> wraps <sys/util_macro.h> file exposing
12+
* #include <zephyr/dt-bindings/foo.h> form should be included. The
13+
* <zephyr/dt-bindings/dt-util.h> wraps <zephyr/sys/util_macro.h> file exposing
1414
* all macro base definitions to DTS preprocessor. It provides
1515
* necessary background to elaborate complex constructions like
1616
* variable length macros with zero or more elements.

include/zephyr/dt-bindings/interrupt-controller/arm-gic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef __DT_BINDING_ARM_GIC_H
77
#define __DT_BINDING_ARM_GIC_H
88

9-
#include <zephyr/sys/util_macro.h>
9+
#include <zephyr/dt-bindings/dt-util.h>
1010

1111
/* CPU Interrupt numbers */
1212
#define GIC_INT_VIRT_MAINT 25

include/zephyr/dt-bindings/ipc_service/static_vrings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef __DT_BINDING_IPC_SERVICE_STATIC_VRINGS_H
77
#define __DT_BINDING_IPC_SERVICE_STATIC_VRINGS_H
88

9-
#include <zephyr/sys/util_macro.h>
9+
#include <zephyr/dt-bindings/dt-util.h>
1010

1111
#define PRIO_COOP BIT(0)
1212
#define PRIO_PREEMPT BIT(1)

include/zephyr/dt-bindings/pinctrl/esp-pinctrl-common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_ESP_PINCTRL_COMMON_H_
88
#define ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_ESP_PINCTRL_COMMON_H_
99

10-
#include <zephyr/sys/util_macro.h>
10+
#include <zephyr/dt-bindings/dt-util.h>
1111

1212
#define ESP32_PIN_NUM_SHIFT 0U
1313
#define ESP32_PIN_NUM_MASK 0x3FU

include/zephyr/dt-bindings/pinctrl/nxp-s32-pinctrl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_NXP_S32_PINCTRL_H_
88
#define ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_NXP_S32_PINCTRL_H_
99

10-
#include <zephyr/sys/util_macro.h>
10+
#include <zephyr/dt-bindings/dt-util.h>
1111

1212
/*
1313
* The NXP S32 pinmux configuration is encoded in a 32-bit field value as follows:

include/zephyr/dt-bindings/pinctrl/quicklogic-eos-s3-pinctrl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_QUICKLOGIC_EOS_S3_PINCTRL_H_
88
#define ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_QUICKLOGIC_EOS_S3_PINCTRL_H_
99

10-
#include <zephyr/sys/util_macro.h>
10+
#include <zephyr/dt-bindings/dt-util.h>
1111

1212
#define IO_MUX_REG_MAX_OFFSET 107
1313
#define IO_MUX_MAX_PAD_NR 45

0 commit comments

Comments
 (0)