Skip to content

Commit 6177a50

Browse files
MaxKrummenacherShawn Guo
authored andcommitted
ARM: dts: colibri-imx6ull: fix snvs pinmux group
A pin controlled by the iomuxc-snvs pin controller must be specified under the dtb's iomuxc-snvs node. Move the one and only pin of that category from the iomuxc node and set the pinctrl-0 using it accordingly. Fixes: 2aa9d62 ("ARM: dts: imx6ull-colibri: add touchscreen device nodes") Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
1 parent e95ea0f commit 6177a50

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

arch/arm/boot/dts/imx6ull-colibri.dtsi

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
atmel_mxt_ts: touchscreen@4a {
167167
compatible = "atmel,maxtouch";
168168
pinctrl-names = "default";
169-
pinctrl-0 = <&pinctrl_atmel_conn>;
169+
pinctrl-0 = <&pinctrl_atmel_conn &pinctrl_atmel_snvs_conn>;
170170
reg = <0x4a>;
171171
interrupt-parent = <&gpio5>;
172172
interrupts = <4 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 / INT */
@@ -331,7 +331,6 @@
331331
pinctrl_atmel_conn: atmelconngrp {
332332
fsl,pins = <
333333
MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0xb0a0 /* SODIMM 106 */
334-
MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */
335334
>;
336335
};
337336

@@ -684,6 +683,12 @@
684683
};
685684

686685
&iomuxc_snvs {
686+
pinctrl_atmel_snvs_conn: atmelsnvsconngrp {
687+
fsl,pins = <
688+
MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */
689+
>;
690+
};
691+
687692
pinctrl_snvs_gpio1: snvsgpio1grp {
688693
fsl,pins = <
689694
MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x110a0 /* SODIMM 93 */

0 commit comments

Comments
 (0)