openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i.MX device tree updates for 4.17, round 2: 

- 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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJaqysJAAoJEFBXWFqHsHzOz24H/j3Aa6ThJAmSi4XsCSa+xZtr
 8uqedh8EX+SEVXnkyhJ10g8A6qKZQ8boKAtva/7uJnIyMBDvLwIleLPRII3t1axj
 qp+VrLvWUw2MV0MXlj1D9vgRm9t8/Io79bzZJrdymU8LdldV3N1Gf6xJUM/AF40k
 4diFJSb4XvR1+gCp8jRKhOC65j6vPNYRLToDSqiMHMeAdVTo/CM0lp/T6Ei8BkJP
 snybLF0KPt84gGBFMcmwP7bFS9r92+yxtMeac2723peIHrCrY28ho1uIAV5kX/lf
 YpFpQk33ocRCV5iprF/qHgUF45Adj6IjP7EpSNnWdbcTr1FzU9mispdGZQ1MIQk=
 =+/7s
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2018-03-28 18:09:29 +02:00
parent 3ac3a2f9b2 326e7ba992
commit 5717cb89ed
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ / {
"phytec,imx6qdl-pcm058", "fsl,imx6dl"; "phytec,imx6qdl-pcm058", "fsl,imx6dl";
chosen { chosen {
linux,stdout-path = &uart2; stdout-path = &uart2;
}; };
}; };

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

@ -15,7 +15,7 @@ / {
"phytec,imx6qdl-pcm058", "fsl,imx6q"; "phytec,imx6qdl-pcm058", "fsl,imx6q";
chosen { chosen {
linux,stdout-path = &uart2; stdout-path = &uart2;
}; };
}; };

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

@ -15,7 +15,7 @@ / {
"phytec,imx6qdl-pcm058", "fsl,imx6q"; "phytec,imx6qdl-pcm058", "fsl,imx6q";
chosen { chosen {
linux,stdout-path = &uart2; stdout-path = &uart2;
}; };
}; };

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

@ -15,7 +15,7 @@ / {
"phytec,imx6qdl-pcm058", "fsl,imx6qp"; "phytec,imx6qdl-pcm058", "fsl,imx6qp";
chosen { chosen {
linux,stdout-path = &uart2; stdout-path = &uart2;
}; };
}; };

1
arch/arm/boot/dts/imx6ul-isiot.dtsi
View File

@ -142,6 +142,7 @@ &i2c1 {
sgtl5000: codec@a { sgtl5000: codec@a {
compatible = "fsl,sgtl5000"; compatible = "fsl,sgtl5000";
reg = <0x0a>; reg = <0x0a>;
#sound-dai-cells = <0>;
clocks = <&clks IMX6UL_CLK_OSC>; clocks = <&clks IMX6UL_CLK_OSC>;
clock-names = "mclk"; clock-names = "mclk";
VDDA-supply = <&reg_3p3v>; VDDA-supply = <&reg_3p3v>;