arm64: dts: allwinner: a64: Remove unused SPDIF sound card
authorSamuel Holland <samuel@sholland.org>
Sun, 26 Apr 2020 16:16:05 +0000 (11:16 -0500)
committerMaxime Ripard <maxime@cerno.tech>
Mon, 4 May 2020 11:44:57 +0000 (13:44 +0200)
As of v5.7-rc2, Linux now prints the following message at boot:

  [   33.848525] platform sound_spdif: deferred probe pending

This is because sound_spdif is waiting on its CPU DAI &spdif to probe,
but &spdif is disabled in the device tree.

Exposure of the SPDIF pin is board-specific functionality, so the sound
card and codec DAI belong in the individual board DTS, not the SoC DTSI.
In fact, no in-tree A64 board DTS enables &spdif, so let's remove the
card and DAI entirely.

This reverts commit 78e071370a86473f25923e03b51cbbadacf8be0f.

Acked-by: Clément Péron <peron.clem@gmail.com>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi

index 31143fe..c26cc1f 100644 (file)
                };
        };
 
-       sound_spdif {
-               compatible = "simple-audio-card";
-               simple-audio-card,name = "On-board SPDIF";
-
-               simple-audio-card,cpu {
-                       sound-dai = <&spdif>;
-               };
-
-               simple-audio-card,codec {
-                       sound-dai = <&spdif_out>;
-               };
-       };
-
-       spdif_out: spdif-out {
-               #sound-dai-cells = <0>;
-               compatible = "linux,spdif-dit";
-       };
-
        timer {
                compatible = "arm,armv8-timer";
                allwinner,erratum-unknown1;