| Message ID | 20200426161605.52121-1-samuel@sholland.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 29ee412bb7090023a8dba15726d9be2f4f2644a4 |
| Headers | show |
| Series | [v2] arm64: dts: allwinner: a64: Remove unused SPDIF sound card | expand |
Hi, On Sun, 26 Apr 2020 at 18:12, Samuel Holland <samuel@sholland.org> wrote: > > 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. CC: Marcus Cooper <codekipper@gmail.com> Without any value : Acked-by: Clément Péron <peron.clem@gmail.com> Regards, Clement > > This reverts commit 78e071370a86473f25923e03b51cbbadacf8be0f. > > Signed-off-by: Samuel Holland <samuel@sholland.org> > --- > > Changes since v1: > - Remove the node instead of disabling it > - Also remove the codec DAI > > --- > arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 18 ------------------ > 1 file changed, 18 deletions(-) > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > index 31143fe64d91..c26cc1fcaffd 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > @@ -154,24 +154,6 @@ link_codec: simple-audio-card,codec { > }; > }; > > - 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; > -- > 2.24.1 > > -- > You received this message because you are subscribed to the Google Groups "linux-sunxi" group. > To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com. > To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20200426161605.52121-1-samuel%40sholland.org.
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 31143fe64d91..c26cc1fcaffd 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -154,24 +154,6 @@ link_codec: simple-audio-card,codec { }; }; - 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;
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. Signed-off-by: Samuel Holland <samuel@sholland.org> --- Changes since v1: - Remove the node instead of disabling it - Also remove the codec DAI --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 18 ------------------ 1 file changed, 18 deletions(-)