diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-07-09 18:22:11 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-07-09 18:23:21 +0200 |
| commit | 70115fee222012ca7c7ce796d772cac596b0927b (patch) | |
| tree | 9206feb864f31d5a87c82b717e619ba36516dde8 | |
| parent | 636221c6d4053a9b43b7f0cfcbedecb0177eb723 (diff) | |
arm64: dts: apalis-imx8qxp: cleanup pinctrl gpio mess
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis-eval.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi | 50 |
2 files changed, 33 insertions, 23 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis-eval.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis-eval.dtsi index 96e35e54c26f..b7113219b54c 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis-eval.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis-eval.dtsi @@ -178,10 +178,10 @@ mclk_source = <0>; mipi_csi; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio12>; - pwn-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&pinctrl_gpio1>, <&pinctrl_gpio2>; + pwn-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; /* Apalis GPIO2 */ reg = <0x3c>; - rst-gpios = <&gpio3 21 GPIO_ACTIVE_LOW>; + rst-gpios = <&gpio3 21 GPIO_ACTIVE_LOW>; /* Apalis GPIO1 */ status = "okay"; port { diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi index 404e77779bdc..ab3db92584ab 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi @@ -455,7 +455,7 @@ atmel_mxt_ts: atmel_mxt_ts@4a { compatible = "atmel,maxtouch"; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_touch>; + pinctrl-0 = <&pinctrl_gpio5>, <&pinctrl_gpio6>; reg = <0x4a>; interrupt-parent = <&gpio3>; interrupts = <17 IRQ_TYPE_EDGE_FALLING>; /* Apalis GPIO5 */ @@ -484,10 +484,10 @@ &iomuxc { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio34>, <&pinctrl_usbo1oc>, <&pinctrl_gpio8>, + pinctrl-0 = <&pinctrl_dap1_gpios>, <&pinctrl_gpio3>, <&pinctrl_gpio4>, + <&pinctrl_gpio8>, <&pinctrl_mmc1_gpios>, <&pinctrl_qspi0a_gpios>, <&pinctrl_sata1_act>, - <&pinctrl_mmc1_gpios>, <&pinctrl_dap1_gpios>, - <&pinctrl_wifi_sclk>; + <&pinctrl_usbo1oc>, <&pinctrl_wifi_sclk>; apalis-imx8qxp { /* Apalis AN1_ADC */ @@ -550,48 +550,58 @@ >; }; - /* Apalis GPIO1+2 */ - pinctrl_gpio12: gpio12grp { + /* Apalis GPIO1 */ + pinctrl_gpio1: gpio1grp { fsl,pins = < - /* Apalis GPIO 1 */ SC_P_QSPI0B_DATA3_LSIO_GPIO3_IO21 0x21 /* MXM3 1 */ - /* Apalis GPIO 2 */ + >; + }; + + /* Apalis GPIO2 */ + pinctrl_gpio2: gpio2grp { + fsl,pins = < SC_P_QSPI0B_DQS_LSIO_GPIO3_IO22 0x21 /* MXM3 3 */ >; }; - /* Apalis GPIO3+4 */ - pinctrl_gpio34: gpio34grp { + /* Apalis GPIO3 */ + pinctrl_gpio3: gpio3grp { fsl,pins = < - /* Apalis GPIO 3 */ SC_P_QSPI0B_SS0_B_LSIO_GPIO3_IO23 0x21 /* MXM3 5 */ - /* Apalis GPIO 4 */ + >; + }; + + /* Apalis GPIO4 */ + pinctrl_gpio4: gpio4grp { + fsl,pins = < SC_P_QSPI0B_SS1_B_LSIO_GPIO3_IO24 0x21 /* MXM3 7 */ >; }; - /* Apalis GPIO5+6 */ - pinctrl_touch: touchgrp { + /* Apalis GPIO5 */ + pinctrl_gpio5: gpio5grp { fsl,pins = < - /* Apalis GPIO 5 */ SC_P_QSPI0B_SCLK_LSIO_GPIO3_IO17 0x21 /* MXM3 11 */ - /* Apalis GPIO 6 */ + >; + }; + + /* Apalis GPIO6 */ + pinctrl_gpio6: gpio6grp { + fsl,pins = < SC_P_QSPI0B_DATA0_LSIO_GPIO3_IO18 0x21 /* MXM3 13 */ >; }; /* Apalis GPIO7 */ - pinctrl_gpio7: gpio7 { + pinctrl_gpio7: gpio7grp { fsl,pins = < - /* Apalis GPIO 7 */ SC_P_QSPI0B_DATA1_LSIO_GPIO3_IO19 0x21 /* MXM3 15 */ >; }; /* Apalis GPIO8 */ - pinctrl_gpio8: gpio8 { + pinctrl_gpio8: gpio8grp { fsl,pins = < - /* Apalis GPIO 8 */ SC_P_QSPI0B_DATA2_LSIO_GPIO3_IO20 0x21 /* MXM3 17 */ >; }; |