Commit 93112486 authored Aug 18, 2017 by Arnd Bergmann

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

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

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

 - Fix PCIe reset GPIO of imx6qdl-nitrogen6_som2 board, which was
   a bad copy from nitrogen6_max device tree.

* tag 'imx-fixes-4.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6qdl-nitrogen6_som2: fix PCIe reset

parents 552c497c c40bc54f

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -507,7 +507,7 @@
		pinctrl_pcie: pciegrp {
		fsl,pins = <
		/* PCIe reset */
		MX6QDL_PAD_EIM_BCLK__GPIO6_IO31 0x030b0
		MX6QDL_PAD_EIM_DA0__GPIO3_IO00 0x030b0
		MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x030b0
		>;
		};
		@@ -668,7 +668,7 @@
		&pcie {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_pcie>;
		reset-gpio = <&gpio6 31 GPIO_ACTIVE_LOW>;
		reset-gpio = <&gpio3 0 GPIO_ACTIVE_LOW>;
		status = "okay";
		};