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/dts/imx6qp-phytec-mira-rdk-nand.dts | |
| 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/dts/imx6qp-phytec-mira-rdk-nand.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts | 2 |
1 files changed, 1 insertions, 1 deletions
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; }; }; |