From 050b271d938d020a4317070fc5a0af33996368f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fin=20Maa=C3=9F?= Date: Wed, 18 Jun 2025 11:11:04 +0200 Subject: [PATCH 1/2] scripts: Fix bindings style migration script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the script is in the utils subdir, which it didn't knew. Signed-off-by: Fin Maaß --- doc/releases/migration-guide-4.2.rst | 2 +- scripts/utils/migrate_bindings_style.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/releases/migration-guide-4.2.rst b/doc/releases/migration-guide-4.2.rst index 656019d6e3b0..ddb4cd8c2cb2 100644 --- a/doc/releases/migration-guide-4.2.rst +++ b/doc/releases/migration-guide-4.2.rst @@ -102,7 +102,7 @@ Devicetree * Property names in devicetree and bindings use hyphens(``-``) as separators, and replacing all previously used underscores(``_``). For local code, you can migrate property names in - bindings to use hyphens by running the ``scripts/migrate_bindings_style.py`` script. + bindings to use hyphens by running the ``scripts/utils/migrate_bindings_style.py`` script. DAI diff --git a/scripts/utils/migrate_bindings_style.py b/scripts/utils/migrate_bindings_style.py index 551ca05103d5..2d544f704a3f 100644 --- a/scripts/utils/migrate_bindings_style.py +++ b/scripts/utils/migrate_bindings_style.py @@ -17,7 +17,7 @@ # bindings base BINDINGS_PATH = [Path("dts/bindings/")] BINDINGS_PROPERTIES_AL = None -with open(Path(__file__).parent / 'bindings_properties_allowlist.yaml') as f: +with open(Path(__file__).parents[1] / 'bindings_properties_allowlist.yaml') as f: allowlist = yaml.safe_load(f.read()) if allowlist is not None: BINDINGS_PROPERTIES_AL = set(allowlist) From 3db69ab954e3599685b56911db87a3bde9fa145d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fin=20Maa=C3=9F?= Date: Wed, 18 Jun 2025 11:13:17 +0200 Subject: [PATCH 2/2] dts: treewide: fix missing use of underscores MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in #83352 a few bindings were not migrated, fix that, as it will lead to ci fails. Signed-off-by: Fin Maaß --- boards/nxp/lpcxpresso55s28/lpcxpresso55s28.dts | 2 +- boards/nxp/lpcxpresso55s69/lpcxpresso55s69_lpc55s69_cpu0.dts | 2 +- boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dtsi | 4 ++-- boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dtsi | 4 ++-- dts/arm/silabs/siwg917.dtsi | 2 +- dts/bindings/display/solomon,ssd1309fb-spi.yaml | 2 +- dts/bindings/led/ti,lp50xx.yaml | 2 +- dts/bindings/pwm/silabs,siwx91x-pwm.yaml | 4 ++-- dts/bindings/usb/nxp,uhc-ehci.yaml | 2 +- dts/bindings/usb/nxp,uhc-ip3516hs.yaml | 2 +- dts/bindings/watchdog/nxp,ewm.yaml | 4 ++-- tests/drivers/pwm/pwm_api/boards/siwx917_rb4338a.overlay | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/boards/nxp/lpcxpresso55s28/lpcxpresso55s28.dts b/boards/nxp/lpcxpresso55s28/lpcxpresso55s28.dts index d9d46ed50ed1..7b6fa3e1fc3a 100644 --- a/boards/nxp/lpcxpresso55s28/lpcxpresso55s28.dts +++ b/boards/nxp/lpcxpresso55s28/lpcxpresso55s28.dts @@ -138,7 +138,7 @@ zephyr_uhc1: &usbhhs { pinctrl-0 = <&pinmux_usbhhs>; pinctrl-names = "default"; status = "okay"; - phy_handle = <&usbphy1>; + phy-handle = <&usbphy1>; }; &usbphy1 { diff --git a/boards/nxp/lpcxpresso55s69/lpcxpresso55s69_lpc55s69_cpu0.dts b/boards/nxp/lpcxpresso55s69/lpcxpresso55s69_lpc55s69_cpu0.dts index 44caca0d3270..5049eec3f5f5 100644 --- a/boards/nxp/lpcxpresso55s69/lpcxpresso55s69_lpc55s69_cpu0.dts +++ b/boards/nxp/lpcxpresso55s69/lpcxpresso55s69_lpc55s69_cpu0.dts @@ -165,7 +165,7 @@ zephyr_uhc1: &usbhhs { pinctrl-0 = <&pinmux_usbhhs>; pinctrl-names = "default"; status = "okay"; - phy_handle = <&usbphy1>; + phy-handle = <&usbphy1>; }; &usbphy1 { diff --git a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dtsi b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dtsi index 0886b2ac912b..15731d8bdcd5 100644 --- a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dtsi +++ b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dtsi @@ -213,12 +213,12 @@ zephyr_udc0: &usb1 { zephyr_uhc0: &usbh1 { status = "okay"; - phy_handle = <&usbphy1>; + phy-handle = <&usbphy1>; }; zephyr_uhc1: &usbh2 { status = "okay"; - phy_handle = <&usbphy2>; + phy-handle = <&usbphy2>; }; &usbphy1 { diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dtsi b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dtsi index 4143a7b6430f..c81d10ea18ad 100644 --- a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dtsi +++ b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dtsi @@ -190,12 +190,12 @@ zephyr_udc0: &usb1 { zephyr_uhc0: &usbh1 { status = "okay"; - phy_handle = <&usbphy1>; + phy-handle = <&usbphy1>; }; zephyr_uhc1: &usbh2 { status = "okay"; - phy_handle = <&usbphy2>; + phy-handle = <&usbphy2>; }; &usbphy1 { diff --git a/dts/arm/silabs/siwg917.dtsi b/dts/arm/silabs/siwg917.dtsi index a0a56bf69c40..2914631933a1 100644 --- a/dts/arm/silabs/siwg917.dtsi +++ b/dts/arm/silabs/siwg917.dtsi @@ -326,7 +326,7 @@ interrupt-names = "pwm"; clocks = <&clock0 SIWX91X_CLK_PWM>; #pwm-cells = <2>; - silabs,ch_prescaler = <64 64 64 64>; + silabs,ch-prescaler = <64 64 64 64>; status = "disabled"; }; diff --git a/dts/bindings/display/solomon,ssd1309fb-spi.yaml b/dts/bindings/display/solomon,ssd1309fb-spi.yaml index 4a24a35d7cdc..5d58bc732fd2 100644 --- a/dts/bindings/display/solomon,ssd1309fb-spi.yaml +++ b/dts/bindings/display/solomon,ssd1309fb-spi.yaml @@ -8,7 +8,7 @@ compatible: "solomon,ssd1309fb" include: ["solomon,ssd1306fb-common.yaml", "spi-device.yaml"] properties: - data_cmd-gpios: + data-cmd-gpios: type: phandle-array required: true description: D/C# pin. diff --git a/dts/bindings/led/ti,lp50xx.yaml b/dts/bindings/led/ti,lp50xx.yaml index 91511dbd3039..1906d8f34170 100644 --- a/dts/bindings/led/ti,lp50xx.yaml +++ b/dts/bindings/led/ti,lp50xx.yaml @@ -12,7 +12,7 @@ properties: type: boolean description: | If enabled the maximum current output is set to 35 mA (25.5 mA else). - log_scale_en: + log-scale-en: type: boolean description: | If enabled a logarithmic dimming scale curve is used for LED brightness diff --git a/dts/bindings/pwm/silabs,siwx91x-pwm.yaml b/dts/bindings/pwm/silabs,siwx91x-pwm.yaml index b8a01f2027b8..daec68e9ed72 100644 --- a/dts/bindings/pwm/silabs,siwx91x-pwm.yaml +++ b/dts/bindings/pwm/silabs,siwx91x-pwm.yaml @@ -12,7 +12,7 @@ properties: "#pwm-cells": const: 2 - silabs,ch_prescaler: + silabs,ch-prescaler: type: array required: true description: | @@ -26,7 +26,7 @@ properties: - 32 - 64 - silabs,pwm_polarity: + silabs,pwm-polarity: type: int required: true description: | diff --git a/dts/bindings/usb/nxp,uhc-ehci.yaml b/dts/bindings/usb/nxp,uhc-ehci.yaml index 5f8657fe7227..919625da151c 100644 --- a/dts/bindings/usb/nxp,uhc-ehci.yaml +++ b/dts/bindings/usb/nxp,uhc-ehci.yaml @@ -8,5 +8,5 @@ compatible: "nxp,uhc-ehci" include: [usb-controller.yaml] properties: - phy_handle: + phy-handle: type: phandle diff --git a/dts/bindings/usb/nxp,uhc-ip3516hs.yaml b/dts/bindings/usb/nxp,uhc-ip3516hs.yaml index d09b5b9f056d..d9ebcae8abfc 100644 --- a/dts/bindings/usb/nxp,uhc-ip3516hs.yaml +++ b/dts/bindings/usb/nxp,uhc-ip3516hs.yaml @@ -8,5 +8,5 @@ compatible: "nxp,uhc-ip3516hs" include: [usb-controller.yaml, pinctrl-device.yaml] properties: - phy_handle: + phy-handle: type: phandle diff --git a/dts/bindings/watchdog/nxp,ewm.yaml b/dts/bindings/watchdog/nxp,ewm.yaml index 5bd1e6a36ebf..69ffdf86abcc 100644 --- a/dts/bindings/watchdog/nxp,ewm.yaml +++ b/dts/bindings/watchdog/nxp,ewm.yaml @@ -19,13 +19,13 @@ properties: description: Watchdog clock divider required: true - input_trigger_en: + input-trigger-en: type: boolean description: | When enabled the ewm_in signal can be used to assert the ewm. - input_trigger_active_high: + input-trigger-active-high: type: boolean description: | When enabled the ewm_in signal is active high. diff --git a/tests/drivers/pwm/pwm_api/boards/siwx917_rb4338a.overlay b/tests/drivers/pwm/pwm_api/boards/siwx917_rb4338a.overlay index 91125d52963f..02f1c9da28de 100644 --- a/tests/drivers/pwm/pwm_api/boards/siwx917_rb4338a.overlay +++ b/tests/drivers/pwm/pwm_api/boards/siwx917_rb4338a.overlay @@ -26,6 +26,6 @@ pwm_channel1: pwm_channel1 { pwms = <&pwm 0 1000000>; }; - silabs,pwm_polarity = ; + silabs,pwm-polarity = ; status = "okay"; };