diff options
Diffstat (limited to 'arch/arm/boot/dts')
19 files changed, 66 insertions, 110 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-aster.dts b/arch/arm/boot/dts/imx6dl-colibri-aster.dts index f6fbd57b4f3d..d149c02932cb 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-aster.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-aster.dts @@ -15,6 +15,7 @@ #include <dt-bindings/input/input.h> #include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/pwm/pwm.h> #include "imx6dl.dtsi" #include "imx6qdl-colibri.dtsi" @@ -69,13 +70,9 @@ }; &backlight { -#if 0 /* PWM polarity: if 1 is brightest */ - pwms = <&pwm3 0 5000000 0>; -#else /* PWM polarity: if 0 is brightest */ - pwms = <&pwm3 0 5000000 1>; -#endif - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm3 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts index 794c6da155c1..433d33e87538 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts @@ -15,6 +15,7 @@ #include <dt-bindings/input/input.h> #include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/pwm/pwm.h> #include "imx6dl.dtsi" #include "imx6qdl-colibri.dtsi" @@ -77,16 +78,9 @@ }; &backlight { -#if 0 /* PWM polarity: if 1 is brightest */ - pwms = <&pwm3 0 5000000 0>; -#if 0 /* Fusion 7 needs 10kHz PWM frequency */ - pwms = <&pwm3 0 100000 0>; -#endif -#else /* PWM polarity: if 0 is brightest */ - pwms = <&pwm3 0 5000000 1>; -#endif - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm3 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index 8277c76130df..46ad772e4daf 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts @@ -45,6 +45,7 @@ #include <dt-bindings/input/input.h> #include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/pwm/pwm.h> #include "imx6dl.dtsi" #include "imx6qdl-colibri.dtsi" @@ -154,16 +155,9 @@ }; &backlight { - #if 0 /* PWM polarity: if 1 is brightest */ - pwms = <&pwm3 0 5000000 0>; - #if 0 /* Fusion 7 needs 10kHz PWM frequency */ - pwms = <&pwm3 0 100000 0>; - #endif - #else /* PWM polarity: if 0 is brightest */ - pwms = <&pwm3 0 5000000 1>; - #endif - brightness-levels = <0 127 191 223 239 247 251 255>; - default-brightness-level = <1>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm3 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts b/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts index 671d92bd9ead..f2378dcb43bc 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts @@ -7,6 +7,7 @@ #include <dt-bindings/input/input.h> #include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/pwm/pwm.h> #include "imx6dl.dtsi" #include "imx6qdl-colibri.dtsi" @@ -37,16 +38,9 @@ }; &backlight { - #if 0 /* PWM polarity: if 1 is brightest */ - pwms = <&pwm3 0 5000000 0>; - #if 0 /* Fusion 7 needs 10kHz PWM frequency */ - pwms = <&pwm3 0 100000 0>; - #endif - #else /* PWM polarity: if 0 is brightest */ - pwms = <&pwm3 0 5000000 1>; - #endif - brightness-levels = <0 127 191 223 239 247 251 255>; - default-brightness-level = <1>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm3 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6dl-colibri-iris.dts b/arch/arm/boot/dts/imx6dl-colibri-iris.dts index 1d8f3564c5a5..f8964117f964 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-iris.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-iris.dts @@ -7,6 +7,7 @@ #include <dt-bindings/input/input.h> #include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/pwm/pwm.h> #include "imx6dl.dtsi" #include "imx6qdl-colibri.dtsi" @@ -25,16 +26,9 @@ }; &backlight { - #if 0 /* PWM polarity: if 1 is brightest */ - pwms = <&pwm3 0 5000000 0>; - #if 0 /* Fusion 7 needs 10kHz PWM frequency */ - pwms = <&pwm3 0 100000 0>; - #endif - #else /* PWM polarity: if 0 is brightest */ - pwms = <&pwm3 0 5000000 1>; - #endif - brightness-levels = <0 127 191 223 239 247 251 255>; - default-brightness-level = <1>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm3 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index cb72cd78954e..3184100f4850 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -46,6 +46,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 "imx6q.dtsi" #include "imx6qdl-apalis.dtsi" @@ -167,17 +168,10 @@ }; &backlight { -#if 0 /* PWM polarity: if 1 is brightest */ - pwms = <&pwm4 0 5000000 0>; -#if 0 /* Fusion 7 needs 10kHz PWM frequency */ - pwms = <&pwm4 0 100000 0>; -#endif -#else /* PWM polarity: if 0 is brightest */ - pwms = <&pwm4 0 5000000 1>; -#endif - brightness-levels = <0 127 191 223 239 247 251 255>; - default-brightness-level = <1>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; power-supply = <®_3v3_sw>; + pwms = <&pwm4 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts index 70789ec1768c..8fb7627f036a 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -176,17 +176,10 @@ }; &backlight { -#if 0 /* PWM polarity: if 1 is brightest */ - pwms = <&pwm4 0 5000000 0>; -#if 0 /* Fusion 7 needs 10kHz PWM frequency */ - pwms = <&pwm4 0 100000 0>; -#endif -#else /* PWM polarity: if 0 is brightest */ - pwms = <&pwm4 0 5000000 1>; -#endif - brightness-levels = <0 127 191 223 239 247 251 255>; - default-brightness-level = <1>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; power-supply = <®_3v3_sw>; + pwms = <&pwm4 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts index 04a7643267d4..42522b48def4 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts @@ -204,16 +204,9 @@ }; &backlight { -#if 0 /* PWM polarity: if 1 is brightest */ - pwms = <&pwm4 0 5000000 0>; -#if 0 /* Fusion 7 needs 10kHz PWM frequency */ - pwms = <&pwm4 0 100000 0>; -#endif -#else /* PWM polarity: if 0 is brightest */ - pwms = <&pwm4 0 5000000 1>; -#endif - brightness-levels = <0 127 191 223 239 247 251 255>; - default-brightness-level = <1>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm4 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts index a1b2b67127fb..71cdf5c8a630 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -167,17 +167,10 @@ }; &backlight { -#if 0 /* PWM polarity: if 1 is brightest */ - pwms = <&pwm4 0 5000000 0>; -#if 0 /* Fusion 7 needs 10kHz PWM frequency */ - pwms = <&pwm4 0 100000 0>; -#endif -#else /* PWM polarity: if 0 is brightest */ - pwms = <&pwm4 0 5000000 1>; -#endif - brightness-levels = <0 127 191 223 239 247 251 255>; - default-brightness-level = <1>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; power-supply = <®_3v3_sw>; + pwms = <&pwm4 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index e72331a27b49..cebd78f2a34e 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -61,7 +61,6 @@ compatible = "pwm-backlight"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_bl_on>; - pwms = <&pwm4 0 5000000>; enable-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi index 33912abe1e21..5958a799383b 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi @@ -8,6 +8,7 @@ */ #include <dt-bindings/input/input.h> +#include <dt-bindings/pwm/pwm.h> / { chosen { @@ -64,9 +65,9 @@ }; &bl { - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; - pwms = <&pwm4 0 5000000 1>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm4 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi index 9e4ab529c0f5..f2f24e5e001c 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi @@ -3,6 +3,8 @@ * Copyright 2017 Toradex AG */ +#include <dt-bindings/pwm/pwm.h> + / { chosen { stdout-path = "serial0:115200n8"; @@ -67,10 +69,10 @@ }; &bl { - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; power-supply = <®_3v3>; - pwms = <&pwm4 0 5000000 1>; + pwms = <&pwm4 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi index 5c1e036fdba1..3c94cce02d9c 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi @@ -4,6 +4,7 @@ */ #include <dt-bindings/input/input.h> +#include <dt-bindings/pwm/pwm.h> / { chosen { @@ -70,9 +71,9 @@ }; &bl { - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; - pwms = <&pwm4 0 5000000 1>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm4 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi index c6fcc2f7c8e9..3d9989eff9de 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi @@ -4,6 +4,7 @@ */ #include <dt-bindings/input/input.h> +#include <dt-bindings/pwm/pwm.h> / { chosen { @@ -60,9 +61,9 @@ }; &bl { - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; - pwms = <&pwm4 0 5000000 1>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm4 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi index 1502a212b636..4150bb62c817 100644 --- a/arch/arm/boot/dts/imx7-colibri-aster.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi @@ -8,6 +8,7 @@ */ #include <dt-bindings/input/input.h> +#include <dt-bindings/pwm/pwm.h> / { chosen { @@ -64,8 +65,9 @@ }; &bl { - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm1 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi index 22c6d1f8ae57..80db406fb4f8 100644 --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi @@ -41,6 +41,7 @@ */ #include <dt-bindings/input/input.h> +#include <dt-bindings/pwm/pwm.h> / { aliases { @@ -108,10 +109,10 @@ }; &bl { - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; power-supply = <®_3v3>; - + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm1 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi b/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi index fe31c97ff276..ef13a3c87883 100644 --- a/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi @@ -4,6 +4,7 @@ */ #include <dt-bindings/input/input.h> +#include <dt-bindings/pwm/pwm.h> / { chosen { @@ -62,8 +63,9 @@ }; &bl { - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm1 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7-colibri-iris.dtsi b/arch/arm/boot/dts/imx7-colibri-iris.dtsi index bd03699ea69a..06beb5df89bd 100644 --- a/arch/arm/boot/dts/imx7-colibri-iris.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-iris.dtsi @@ -4,6 +4,7 @@ */ #include <dt-bindings/input/input.h> +#include <dt-bindings/pwm/pwm.h> / { chosen { @@ -59,8 +60,9 @@ }; &bl { - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm1 0 6666667 PWM_POLARITY_INVERTED>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 2b6980b7b6bc..a80d359298a6 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -45,7 +45,6 @@ compatible = "pwm-backlight"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_bl_on>; - pwms = <&pwm1 0 5000000 0>; enable-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; }; |