Message ID | 20230417173830.19401-2-andrejs.cainikovs@toradex.com |
---|---|
State | New |
Headers | show |
Series | arm64: dts: colibri-imx8x: misc fixes | expand |
On Mon, Apr 17, 2023 at 07:38:27PM +0200, Andrejs Cainikovs wrote: > From: Emanuele Ghidoli <emanuele.ghidoli@toradex.com> > > Fix pinctrl groups to have SODIMM 75 only in one group. > Remove configuration of the pin at SoM level because it is normally > used as CSI_MCLK at camera interface connector. > Without this fix it is not possible, without redefining iomuxc pinctrl, > to use CSI_MCLK signal and leads to the following error messages: > > imx8qxp-pinctrl scu:pinctrl: pin IMX8QXP_CSI_MCLK already requested > imx8qxp-pinctrl scu:pinctrl: pin-147 (16-003c) status -22 > > Fixes: 4d2adf738169 ("arm64: dts: colibri-imx8x: Split pinctrl_hog1") > Unneeded newline. Fixes tag can just be part of Signed-off-by section. Shawn > Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com> > Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com> > --- > arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi b/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi > index 7cad79102e1a..6f88c11f16e1 100644 > --- a/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi > +++ b/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi > @@ -365,7 +365,7 @@ &usdhc2 { > &iomuxc { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_ext_io0>, <&pinctrl_hog0>, <&pinctrl_hog1>, > - <&pinctrl_hog2>, <&pinctrl_lpspi2_cs2>; > + <&pinctrl_lpspi2_cs2>; > > /* On-module touch pen-down interrupt */ > pinctrl_ad7879_int: ad7879intgrp { > @@ -499,8 +499,7 @@ pinctrl_hog0: hog0grp { > }; > > pinctrl_hog1: hog1grp { > - fsl,pins = <IMX8QXP_CSI_MCLK_LSIO_GPIO3_IO01 0x20>, /* SODIMM 75 */ > - <IMX8QXP_QSPI0A_SCLK_LSIO_GPIO3_IO16 0x20>; /* SODIMM 93 */ > + fsl,pins = <IMX8QXP_QSPI0A_SCLK_LSIO_GPIO3_IO16 0x20>; /* SODIMM 93 */ > }; > > pinctrl_hog2: hog2grp { > -- > 2.34.1 >
diff --git a/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi b/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi index 7cad79102e1a..6f88c11f16e1 100644 --- a/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi @@ -365,7 +365,7 @@ &usdhc2 { &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ext_io0>, <&pinctrl_hog0>, <&pinctrl_hog1>, - <&pinctrl_hog2>, <&pinctrl_lpspi2_cs2>; + <&pinctrl_lpspi2_cs2>; /* On-module touch pen-down interrupt */ pinctrl_ad7879_int: ad7879intgrp { @@ -499,8 +499,7 @@ pinctrl_hog0: hog0grp { }; pinctrl_hog1: hog1grp { - fsl,pins = <IMX8QXP_CSI_MCLK_LSIO_GPIO3_IO01 0x20>, /* SODIMM 75 */ - <IMX8QXP_QSPI0A_SCLK_LSIO_GPIO3_IO16 0x20>; /* SODIMM 93 */ + fsl,pins = <IMX8QXP_QSPI0A_SCLK_LSIO_GPIO3_IO16 0x20>; /* SODIMM 93 */ }; pinctrl_hog2: hog2grp {