1 From 6c5efcf09c40d37f72692fdbdf6d461abede20f1 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Mon, 3 Feb 2020 17:03:29 +0000
4 Subject: [PATCH] ARM: dts: Move audio node under the vchiq parent
6 VCHIQ kernel clients are now instantiated as platform drivers rather
7 than using DT, but the children of the vchiq device can optionally be
8 given a sub-node of the vchiq parent for configuration and to disable
11 Move the existing audio node beneath the vchiq parent, to prevent
12 multiple instantiation and unpleasant warnings. Note that the node
13 name has to match the module name - "bcm2835_audio".
15 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
17 arch/arm/boot/dts/bcm270x-rpi.dtsi | 16 +++++++++-------
18 arch/arm/boot/dts/bcm2711-rpi.dtsi | 14 ++++++++++++++
19 2 files changed, 23 insertions(+), 7 deletions(-)
21 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
22 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
29 - compatible = "brcm,bcm2835-audio";
30 - brcm,pwm-channels = <8>;
31 - status = "disabled";
34 /* External sound card */
44 + audio: bcm2835_audio {
45 + compatible = "brcm,bcm2835-audio";
46 + brcm,pwm-channels = <8>;
47 + status = "disabled";
50 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
51 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
53 compatible = "brcm,bcm2835-vc4";
57 + /delete-node/ audio;
67 + * This node is replicated because the original from bcm270x-rpi.dtsi
68 + * was deleted when the vchiq node was deleted above.
70 + audio: bcm2835_audio {
71 + compatible = "brcm,bcm2835-audio";
72 + brcm,pwm-channels = <8>;
73 + status = "disabled";
78 /* The VPU firmware uses DMA channel 11 for VCHIQ */
79 brcm,dma-channel-mask = <0x1f5>;