Merge tag 'ipvs-for-v4.18' of http://git.kernel.org/pub/scm/linux/kernel/git/horms...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6ul-isiot.dtsi

diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi
index 950fb28b630a4dc88ee1f28840dab90317f01c83..921e12c69a002e52742b18abb358b57288d3a09e 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-isiot.dtsi
+++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi
@@ -45,7 +45,7 @@
 #include "imx6ul.dtsi"
 
 / {
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x20000000>;
        };
 
@@ -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>;