From 10c4fdc0900965fc39529f910bc2b640704f3caf Mon Sep 17 00:00:00 2001 From: Jilay Pandya Date: Sat, 11 Jan 2025 14:43:15 +0100 Subject: [PATCH 1/2] dts: bindings: gpio: use hyphens instead of underscore replace underscore with hyphens to comply with device tree spec Signed-off-by: Jilay Pandya --- boards/snps/em_starterkit/em_starterkit_r23.dtsi | 6 +++--- dts/arc/synopsys/arc_hs4xd.dtsi | 6 +++--- dts/arc/synopsys/arc_hsdk.dtsi | 6 +++--- dts/arm/renesas/ra/ra8/ra8x1.dtsi | 2 +- dts/bindings/gpio/nuvoton,nct38xx-gpio-port.yaml | 4 ++-- dts/bindings/gpio/nuvoton,nct38xx-gpio.yaml | 14 +++++++------- dts/bindings/gpio/renesas,ra-gpio-ioport.yaml | 2 +- dts/bindings/gpio/snps,creg-gpio.yaml | 6 +++--- tests/drivers/build_all/gpio/app.overlay | 14 +++++++------- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/boards/snps/em_starterkit/em_starterkit_r23.dtsi b/boards/snps/em_starterkit/em_starterkit_r23.dtsi index ef93abcfd46d..16236f315b7e 100644 --- a/boards/snps/em_starterkit/em_starterkit_r23.dtsi +++ b/boards/snps/em_starterkit/em_starterkit_r23.dtsi @@ -34,9 +34,9 @@ compatible = "snps,creg-gpio"; reg = <0xf0000014 0x4>; ngpios = <6>; - bit_per_gpio = <1>; - off_val = <0>; - on_val = <1>; + bit-per-gpio = <1>; + off-val = <0>; + on-val = <1>; gpio-controller; #gpio-cells = <2>; diff --git a/dts/arc/synopsys/arc_hs4xd.dtsi b/dts/arc/synopsys/arc_hs4xd.dtsi index d6650e651a95..c39c754e32c9 100644 --- a/dts/arc/synopsys/arc_hs4xd.dtsi +++ b/dts/arc/synopsys/arc_hs4xd.dtsi @@ -135,9 +135,9 @@ compatible = "snps,creg-gpio"; reg = <0xf00014b0 0x4>; ngpios = <12>; - bit_per_gpio = <2>; - off_val = <0>; - on_val = <2>; + bit-per-gpio = <2>; + off-val = <0>; + on-val = <2>; gpio-controller; #gpio-cells = <2>; diff --git a/dts/arc/synopsys/arc_hsdk.dtsi b/dts/arc/synopsys/arc_hsdk.dtsi index 6388db825a01..4168df99db85 100644 --- a/dts/arc/synopsys/arc_hsdk.dtsi +++ b/dts/arc/synopsys/arc_hsdk.dtsi @@ -135,9 +135,9 @@ compatible = "snps,creg-gpio"; reg = <0xf00014b0 0x4>; ngpios = <12>; - bit_per_gpio = <2>; - off_val = <0>; - on_val = <2>; + bit-per-gpio = <2>; + off-val = <0>; + on-val = <2>; gpio-controller; #gpio-cells = <2>; diff --git a/dts/arm/renesas/ra/ra8/ra8x1.dtsi b/dts/arm/renesas/ra/ra8/ra8x1.dtsi index dd177c7f5ec0..8d5b3bd15c38 100644 --- a/dts/arm/renesas/ra/ra8/ra8x1.dtsi +++ b/dts/arm/renesas/ra/ra8/ra8x1.dtsi @@ -97,7 +97,7 @@ gpio-controller; #gpio-cells = <2>; ngpios = <16>; - vbatts_pins = <2 3 4>; + vbatts-pins = <2 3 4>; status = "disabled"; }; diff --git a/dts/bindings/gpio/nuvoton,nct38xx-gpio-port.yaml b/dts/bindings/gpio/nuvoton,nct38xx-gpio-port.yaml index af2d5eff2004..d1158b75927e 100644 --- a/dts/bindings/gpio/nuvoton,nct38xx-gpio-port.yaml +++ b/dts/bindings/gpio/nuvoton,nct38xx-gpio-port.yaml @@ -11,7 +11,7 @@ properties: reg: required: true - pin_mask: + pin-mask: type: int required: true description: | @@ -21,7 +21,7 @@ properties: NCT3808: <0xdc> others: <0xff> - pinmux_mask: + pinmux-mask: type: int description: | NCT38XX series port 0 has Pin Multiplexing functionality. However, not diff --git a/dts/bindings/gpio/nuvoton,nct38xx-gpio.yaml b/dts/bindings/gpio/nuvoton,nct38xx-gpio.yaml index 5b9afbbc8920..8f10d4b98ed3 100644 --- a/dts/bindings/gpio/nuvoton,nct38xx-gpio.yaml +++ b/dts/bindings/gpio/nuvoton,nct38xx-gpio.yaml @@ -23,8 +23,8 @@ description: | gpio-controller; #gpio-cells = <2>; ngpios = <8>; - pin_mask = <0xff>; - pinmux_mask = <0xf7>; + pin-mask = <0xff>; + pinmux-mask = <0xf7>; }; gpio@1 { @@ -33,7 +33,7 @@ description: | gpio-controller; #gpio-cells = <2>; ngpios = <8>; - pin_mask = <0xff>; + pin-mask = <0xff>; }; }; }; @@ -53,8 +53,8 @@ description: | gpio-controller; #gpio-cells = <2>; ngpios = <8>; - pin_mask = <0xdc>; - pinmux_mask = <0xff>; + pin-mask = <0xdc>; + pinmux-mask = <0xff>; }; }; }; @@ -74,8 +74,8 @@ description: | gpio-controller; #gpio-cells = <2>; ngpios = <8>; - pin_mask = <0xdc>; - pinmux_mask = <0xff>; + pin-mask = <0xdc>; + pinmux-mask = <0xff>; }; }; }; diff --git a/dts/bindings/gpio/renesas,ra-gpio-ioport.yaml b/dts/bindings/gpio/renesas,ra-gpio-ioport.yaml index 11c8ebf79440..fa015bac6de4 100644 --- a/dts/bindings/gpio/renesas,ra-gpio-ioport.yaml +++ b/dts/bindings/gpio/renesas,ra-gpio-ioport.yaml @@ -15,7 +15,7 @@ properties: type: int required: true - vbatts_pins: + vbatts-pins: type: array description: Array of vbatt pin on port diff --git a/dts/bindings/gpio/snps,creg-gpio.yaml b/dts/bindings/gpio/snps,creg-gpio.yaml index 954a9ae10d7c..d73b2f54fef8 100644 --- a/dts/bindings/gpio/snps,creg-gpio.yaml +++ b/dts/bindings/gpio/snps,creg-gpio.yaml @@ -11,15 +11,15 @@ properties: reg: required: true - bit_per_gpio: + bit-per-gpio: type: int required: true - off_val: + off-val: type: int required: true - on_val: + on-val: type: int required: true diff --git a/tests/drivers/build_all/gpio/app.overlay b/tests/drivers/build_all/gpio/app.overlay index b91babee9104..edc527c1d982 100644 --- a/tests/drivers/build_all/gpio/app.overlay +++ b/tests/drivers/build_all/gpio/app.overlay @@ -172,8 +172,8 @@ gpio-controller; #gpio-cells = <2>; ngpios = <8>; - pin_mask = <0xff>; - pinmux_mask = <0xf7>; + pin-mask = <0xff>; + pinmux-mask = <0xf7>; }; gpio@1 { @@ -182,7 +182,7 @@ gpio-controller; #gpio-cells = <2>; ngpios = <8>; - pin_mask = <0xff>; + pin-mask = <0xff>; }; }; }; @@ -201,8 +201,8 @@ gpio-controller; #gpio-cells = <2>; ngpios = <8>; - pin_mask = <0xdc>; - pinmux_mask = <0xff>; + pin-mask = <0xdc>; + pinmux-mask = <0xff>; }; }; }; @@ -221,8 +221,8 @@ gpio-controller; #gpio-cells = <2>; ngpios = <8>; - pin_mask = <0xdc>; - pinmux_mask = <0xff>; + pin-mask = <0xdc>; + pinmux-mask = <0xff>; }; }; }; From a0446f67293648a1fb03346f390dd5c981926e5e Mon Sep 17 00:00:00 2001 From: Jilay Pandya Date: Wed, 15 Jan 2025 08:24:34 +0100 Subject: [PATCH 2/2] docs: migration_guide_4.1: entry for renamed device tree properties add migration guide after renaming device tree properties - pin_mask -> pin-mask - pinmux_mask -> pinmux-mask - vbatts_pins -> vbatts-pins - bit_per_gpio -> bit-per-gpio - off_val -> off-val - on_val -> on-val Signed-off-by: Jilay Pandya --- doc/releases/migration-guide-4.1.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst index 78be00f4cdc4..fe8dc8030b73 100644 --- a/doc/releases/migration-guide-4.1.rst +++ b/doc/releases/migration-guide-4.1.rst @@ -170,6 +170,16 @@ Entropy GNSS ==== +GPIO +==== + +* Renamed the device tree property ``pin_mask`` to ``pin-mask``. +* Renamed the device tree property ``pinmux_mask`` to ``pinmux-mask``. +* Renamed the device tree property ``vbatts_pins`` to ``vbatts-pins``. +* Renamed the device tree property ``bit_per_gpio`` to ``bit-per-gpio``. +* Renamed the device tree property ``off_val`` to ``off-val``. +* Renamed the device tree property ``on_val`` to ``on-val``. + I2C ===