Commit 1c5fa828 authored Jun 15, 2022 by Oleksandr Suvorov Committed by Shawn Guo Jun 20, 2022

ARM: dts: imx6q-apalis: Move pinmux groups to SoM dtsi



GPIO pinmux groups are declared on the module level. Move muxing
them to the same level. It also reduces code duplication.

Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

parent 36d46dff

arch/arm/boot/dts/imx6q-apalis-eval.dts

+0 −12

Original line number	Diff line number	Diff line
		@@ -206,15 +206,3 @@ &usdhc2 {
		cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
		status = "okay";
		};

		&iomuxc {
		/*
		* Mux the Apalis GPIOs
		*/
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
		&pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
		&pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
		&pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8
		>;
		};

arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts

+0 −10

Original line number	Diff line number	Diff line
		@@ -202,16 +202,6 @@ &usdhc1 {
		};

		&iomuxc {
		/*
		* Mux the Apalis GPIOs
		*/
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
		&pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
		&pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
		&pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8
		>;

		pinctrl_leds_ixora: ledsixoragrp {
		fsl,pins = <
		MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x1b0b0

arch/arm/boot/dts/imx6q-apalis-ixora.dts

+0 −8

Original line number	Diff line number	Diff line
		@@ -205,14 +205,6 @@ &usdhc2 {
		};

		&iomuxc {
		/* Mux the Apalis GPIOs */
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
		&pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
		&pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
		&pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8
		>;

		pinctrl_leds_ixora: ledsixoragrp {
		fsl,pins = <
		MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x1b0b0

arch/arm/boot/dts/imx6qdl-apalis.dtsi

+8 −0

Original line number	Diff line number	Diff line
		@@ -709,6 +709,14 @@ &weim {
		};

		&iomuxc {
		/* Mux the Apalis GPIOs */
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
		&pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
		&pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
		&pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8
		>;

		pinctrl_apalis_gpio1: gpio2io04grp {
		fsl,pins = <
		MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x130b0