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

Commit 5717cb89 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-dt-4.17-2' of... 

Merge tag 'imx-dt-4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

Pull "i.MX device tree updates for 4.17, round 2" Shawn Guo:

 - Add missing property '#sound-dai-cells' for sgtl5000 codec node
   in imx6ul-isiot board to fix warning seen with DTC 1.4.6.
 - Use stdout-path instead of linux,stdout-path to fix DTC warning
   reported by DTC 1.4.6.

* tag 'imx-dt-4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6ul-isiot: Pass the required '#sound-dai-cells'
  ARM: dts: imx6-phytec: Use the standard 'stdout-path' property
parents 3ac3a2f9 326e7ba9

arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
		     "phytec,imx6qdl-pcm058", "fsl,imx6dl";



	chosen {

		linux,stdout-path = &uart2;

		stdout-path = &uart2;

	};

};

arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
		     "phytec,imx6qdl-pcm058", "fsl,imx6q";



	chosen {

		linux,stdout-path = &uart2;

		stdout-path = &uart2;

	};

};

arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
		     "phytec,imx6qdl-pcm058", "fsl,imx6q";



	chosen {

		linux,stdout-path = &uart2;

		stdout-path = &uart2;

	};

};

arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
		     "phytec,imx6qdl-pcm058", "fsl,imx6qp";



	chosen {

		linux,stdout-path = &uart2;

		stdout-path = &uart2;

	};

};

arch/arm/boot/dts/imx6ul-isiot.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ 
	sgtl5000: codec@a {

		compatible = "fsl,sgtl5000";

		reg = <0x0a>;

		#sound-dai-cells = <0>;

		clocks = <&clks IMX6UL_CLK_OSC>;

		clock-names = "mclk";

		VDDA-supply = <&reg_3p3v>;