| Message ID | 20220114121515.1.I46f64b00508d9dff34abe1c3e8d2defdab4ea1e5@changeid |
|---|---|
| State | New |
| Headers | show |
| Series | (Re)enable DP/HDMI audio for RK3399 Gru | expand |
Sorry to send a self-reply so quickly, but I noticed an error and want to make sure this doesn't get merged _too_ quickly before I get to send a revision! See below: On Fri, Jan 14, 2022 at 12:17 PM Brian Norris <briannorris@chromium.org> wrote: > > Commit b18c6c3c7768 ("ASoC: rockchip: cdn-dp sound output use spdif") > switched the platform to SPDIF, but we didn't fix up the device tree. > > Fixes: b18c6c3c7768 ("ASoC: rockchip: cdn-dp sound output use spdif") > Signed-off-by: Brian Norris <briannorris@chromium.org> > --- > > arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi > index 45a5ae5d2027..21ec073f4d51 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi > +&spdif { > + status = "okay"; I need to fix up the pinctrl settings here. rk3399.dtsi has a default that is incorrect. That's OK for several variants (Kevin and Bob, where the pin is actually unconnected), but it breaks Scarlet (where the pin in question is actually connected to something else). I'll send a v2 after waiting a bit, in case there are other comments worth addressing at the same time. Brian > +};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi index 45a5ae5d2027..21ec073f4d51 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -286,7 +286,7 @@ max98357a: max98357a { sound: sound { compatible = "rockchip,rk3399-gru-sound"; - rockchip,cpu = <&i2s0 &i2s2>; + rockchip,cpu = <&i2s0 &spdif>; }; }; @@ -437,10 +437,6 @@ &i2s0 { status = "okay"; }; -&i2s2 { - status = "okay"; -}; - &io_domains { status = "okay"; @@ -537,6 +533,10 @@ &sdmmc { vqmmc-supply = <&ppvar_sd_card_io>; }; +&spdif { + status = "okay"; +}; + &spi1 { status = "okay";
Commit b18c6c3c7768 ("ASoC: rockchip: cdn-dp sound output use spdif") switched the platform to SPDIF, but we didn't fix up the device tree. Fixes: b18c6c3c7768 ("ASoC: rockchip: cdn-dp sound output use spdif") Signed-off-by: Brian Norris <briannorris@chromium.org> --- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)