diff mbox

Patch "ARM: dts: rockchip: Add missing #sound-dai-cells on rk3288" has been added to the 4.14-stable tree

Message ID 152521850758147@kroah.com (mailing list archive)
State New, archived
Headers show

Commit Message

Greg KH May 1, 2018, 11:48 p.m. UTC
This is a note to let you know that I've just added the patch titled

    ARM: dts: rockchip: Add missing #sound-dai-cells on rk3288

to the 4.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-dts-rockchip-add-missing-sound-dai-cells-on-rk3288.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


From foo@baz Tue May  1 16:18:20 PDT 2018
From: Rob Herring <robh@kernel.org>
Date: Thu, 1 Mar 2018 14:25:35 -0600
Subject: ARM: dts: rockchip: Add missing #sound-dai-cells on rk3288

From: Rob Herring <robh@kernel.org>

[ Upstream commit 4e943a890cef42e90f43ce6be64728a290b97c55 ]

dtc now gives the following warning:

arch/arm/boot/dts/rk3288-tinker.dtb: Warning (sound_dai_property): /sound/simple-audio-card,codec: Missing property '#sound-dai-cells' in node /hdmi@ff980000 or bad phandle (referred from sound-dai[0])

Add the missing #sound-dai-cells property.

Cc: Heiko Stuebner <heiko@sntech.de>
Cc: linux-rockchip@lists.infradead.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 arch/arm/boot/dts/rk3288.dtsi |    2 ++
 1 file changed, 2 insertions(+)



Patches currently in stable-queue which might be from robh@kernel.org are

queue-4.14/microblaze-switch-to-no_bootmem.patch
queue-4.14/arm64-dts-cavium-fix-pci-bus-dtc-warnings.patch
queue-4.14/dmaengine-mv_xor_v2-fix-clock-resource-by-adding-a-register-clock.patch
queue-4.14/arm-dts-rockchip-add-missing-sound-dai-cells-on-rk3288.patch
queue-4.14/pinctrl-artpec6-dt-add-missing-pin-group-uart5nocts.patch
diff mbox

Patch

--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -927,6 +927,7 @@ 
 	i2s: i2s@ff890000 {
 		compatible = "rockchip,rk3288-i2s", "rockchip,rk3066-i2s";
 		reg = <0x0 0xff890000 0x0 0x10000>;
+		#sound-dai-cells = <0>;
 		interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -1122,6 +1123,7 @@ 
 		compatible = "rockchip,rk3288-dw-hdmi";
 		reg = <0x0 0xff980000 0x0 0x20000>;
 		reg-io-width = <4>;
+		#sound-dai-cells = <0>;
 		rockchip,grf = <&grf>;
 		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>;