summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2022-06-29 17:51:54 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2022-06-29 18:15:02 +0200
commit5a24da287b86482b0d13352d3a12fa16c81a03f0 (patch)
tree2a2e8281a366333b556ff10a5ba13b2e04d4a760
parent3f254ffb0ff19c23719c829df1cebe13864776cb (diff)
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. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri.dtsi11
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index 9e83142ba073..06d4270e4c13 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -160,7 +160,7 @@
atmel_mxt_ts: touchscreen@4a {
compatible = "atmel,maxtouch";
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_atmel_conn>;
+ pinctrl-0 = <&pinctrl_atmel_conn &pinctrl_atmel_snvs_conn>;
reg = <0x4a>;
interrupt-parent = <&gpio5>;
interrupts = <4 IRQ_TYPE_EDGE_FALLING>; /* SODIMM_107, INT */
@@ -311,10 +311,9 @@
>;
};
- pinctrl_atmel_conn: atmel_conn_group {
+ pinctrl_atmel_conn: atmel-conn-group {
fsl,pins = <
MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0xb0a0 /* SODIMM 106 */
- MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */
>;
};
@@ -630,6 +629,12 @@
};
&iomuxc_snvs {
+ pinctrl_atmel_snvs_conn: atmel-snvs-conn-grp {
+ fsl,pins = <
+ MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */
+ >;
+ };
+
pinctrl_snvs_gpio1: snvs-gpio1-grp {
fsl,pins = <
MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x110a0 /* SODIMM 93 */