Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69a80d8c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-4.13' of... 

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

Pull "i.MX fixes for 4.13" from Shawn Guo:

 - A fix for imx7d-sdb board to move pinctrl_spi4 pins from low power
   iomux controller to normal iomuxc node, as the pins belong to normal
   iomuxc rather than low power one.

* tag 'imx-fixes-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx7d-sdb: Put pinctrl_spi4 in the correct location
parents aae4e7a8 05969566

arch/arm/boot/dts/imx7d-sdb.dts

+8 −8
Original line number Diff line number Diff line
@@ -557,6 +557,14 @@ 
			>;

		};



		pinctrl_spi4: spi4grp {

			fsl,pins = <

				MX7D_PAD_GPIO1_IO09__GPIO1_IO9	0x59

				MX7D_PAD_GPIO1_IO12__GPIO1_IO12	0x59

				MX7D_PAD_GPIO1_IO13__GPIO1_IO13	0x59

			>;

		};



		pinctrl_tsc2046_pendown: tsc2046_pendown {

			fsl,pins = <

				MX7D_PAD_EPDC_BDR1__GPIO2_IO29		0x59
@@ -697,13 +705,5 @@ 
		fsl,pins = <

			MX7D_PAD_LPSR_GPIO1_IO01__PWM1_OUT		0x110b0

		>;



		pinctrl_spi4: spi4grp {

			fsl,pins = <

				MX7D_PAD_GPIO1_IO09__GPIO1_IO9	0x59

				MX7D_PAD_GPIO1_IO12__GPIO1_IO12	0x59

				MX7D_PAD_GPIO1_IO13__GPIO1_IO13	0x59

			>;

		};

	};

};