Unverified Commit 01277737 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-5.19-3' of... 

Merge tag 'imx-fixes-5.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 5.19, round 3:

- Fix GPIO property for imx6qdl-ts7970 board.
- Fix touchscreen pinctrl for imx6ull-colibri board by moving iomuxc-snvs
  pin to the correct controller device.
- Fix SFP node of fsl-ls1028a to have a required clock property.

* tag 'imx-fixes-5.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: colibri-imx6ull: fix snvs pinmux group
  ARM: dts: imx6qdl-ts7970: Fix ngpio typo and count
  arm64: dts: ls1028a: Update SFP node to include clock

Link: https://lore.kernel.org/r/20220709032716.GA9868@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3f231ccb 6177a50f

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

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ 
		reg = <0x28>;

		#gpio-cells = <2>;

		gpio-controller;

		ngpio = <32>;

		ngpios = <62>;

	};



	sgtl5000: codec@a {

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

+7 −2
Original line number Diff line number Diff line
@@ -166,7 +166,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 */
@@ -331,7 +331,6 @@ 
	pinctrl_atmel_conn: atmelconngrp {

		fsl,pins = <

			MX6UL_PAD_JTAG_MOD__GPIO1_IO10          0xb0a0  /* SODIMM 106 */

			MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04     0xb0a0	/* SODIMM 107 */

		>;

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



&iomuxc_snvs {

	pinctrl_atmel_snvs_conn: atmelsnvsconngrp {

		fsl,pins = <

			MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04     0xb0a0	/* SODIMM 107 */

		>;

	};



	pinctrl_snvs_gpio1: snvsgpio1grp {

		fsl,pins = <

			MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06	0x110a0	/* SODIMM 93 */

arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -224,9 +224,12 @@ 
			little-endian;

		};



		efuse@1e80000 {

		sfp: efuse@1e80000 {

			compatible = "fsl,ls1028a-sfp";

			reg = <0x0 0x1e80000 0x0 0x10000>;

			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL

					    QORIQ_CLK_PLL_DIV(4)>;

			clock-names = "sfp";

			#address-cells = <1>;

			#size-cells = <1>;