diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-28 18:09:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-28 18:09:29 +0200 |
| commit | 5717cb89ed0d22f338f56f3d8d0a1538fbac6d39 (patch) | |
| tree | 82cc8907cb0aae5056903b4c73831e25f12f0ae6 /arch/arm/boot | |
| parent | 3ac3a2f9b22e519bce4bdac688dcb00e3c1556da (diff) | |
| parent | 326e7ba992cbe17c12d4235f65d72c6e222a73a1 (diff) | |
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
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-isiot.dtsi | 1 |
5 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts b/arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts index a8adcb2ec3fd..9f7f9f98139d 100644 --- a/arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts +++ b/arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts @@ -15,7 +15,7 @@ "phytec,imx6qdl-pcm058", "fsl,imx6dl"; chosen { - linux,stdout-path = &uart2; + stdout-path = &uart2; }; }; diff --git a/arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts b/arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts index 8fdce3c8e5fa..2e70ea5623c6 100644 --- a/arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts +++ b/arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts @@ -15,7 +15,7 @@ "phytec,imx6qdl-pcm058", "fsl,imx6q"; chosen { - linux,stdout-path = &uart2; + stdout-path = &uart2; }; }; diff --git a/arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts b/arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts index 8afa5ceb7d7c..65d2e483c136 100644 --- a/arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts +++ b/arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts @@ -15,7 +15,7 @@ "phytec,imx6qdl-pcm058", "fsl,imx6q"; chosen { - linux,stdout-path = &uart2; + stdout-path = &uart2; }; }; diff --git a/arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts b/arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts index 3618e5316bf4..f27d7ab42626 100644 --- a/arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts +++ b/arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts @@ -15,7 +15,7 @@ "phytec,imx6qdl-pcm058", "fsl,imx6qp"; chosen { - linux,stdout-path = &uart2; + stdout-path = &uart2; }; }; diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi index b0ecebb512b3..921e12c69a00 100644 --- a/arch/arm/boot/dts/imx6ul-isiot.dtsi +++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi @@ -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 = <®_3p3v>; |