From: Max Krummenacher <[email protected]>
- Follows a change to the SGTL5000 MCLK handling fixed for Apalis iMX6 by
Fabio.
- Simplify handling of inverted PWM backlight
- Fixes a regression for the capacitive touch introduced with
https://lore.kernel.org/all/[email protected]/
Max Krummenacher (3):
ARM: dts: imx6qdl-colibri: Fix capacitive touch reset polarity
ARM: dts: imx6qdl-colibri: Mux mclk for sgtl5000 with the codec node
ARM: dts: imx6qdl-colibri: backlight pwm: Simplify inverted backlight
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
--
2.20.1
From: Max Krummenacher <[email protected]>
The commit feedaacdadfc ("Input: atmel_mxt_ts - fix up inverted RESET
handler") requires the reset GPIO to have GPIO_ACTIVE_LOW.
Fixes: 1524b27c94a6 ("ARM: dts: imx6dl-colibri: Move common nodes to SoM dtsi")
Signed-off-by: Max Krummenacher <[email protected]>
---
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index c383e0e4110c..7df270cea292 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -593,7 +593,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_atmel_conn>;
reg = <0x4a>;
- reset-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */
+ reset-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* SODIMM 106 */
status = "disabled";
};
};
--
2.20.1
From: Max Krummenacher <[email protected]>
Move the pin muxing for MCLK used by the codec to the codec node
instead of placing it inside the audmux pinctrl group.
While no negative effects have been observed this should make sure that
MCLK is provided when the codec driver is probed.
Follows commit fa51e1dc4b91 ("ARM: dts: imx6qdl-apalis: Fix sgtl5000
detection issue")
Signed-off-by: Max Krummenacher <[email protected]>
---
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 7df270cea292..f0908b530f86 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -520,6 +520,8 @@
compatible = "fsl,sgtl5000";
clocks = <&clks IMX6QDL_CLK_CKO>;
lrclk-strength = <3>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_sgtl5000>;
reg = <0x0a>;
#sound-dai-cells = <0>;
VDDA-supply = <®_module_3v3_audio>;
@@ -739,8 +741,6 @@
pinctrl_audmux: audmuxgrp {
fsl,pins = <
- /* SGTL5000 sys_mclk */
- MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x000b0
MX6QDL_PAD_KEY_COL0__AUD5_TXC 0x130b0
MX6QDL_PAD_KEY_ROW0__AUD5_TXD 0x130b0
MX6QDL_PAD_KEY_COL1__AUD5_TXFS 0x130b0
@@ -991,6 +991,13 @@
>;
};
+ pinctrl_sgtl5000: sgtl5000grp {
+ fsl,pins = <
+ /* SGTL5000 sys_mclk */
+ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x000b0
+ >;
+ };
+
pinctrl_spdif: spdifgrp {
fsl,pins = <
MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0
--
2.20.1
From: Max Krummenacher <[email protected]>
Set #pwm-cells to the default 3 to gain access to the parameter
which allows inverting the PWM signal. This is useful to specify
a backlight which has its highest brightness at 0.
Also adapt the brightness steps as the backlight doesn't light up
for very low duty cycles.
Signed-off-by: Max Krummenacher <[email protected]>
---
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index f0908b530f86..023e76215064 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -6,6 +6,7 @@
*/
#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pwm/pwm.h>
/ {
model = "Toradex Colibri iMX6DL/S Module";
@@ -13,13 +14,13 @@
backlight: backlight {
compatible = "pwm-backlight";
- 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>;
enable-gpios = <&gpio3 26 GPIO_ACTIVE_HIGH>; /* Colibri BL_ON */
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_bl_on>;
power-supply = <®_module_3v3>;
- pwms = <&pwm3 0 5000000>;
+ pwms = <&pwm3 0 5000000 PWM_POLARITY_INVERTED>;
status = "disabled";
};
@@ -620,7 +621,6 @@
/* Colibri PWM<A> */
&pwm3 {
- #pwm-cells = <2>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm3>;
status = "disabled";
--
2.20.1
On Mon, May 9, 2022 at 8:12 AM Max Krummenacher <[email protected]> wrote:
>
> From: Max Krummenacher <[email protected]>
>
> Move the pin muxing for MCLK used by the codec to the codec node
> instead of placing it inside the audmux pinctrl group.
>
> While no negative effects have been observed this should make sure that
> MCLK is provided when the codec driver is probed.
>
> Follows commit fa51e1dc4b91 ("ARM: dts: imx6qdl-apalis: Fix sgtl5000
> detection issue")
>
> Signed-off-by: Max Krummenacher <[email protected]>
Reviewed-by: Fabio Estevam <[email protected]>
On Mon, May 9, 2022 at 8:12 AM Max Krummenacher <[email protected]> wrote:
>
> From: Max Krummenacher <[email protected]>
>
> Set #pwm-cells to the default 3 to gain access to the parameter
> which allows inverting the PWM signal. This is useful to specify
> a backlight which has its highest brightness at 0.
>
> Also adapt the brightness steps as the backlight doesn't light up
> for very low duty cycles.
This should probably be a different patch.
On Mon, May 9, 2022 at 8:12 AM Max Krummenacher <[email protected]> wrote:
>
> From: Max Krummenacher <[email protected]>
>
> The commit feedaacdadfc ("Input: atmel_mxt_ts - fix up inverted RESET
> handler") requires the reset GPIO to have GPIO_ACTIVE_LOW.
>
> Fixes: 1524b27c94a6 ("ARM: dts: imx6dl-colibri: Move common nodes to SoM dtsi")
>
No need for a blank line between Fixes and Signed-off-by line.
> Signed-off-by: Max Krummenacher <[email protected]>
Reviewed-by: Fabio Estevam <[email protected]>