| From b5fbaf7d779f5f02b7f75b080e7707222573be2a Mon Sep 17 00:00:00 2001 |
| From: Brian Norris <briannorris@chromium.org> |
| Date: Fri, 14 Jan 2022 15:02:07 -0800 |
| Subject: arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output |
| |
| From: Brian Norris <briannorris@chromium.org> |
| |
| commit b5fbaf7d779f5f02b7f75b080e7707222573be2a upstream. |
| |
| 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> |
| Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> |
| Link: https://lore.kernel.org/r/20220114150129.v2.1.I46f64b00508d9dff34abe1c3e8d2defdab4ea1e5@changeid |
| Signed-off-by: Heiko Stuebner <heiko@sntech.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 17 ++++++++++++----- |
| 1 file changed, 12 insertions(+), 5 deletions(-) |
| |
| --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi |
| +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi |
| @@ -281,7 +281,7 @@ |
| |
| sound: sound { |
| compatible = "rockchip,rk3399-gru-sound"; |
| - rockchip,cpu = <&i2s0 &i2s2>; |
| + rockchip,cpu = <&i2s0 &spdif>; |
| }; |
| }; |
| |
| @@ -432,10 +432,6 @@ ap_i2c_audio: &i2c8 { |
| status = "okay"; |
| }; |
| |
| -&i2s2 { |
| - status = "okay"; |
| -}; |
| - |
| &io_domains { |
| status = "okay"; |
| |
| @@ -532,6 +528,17 @@ ap_i2c_audio: &i2c8 { |
| 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"; |
| |