| Message ID | 20220114150129.v2.1.I46f64b00508d9dff34abe1c3e8d2defdab4ea1e5@changeid |
|---|---|
| State | Accepted |
| Commit | b5fbaf7d779f5f02b7f75b080e7707222573be2a |
| Headers | show |
| Series | [v2,1/3] arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output | expand |
On Sat, Jan 15, 2022 at 7:03 AM 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. > > Drop the pinctrl settings, because the 'spdif_bus' pins are either: > * unused (on kevin, bob), so the settings is ~harmless > * used by a different function (on scarlet), which causes probe > failures (!!) I suppose that means the default pinctrl should be dropped? Or maybe this use case is the outlier. Up to Heiko? > Fixes: b18c6c3c7768 ("ASoC: rockchip: cdn-dp sound output use spdif") > Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Am Montag, 17. Januar 2022, 08:44:37 CET schrieb Chen-Yu Tsai: > On Sat, Jan 15, 2022 at 7:03 AM 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. > > > > Drop the pinctrl settings, because the 'spdif_bus' pins are either: > > * unused (on kevin, bob), so the settings is ~harmless > > * used by a different function (on scarlet), which causes probe > > failures (!!) > > I suppose that means the default pinctrl should be dropped? Or maybe this > use case is the outlier. Up to Heiko? Interesting question. Right now it looks like Gru is the only one using spdif in that way, so I'd think dropping the pinctrl here is the "saner" option at this time ;-) I guess we can reevaluate if this becomes more widespread > > Fixes: b18c6c3c7768 ("ASoC: rockchip: cdn-dp sound output use spdif") > > Signed-off-by: Brian Norris <briannorris@chromium.org> > > Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> >
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi index 45a5ae5d2027..162f08bca0d4 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,17 @@ &sdmmc { vqmmc-supply = <&ppvar_sd_card_io>; }; +&spdif { + status = "okay"; + + /* + * SPDIF is routed internally to DP; we either don't use these pins, or + * mux them to something else. + */ + /delete-property/ pinctrl-0; + /delete-property/ pinctrl-names; +}; + &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. Drop the pinctrl settings, because the 'spdif_bus' pins are either: * unused (on kevin, bob), so the settings is ~harmless * used by a different function (on scarlet), which causes probe failures (!!) Fixes: b18c6c3c7768 ("ASoC: rockchip: cdn-dp sound output use spdif") Signed-off-by: Brian Norris <briannorris@chromium.org> --- Changes in v2: - (Un)set pinctrl, because the default assumes we're routing out to external pins arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)