Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boards/arduino/portenta_c33/arduino_portenta_c33.dts
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
<&ioport1 4 GPIO_ACTIVE_LOW>;

esp_hosted@1 {
status = "ok";
status = "okay";
compatible = "espressif,esp-hosted";
reg = <0x1>;
spi-max-frequency = <DT_FREQ_M(5)>;
Expand Down
2 changes: 1 addition & 1 deletion boards/shields/adafruit_winc1500/adafruit_winc1500.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
cs-gpios = <&arduino_header ARDUINO_HEADER_R3_D10 0>;

winc1500_adafruit_winc1500: winc1500@0 {
status = "ok";
status = "okay";
compatible = "atmel,winc1500";
reg = <0x0>;
spi-max-frequency = <4000000>;
Expand Down
4 changes: 1 addition & 3 deletions doc/build/dts/intro-syntax-structure.rst
Original file line number Diff line number Diff line change
Expand Up @@ -282,9 +282,7 @@ status

A node is considered enabled if its status property is either ``"okay"`` or
not defined (i.e. does not exist in the devicetree source). Nodes with
status ``"disabled"`` are explicitly disabled. (For backwards
compatibility, the value ``"ok"`` is treated the same as ``"okay"``, but
this usage is deprecated.) Devicetree nodes which correspond to physical
status ``"disabled"`` are explicitly disabled. Devicetree nodes which correspond to physical
devices must be enabled for the corresponding ``struct device`` in the
Zephyr driver model to be allocated and initialized.

Expand Down
1 change: 1 addition & 0 deletions doc/releases/release-notes-4.3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Removed APIs and options
* The legacy pipe object API was removed. Use the new pipe API instead.
* ``bt_le_set_auto_conn``
* ``CONFIG_BT_BUF_ACL_RX_COUNT``
* ``ok`` enum value has now been removed completely from ``base.yaml`` binding ``status`` property in devicetree.

Deprecated APIs and options
===========================
Expand Down
2 changes: 1 addition & 1 deletion dts/arm/nxp/nxp_lpc55S3x_common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
reg = <0x34000 0x1000>;
#address-cells = <1>;
#size-cells = <1>;
status = "ok";
status = "okay";

flash0: flash@0 {
compatible = "soc-nv-flash";
Expand Down
1 change: 0 additions & 1 deletion dts/bindings/base/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ properties:

For details, see "2.3.4 status" in Devicetree Specification v0.4.
enum:
- "ok" # Deprecated form
- "okay"
- "disabled"
- "reserved"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
pinctrl-names = "default", "sleep";
max17048: max17048@36 {
compatible = "maxim,max17048";
status = "ok";
status = "okay";
reg = <0x36>;
};
};
2 changes: 1 addition & 1 deletion samples/net/gptp/boards/frdm_k64f.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
&enet {

ptp {
status = "ok";
status = "okay";
};
};
4 changes: 2 additions & 2 deletions samples/net/wifi/shell/boards/reel_board.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
};

&spi3 {
status = "ok";
status = "okay";
cs-gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&spi3_default_alt>;
pinctrl-1 = <&spi3_sleep_alt>;
pinctrl-names = "default", "sleep";

winc1500@0 {
status = "ok";
status = "okay";
compatible = "atmel,winc1500";
reg = <0x0>;
spi-max-frequency = <4000000>;
Expand Down
9 changes: 2 additions & 7 deletions scripts/dts/python-devicetree/src/devicetree/edtlib.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2019 Nordic Semiconductor ASA

Check warning on line 1 in scripts/dts/python-devicetree/src/devicetree/edtlib.py

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

License may not be allowed

scripts/dts/python-devicetree/src/devicetree/edtlib.py:1 License file for 'BSD-3-Clause' not found in /LICENSES. Please check https://docs.zephyrproject.org/latest/contribute/guidelines.html#components-using-other-licenses.
# Copyright (c) 2019 Linaro Limited
# SPDX-License-Identifier: BSD-3-Clause

Expand Down Expand Up @@ -972,8 +972,7 @@

status:
The node's status property value, as a string, or "okay" if the node
has no status property set. If the node's status property is "ok",
it is converted to "okay" for consistency.
has no status property set.

read_only:
True if the node has a 'read-only' property, and False otherwise
Expand Down Expand Up @@ -1199,9 +1198,6 @@
else:
as_string = status.to_string()

if as_string == "ok":
as_string = "okay"

return as_string

@property
Expand Down Expand Up @@ -3312,8 +3308,7 @@

# Check that 'status' has one of the values given in the devicetree spec.

# Accept "ok" for backwards compatibility
ok_status = {"ok", "okay", "disabled", "reserved", "fail", "fail-sss"}
ok_status = {"okay", "disabled", "reserved", "fail", "fail-sss"}

for node in dt.node_iter():
if "status" in node.props:
Expand Down
Loading