From afbc6a86c9fbb1ca258ea1059273600bb085e73f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= Date: Fri, 15 Apr 2022 11:09:09 +0200 Subject: [PATCH] dts: bindings: pwm: nordic: Extend pwm-cells with period and flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... to align with what is used in most other PWM bindings. Update PWM nodes in SoC .dtsi files accordingly. Signed-off-by: Andrzej Głąbek --- dts/arm/nordic/nrf51822.dtsi | 2 +- dts/arm/nordic/nrf52805.dtsi | 2 +- dts/arm/nordic/nrf52810.dtsi | 4 ++-- dts/arm/nordic/nrf52811.dtsi | 4 ++-- dts/arm/nordic/nrf52820.dtsi | 2 +- dts/arm/nordic/nrf52832.dtsi | 8 ++++---- dts/arm/nordic/nrf52833.dtsi | 10 +++++----- dts/arm/nordic/nrf52840.dtsi | 10 +++++----- dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi | 8 ++++---- dts/arm/nordic/nrf9160_common.dtsi | 8 ++++---- dts/bindings/pwm/nordic,nrf-pwm.yaml | 4 +++- dts/bindings/pwm/nordic,nrf-sw-pwm.yaml | 4 +++- 12 files changed, 35 insertions(+), 31 deletions(-) diff --git a/dts/arm/nordic/nrf51822.dtsi b/dts/arm/nordic/nrf51822.dtsi index 85325bca701..c634dbcd5da 100644 --- a/dts/arm/nordic/nrf51822.dtsi +++ b/dts/arm/nordic/nrf51822.dtsi @@ -327,7 +327,7 @@ label = "SW_PWM"; generator = <&timer1>; clock-prescaler = <0>; - #pwm-cells = <1>; + #pwm-cells = <3>; }; }; diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi index 3c130a4e4f1..5ed648f5834 100644 --- a/dts/arm/nordic/nrf52805.dtsi +++ b/dts/arm/nordic/nrf52805.dtsi @@ -315,7 +315,7 @@ label = "SW_PWM"; generator = <&timer2>; clock-prescaler = <0>; - #pwm-cells = <1>; + #pwm-cells = <3>; }; }; diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi index b07522a037a..659f7728955 100644 --- a/dts/arm/nordic/nrf52810.dtsi +++ b/dts/arm/nordic/nrf52810.dtsi @@ -284,7 +284,7 @@ interrupts = <28 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_0"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pdm0: pdm@4001d000 { @@ -336,7 +336,7 @@ label = "SW_PWM"; generator = <&timer2>; clock-prescaler = <0>; - #pwm-cells = <1>; + #pwm-cells = <3>; }; }; diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi index 790e0bb390c..45335cc6e97 100644 --- a/dts/arm/nordic/nrf52811.dtsi +++ b/dts/arm/nordic/nrf52811.dtsi @@ -310,7 +310,7 @@ interrupts = <28 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_0"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pdm0: pdm@4001d000 { @@ -365,7 +365,7 @@ label = "SW_PWM"; generator = <&timer2>; clock-prescaler = <0>; - #pwm-cells = <1>; + #pwm-cells = <3>; }; }; diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi index 9944b503d65..4cdfca84f17 100644 --- a/dts/arm/nordic/nrf52820.dtsi +++ b/dts/arm/nordic/nrf52820.dtsi @@ -378,7 +378,7 @@ label = "SW_PWM"; generator = <&timer2>; clock-prescaler = <0>; - #pwm-cells = <1>; + #pwm-cells = <3>; }; }; diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi index df4f7785329..81d5e887cab 100644 --- a/dts/arm/nordic/nrf52832.dtsi +++ b/dts/arm/nordic/nrf52832.dtsi @@ -353,7 +353,7 @@ interrupts = <28 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_0"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pdm0: pdm@4001d000 { @@ -399,7 +399,7 @@ interrupts = <33 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_1"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pwm2: pwm@40022000 { @@ -408,7 +408,7 @@ interrupts = <34 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_2"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; spi2: spi@40023000 { @@ -466,7 +466,7 @@ label = "SW_PWM"; generator = <&timer2>; clock-prescaler = <0>; - #pwm-cells = <1>; + #pwm-cells = <3>; }; }; diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi index a84bd661c13..02261453ecd 100644 --- a/dts/arm/nordic/nrf52833.dtsi +++ b/dts/arm/nordic/nrf52833.dtsi @@ -355,7 +355,7 @@ interrupts = <28 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_0"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pdm0: pdm@4001d000 { @@ -408,7 +408,7 @@ interrupts = <33 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_1"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pwm2: pwm@40022000 { @@ -417,7 +417,7 @@ interrupts = <34 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_2"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; spi2: spi@40023000 { @@ -485,7 +485,7 @@ interrupts = <45 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_3"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; spi3: spi@4002f000 { @@ -528,7 +528,7 @@ label = "SW_PWM"; generator = <&timer2>; clock-prescaler = <0>; - #pwm-cells = <1>; + #pwm-cells = <3>; }; }; diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi index 3259fec3572..b7eb18f4ddf 100644 --- a/dts/arm/nordic/nrf52840.dtsi +++ b/dts/arm/nordic/nrf52840.dtsi @@ -350,7 +350,7 @@ interrupts = <28 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_0"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pdm0: pdm@4001d000 { @@ -403,7 +403,7 @@ interrupts = <33 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_1"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pwm2: pwm@40022000 { @@ -412,7 +412,7 @@ interrupts = <34 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_2"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; spi2: spi@40023000 { @@ -491,7 +491,7 @@ interrupts = <45 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_3"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; spi3: spi@4002f000 { @@ -549,7 +549,7 @@ label = "SW_PWM"; generator = <&timer2>; clock-prescaler = <0>; - #pwm-cells = <1>; + #pwm-cells = <3>; }; }; diff --git a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi index a0705f89a43..4133d633cb6 100644 --- a/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi +++ b/dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi @@ -368,7 +368,7 @@ pwm0: pwm@21000 { interrupts = <33 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_0"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pwm1: pwm@22000 { @@ -377,7 +377,7 @@ pwm1: pwm@22000 { interrupts = <34 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_1"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pwm2: pwm@23000 { @@ -386,7 +386,7 @@ pwm2: pwm@23000 { interrupts = <35 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_2"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pwm3: pwm@24000 { @@ -395,7 +395,7 @@ pwm3: pwm@24000 { interrupts = <36 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_3"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pdm0: pdm@26000 { diff --git a/dts/arm/nordic/nrf9160_common.dtsi b/dts/arm/nordic/nrf9160_common.dtsi index 1a0fce2b554..c42a3f1b629 100644 --- a/dts/arm/nordic/nrf9160_common.dtsi +++ b/dts/arm/nordic/nrf9160_common.dtsi @@ -287,7 +287,7 @@ pwm0: pwm@21000 { interrupts = <33 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_0"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pwm1: pwm@22000 { @@ -296,7 +296,7 @@ pwm1: pwm@22000 { interrupts = <34 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_1"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pwm2: pwm@23000 { @@ -305,7 +305,7 @@ pwm2: pwm@23000 { interrupts = <35 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_2"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; pwm3: pwm@24000 { @@ -314,7 +314,7 @@ pwm3: pwm@24000 { interrupts = <36 NRF_DEFAULT_IRQ_PRIORITY>; status = "disabled"; label = "PWM_3"; - #pwm-cells = <1>; + #pwm-cells = <3>; }; gpio0: gpio@842500 { diff --git a/dts/bindings/pwm/nordic,nrf-pwm.yaml b/dts/bindings/pwm/nordic,nrf-pwm.yaml index 09f84a39709..b3bb1ae0527 100644 --- a/dts/bindings/pwm/nordic,nrf-pwm.yaml +++ b/dts/bindings/pwm/nordic,nrf-pwm.yaml @@ -107,7 +107,9 @@ properties: Set this to invert channel 3. "#pwm-cells": - const: 1 + const: 3 pwm-cells: - channel + - period + - flags diff --git a/dts/bindings/pwm/nordic,nrf-sw-pwm.yaml b/dts/bindings/pwm/nordic,nrf-sw-pwm.yaml index b2b3f4ca37c..56bddda1dd2 100644 --- a/dts/bindings/pwm/nordic,nrf-sw-pwm.yaml +++ b/dts/bindings/pwm/nordic,nrf-sw-pwm.yaml @@ -54,7 +54,9 @@ properties: in the request, i.e. PWM_POLARITY_INVERTED or PWM_POLARITY_NORMAL. "#pwm-cells": - const: 1 + const: 3 pwm-cells: - channel + - period + - flags