]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ARM: dts: rockchip: fix rk3036 acodec node
authorHeiko Stuebner <heiko@sntech.de>
Tue, 8 Oct 2024 20:39:37 +0000 (22:39 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 14 Nov 2024 12:13:35 +0000 (13:13 +0100)
[ Upstream commit c7206853cd7d31c52575fb1dc7616b4398f3bc8f ]

The acodec node is not conformant to the binding.

Set the correct nodename, use the correct compatible, add the needed
#sound-dai-cells and sort the rockchip,grf below clocks properties
as expected.

Fixes: faea098e1808 ("ARM: dts: rockchip: add core rk3036 dtsi")
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20241008203940.2573684-12-heiko@sntech.de
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/boot/dts/rk3036.dtsi

index 0af1a86f9dc45ce5ce56e7a5c48bb5b11be67c38..4db4e19b22a1e8c89f3d4b1785a4879f77ad723d 100644 (file)
                };
        };
 
-       acodec: acodec-ana@20030000 {
-               compatible = "rk3036-codec";
+       acodec: audio-codec@20030000 {
+               compatible = "rockchip,rk3036-codec";
                reg = <0x20030000 0x4000>;
-               rockchip,grf = <&grf>;
                clock-names = "acodec_pclk";
                clocks = <&cru PCLK_ACODEC>;
+               rockchip,grf = <&grf>;
+               #sound-dai-cells = <0>;
                status = "disabled";
        };