| Message ID | 20200405192246.3741784-5-oleksandr.suvorov@toradex.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On Sun, Apr 05, 2020 at 10:22:44PM +0300, Oleksandr Suvorov wrote: > The raw value '0' in the 3rd cell of the "pwms" property means there are > no flags to be set. > > This patch converts '0' flag into PWM_NOFLAGS. > > Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> > --- > > Changes in v2: > - Use PWM_NOFLAGS instead of PWM_POLARITY_NORMAL to avoid possible > conflict with enum pwm_polarity in <linux/pwm.h>. Also, this name > reflects the sense of this value more precisely. > > arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 +- > arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 +- > arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 3 ++- > arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 + > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 + > arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 5 +++-- > arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 +- > arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 5 +++-- > arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 ++-- > arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 4 ++-- > arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 7 ++++--- > arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 3 ++- > arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 + > arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 3 ++- > arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 3 ++- > arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 3 ++- > arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 3 ++- > arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 3 ++- > arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts | 3 ++- > .../boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 3 ++- > arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 +- > .../arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 3 ++- > arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 ++- > arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 5 +++-- > arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 3 ++- > arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 4 +++- > arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 2 +- > arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 7 ++++--- > arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 3 ++- I understand you are going to push it through arm-soc, so: For Exynos: Acked-by: Krzysztof Kozlowski <krzk@kernel.org> Otherwise if you expect individual maintainers to pick it up, please split per architecture. Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts index 64b1c54f87c0..3aa0cc70eb9a 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts @@ -23,7 +23,7 @@ aliases { backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm 0 50000 0>; + pwms = <&pwm 0 50000 PWM_NOFLAGS>; brightness-levels = <0 5 10 15 20 30 40 55 70 85 100>; default-brightness-level = <2>; enable-gpios = <&pio 3 23 GPIO_ACTIVE_HIGH>; /* PD23 */ diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts index f5df5f705b72..0c493c662e19 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts @@ -21,7 +21,7 @@ aliases { backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm 0 50000 0>; + pwms = <&pwm 0 50000 PWM_NOFLAGS>; power-supply = <®_dcdc1>; brightness-levels = <0 5 7 10 14 20 28 40 56 80 112>; default-brightness-level = <5>; diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts index cb1360ae1211..6cdac1daf580 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts @@ -356,7 +356,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ab 0 30518 0>; /* PWM_A at 32.768KHz */ + /* PWM_A at 32.768KHz */ + pwms = <&pwm_ab 0 30518 PWM_NOFLAGS>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index aace3d32a3df..e536436f6306 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -10,6 +10,7 @@ #include <dt-bindings/gpio/meson-axg-gpio.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h> #include <dt-bindings/reset/amlogic,meson-axg-reset.h> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 0882ea215b88..45b96bca4398 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -9,6 +9,7 @@ #include <dt-bindings/clock/g12a-aoclkc.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/reset/amlogic,meson-g12a-reset.h> #include <dt-bindings/thermal/thermal.h> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts index b00d0468c753..7d85d4066397 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts @@ -141,7 +141,7 @@ vddcpu: regulator-vddcpu { vin-supply = <&dc_in>; - pwms = <&pwm_AO_cd 1 1250 0>; + pwms = <&pwm_AO_cd 1 1250 PWM_NOFLAGS>; pwm-dutycycle-range = <100 0>; regulator-boot-on; @@ -176,7 +176,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; sound { diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts index a26bfe72550f..22f642664665 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -141,7 +141,7 @@ vddcpu: regulator-vddcpu { vin-supply = <&main_12v>; - pwms = <&pwm_AO_cd 1 1250 0>; + pwms = <&pwm_AO_cd 1 1250 PWM_NOFLAGS>; pwm-dutycycle-range = <100 0>; regulator-boot-on; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts index 1b07c8c06eac..4857fee0b48e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts @@ -141,7 +141,7 @@ vddcpu: regulator-vddcpu { vin-supply = <&dc_in>; - pwms = <&pwm_AO_cd 1 1250 0>; + pwms = <&pwm_AO_cd 1 1250 PWM_NOFLAGS>; pwm-dutycycle-range = <100 0>; regulator-boot-on; @@ -232,7 +232,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi index c33e85fbdaba..3250d3e12d46 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi @@ -22,7 +22,7 @@ vddcpu_a: regulator-vddcpu-a { vin-supply = <&dc_in>; - pwms = <&pwm_ab 0 1250 0>; + pwms = <&pwm_ab 0 1250 PWM_NOFLAGS>; pwm-dutycycle-range = <100 0>; regulator-boot-on; @@ -41,7 +41,7 @@ vddcpu_b: regulator-vddcpu-b { vin-supply = <&vsys_3v3>; - pwms = <&pwm_AO_cd 1 1250 0>; + pwms = <&pwm_AO_cd 1 1250 PWM_NOFLAGS>; pwm-dutycycle-range = <100 0>; regulator-boot-on; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts index 169ea283d4ee..68a47428ec68 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts @@ -127,7 +127,7 @@ vddcpu_a: regulator-vddcpu-a { vin-supply = <&main_12v>; - pwms = <&pwm_ab 0 1250 0>; + pwms = <&pwm_ab 0 1250 PWM_NOFLAGS>; pwm-dutycycle-range = <100 0>; regulator-boot-on; @@ -146,7 +146,7 @@ vddcpu_b: regulator-vddcpu-b { vin-supply = <&main_12v>; - pwms = <&pwm_AO_cd 1 1250 0>; + pwms = <&pwm_AO_cd 1 1250 PWM_NOFLAGS>; pwm-dutycycle-range = <100 0>; regulator-boot-on; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts index 325e448eb09c..841974b6474d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts @@ -109,7 +109,7 @@ vddcpu_a: regulator-vddcpu-a { vin-supply = <&main_12v>; - pwms = <&pwm_ab 0 1250 0>; + pwms = <&pwm_ab 0 1250 PWM_NOFLAGS>; pwm-dutycycle-range = <100 0>; regulator-boot-on; @@ -128,7 +128,7 @@ vddcpu_b: regulator-vddcpu-b { vin-supply = <&main_12v>; - pwms = <&pwm_AO_cd 1 1250 0>; + pwms = <&pwm_AO_cd 1 1250 PWM_NOFLAGS>; pwm-dutycycle-range = <100 0>; regulator-boot-on; @@ -282,7 +282,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi index 12d5e333e5f2..9da6ad85aff0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi @@ -72,7 +72,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; sdio_pwrseq: sdio-pwrseq { diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 03f79fe045b7..e00c045fb8a8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -12,6 +12,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/thermal/thermal.h> / { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts index d6ca684e0e61..a4058ce97d75 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts @@ -79,7 +79,8 @@ wifi_32k: wifi-32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; sdio_pwrseq: sdio-pwrseq { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts index 65ec7dea828c..30c900cf1d12 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts @@ -109,7 +109,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; sdio_pwrseq: sdio-pwrseq { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi index e803a466fe4e..f10a90eb39f6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi @@ -83,7 +83,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; sdio_pwrseq: sdio-pwrseq { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi index 45cb83625951..ce91158d0aa9 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi @@ -77,7 +77,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; hdmi-connector { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi index dee51cf95223..281836e3e178 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi @@ -82,7 +82,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; sdio_pwrseq: sdio-pwrseq { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts index a1119cfb0280..4711fd911205 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts @@ -93,7 +93,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; sdio_pwrseq: sdio-pwrseq { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts index c8d74e61dec1..71438f79e45f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts @@ -72,7 +72,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; sdio_pwrseq: sdio-pwrseq { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts index 440bc23c7342..c3cda2db21a1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts @@ -47,7 +47,7 @@ pwmleds { power { label = "vim:red:power"; - pwms = <&pwm_AO_ab 1 7812500 0>; + pwms = <&pwm_AO_ab 1 7812500 PWM_NOFLAGS>; max-brightness = <255>; linux,default-trigger = "default-on"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts index 62dd87821ce5..78bef1154f81 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts @@ -72,7 +72,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; sdio_pwrseq: sdio-pwrseq { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi index 6ac678f88bd8..a58d0cf277ad 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi @@ -76,7 +76,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; sdio_pwrseq: sdio-pwrseq { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts index 27eeab71ec77..9b3eed29a5b5 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts @@ -86,7 +86,7 @@ pwmleds { power { label = "vim:red:power"; - pwms = <&pwm_AO_ab 1 7812500 0>; + pwms = <&pwm_AO_ab 1 7812500 PWM_NOFLAGS>; max-brightness = <255>; linux,default-trigger = "default-on"; }; @@ -143,7 +143,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts index 420a88e9a195..8442468bb0bc 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts @@ -81,7 +81,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; sdio_pwrseq: sdio-pwrseq { diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi index 094ecf2222bb..68aedcbb2c93 100644 --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi @@ -7,6 +7,7 @@ #include <dt-bindings/input/input.h> #include <dt-bindings/gpio/meson-g12a-gpio.h> +#include <dt-bindings/pwm/pwm.h> / { aliases { @@ -165,7 +166,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts index dbbf29a0dbf6..21219d63362e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts @@ -25,7 +25,7 @@ vddcpu: regulator-vddcpu { vin-supply = <&vsys_3v3>; - pwms = <&pwm_AO_cd 1 1250 0>; + pwms = <&pwm_AO_cd 1 1250 PWM_NOFLAGS>; pwm-dutycycle-range = <100 0>; regulator-boot-on; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts index dfb2438851c0..016c8914e833 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts @@ -116,7 +116,7 @@ pwmleds { power { label = "sei610:red:power"; - pwms = <&pwm_AO_ab 0 30518 0>; + pwms = <&pwm_AO_ab 0 30518 PWM_NOFLAGS>; max-brightness = <255>; linux,default-trigger = "default-on"; active-low; @@ -187,7 +187,7 @@ vddcpu: regulator-vddcpu { vin-supply = <&dc_in>; - pwms = <&pwm_AO_cd 1 1500 0>; + pwms = <&pwm_AO_cd 1 1500 PWM_NOFLAGS>; pwm-dutycycle-range = <100 0>; regulator-boot-on; @@ -336,7 +336,8 @@ wifi32k: wifi32k { compatible = "pwm-clock"; #clock-cells = <0>; clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + /* PWM_E at 32.768KHz */ + pwms = <&pwm_ef 0 30518 PWM_NOFLAGS>; }; }; diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi index 250fc01de78d..f8bd886a7c0e 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi @@ -14,6 +14,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> #include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/sound/samsung-i2s.h> / { @@ -913,7 +914,7 @@ charger_reg: CHARGER { haptic: max77843-haptic { compatible = "maxim,max77843-haptic"; haptic-supply = <&ldo38_reg>; - pwms = <&pwm 0 33670 0>; + pwms = <&pwm 0 33670 PWM_NOFLAGS>; pwm-names = "haptic"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb.dts b/arch/arm64/boot/dts/rockchip/px30-evb.dts index 0a680257d9c2..e0257385105a 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb.dts @@ -57,7 +57,7 @@ vol-up-key { backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm1 0 25000 0>; + pwms = <&pwm1 0 25000 PWM_NOFLAGS>; power-supply = <&vcc3v3_lcd>; }; diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi index f809dd6d5dc3..c792b011d2c4 100644 --- a/arch/arm64/boot/dts/rockchip/px30.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30.dtsi @@ -9,6 +9,7 @@ #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pinctrl/rockchip.h> #include <dt-bindings/power/px30-power.h> +#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/soc/rockchip,boot-mode.h> #include <dt-bindings/thermal/thermal.h> diff --git a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts index 6ef851e7e16a..a33bd5b53840 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts @@ -22,7 +22,7 @@ ir_rx { ir_tx { compatible = "pwm-ir-tx"; - pwms = <&pwm5 0 25000 0>; + pwms = <&pwm5 0 25000 PWM_NOFLAGS>; }; leds { diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi index ac43bc3f7031..f3d0295a8046 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi @@ -9,6 +9,7 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pinctrl/rockchip.h> +#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/soc/rockchip,boot-mode.h> #include <dt-bindings/thermal/thermal.h> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts index 694b0d08d644..e831a29ed842 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts @@ -47,7 +47,7 @@ backlight: backlight { 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255>; default-brightness-level = <200>; - pwms = <&pwm0 0 25000 0>; + pwms = <&pwm0 0 25000 PWM_NOFLAGS>; }; edp_panel: edp-panel { @@ -72,7 +72,7 @@ clkin_gmac: external-gmac-clock { vdd_center: vdd-center { compatible = "pwm-regulator"; - pwms = <&pwm3 0 25000 0>; + pwms = <&pwm3 0 25000 PWM_NOFLAGS>; regulator-name = "vdd_center"; regulator-min-microvolt = <800000>; regulator-max-microvolt = <1400000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts index 5617a441e141..49164ad3093f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts @@ -20,7 +20,7 @@ chosen { backlight: backlight { compatible = "pwm-backlight"; enable-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>; - pwms = <&pwm0 0 25000 0>; + pwms = <&pwm0 0 25000 PWM_NOFLAGS>; brightness-levels = < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi index 1384dabbdf40..775bca13b5d5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi @@ -50,7 +50,7 @@ ppvar_centerlogic_pwm: ppvar-centerlogic-pwm { compatible = "pwm-regulator"; regulator-name = "ppvar_centerlogic_pwm"; - pwms = <&pwm3 0 3337 0>; + pwms = <&pwm3 0 3337 PWM_NOFLAGS>; pwm-supply = <&ppvar_sys>; pwm-dutycycle-range = <100 0>; pwm-dutycycle-unit = <100>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi index 4373ed732af7..e8b105171b86 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi @@ -164,7 +164,7 @@ backlight: backlight { enable-gpios = <&gpio4 21 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&bl_en>; - pwms = <&pwm1 0 1000000 0>; + pwms = <&pwm1 0 1000000 PWM_NOFLAGS>; pwm-delay-us = <10000>; }; @@ -217,7 +217,7 @@ &ppvar_bigcpu { &ppvar_bigcpu_pwm { /* On scarlet ppvar big cpu use pwm3 */ - pwms = <&pwm3 0 3337 0>; + pwms = <&pwm3 0 3337 PWM_NOFLAGS>; regulator-min-microvolt = <800074>; regulator-max-microvolt = <1299226>; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi index 2f3997740068..317b1bc9a018 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -101,7 +101,7 @@ ppvar_bigcpu_pwm: ppvar-bigcpu-pwm { compatible = "pwm-regulator"; regulator-name = "ppvar_bigcpu_pwm"; - pwms = <&pwm1 0 3337 0>; + pwms = <&pwm1 0 3337 PWM_NOFLAGS>; pwm-supply = <&ppvar_sys>; pwm-dutycycle-range = <100 0>; pwm-dutycycle-unit = <100>; @@ -130,7 +130,7 @@ ppvar_litcpu_pwm: ppvar-litcpu-pwm { compatible = "pwm-regulator"; regulator-name = "ppvar_litcpu_pwm"; - pwms = <&pwm2 0 3337 0>; + pwms = <&pwm2 0 3337 PWM_NOFLAGS>; pwm-supply = <&ppvar_sys>; pwm-dutycycle-range = <100 0>; pwm-dutycycle-unit = <100>; @@ -159,7 +159,7 @@ ppvar_gpu_pwm: ppvar-gpu-pwm { compatible = "pwm-regulator"; regulator-name = "ppvar_gpu_pwm"; - pwms = <&pwm0 0 3337 0>; + pwms = <&pwm0 0 3337 PWM_NOFLAGS>; pwm-supply = <&ppvar_sys>; pwm-dutycycle-range = <100 0>; pwm-dutycycle-unit = <100>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi index 47890757e866..9f606a6c01c9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi @@ -161,7 +161,7 @@ fan: pwm-fan { cooling-levels = <0 150 200 255>; #cooling-cells = <2>; fan-supply = <&vsys_5v0>; - pwms = <&pwm0 0 40000 0>; + pwms = <&pwm0 0 40000 PWM_NOFLAGS>; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts index e0d75617bb7e..f6f60274e5b8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts @@ -62,7 +62,7 @@ fan: pwm-fan { cooling-levels = <0 12 18 255>; #cooling-cells = <2>; fan-supply = <&vcc12v0_sys>; - pwms = <&pwm1 0 50000 0>; + pwms = <&pwm1 0 50000 PWM_NOFLAGS>; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi index d9dad0f45564..e86932d9549a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi @@ -19,7 +19,7 @@ chosen { backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm0 0 25000 0>; + pwms = <&pwm0 0 25000 PWM_NOFLAGS>; }; clkin_gmac: external-gmac-clock { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi index 5eedeae21189..e373277d39ca 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi @@ -58,7 +58,7 @@ fan: pwm-fan { compatible = "pwm-fan"; #cooling-cells = <2>; fan-supply = <&vcc12v_dcin>; - pwms = <&pwm1 0 50000 0>; + pwms = <&pwm1 0 50000 PWM_NOFLAGS>; }; sdio_pwrseq: sdio-pwrseq { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts index 73e269a8ae0c..fa3b70d219ba 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts @@ -79,7 +79,7 @@ backlight: backlight { 248 249 250 251 252 253 254 255>; default-brightness-level = <200>; enable-gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>; - pwms = <&pwm0 0 25000 0>; + pwms = <&pwm0 0 25000 PWM_NOFLAGS>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 74f2c3d49095..30943914bcfa 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -9,6 +9,7 @@ #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pinctrl/rockchip.h> #include <dt-bindings/power/rk3399-power.h> +#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/thermal/thermal.h> / {
The raw value '0' in the 3rd cell of the "pwms" property means there are no flags to be set. This patch converts '0' flag into PWM_NOFLAGS. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> --- Changes in v2: - Use PWM_NOFLAGS instead of PWM_POLARITY_NORMAL to avoid possible conflict with enum pwm_polarity in <linux/pwm.h>. Also, this name reflects the sense of this value more precisely. arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 3 ++- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 5 +++-- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 5 +++-- arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 ++-- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 4 ++-- arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 7 ++++--- arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 3 ++- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 3 ++- arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 3 ++- arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 3 ++- arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 3 ++- arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 3 ++- arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts | 3 ++- .../boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 3 ++- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 +- .../arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 3 ++- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 ++- arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 5 +++-- arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 3 ++- arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 4 +++- arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 7 ++++--- arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 3 ++- arch/arm64/boot/dts/rockchip/px30-evb.dts | 2 +- arch/arm64/boot/dts/rockchip/px30.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3308.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 4 ++-- arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 6 +++--- arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 1 + 44 files changed, 77 insertions(+), 51 deletions(-)