lkml.org 
[lkml]   [2022]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 39/51] arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output
    Date
    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
    @@ -287,7 +287,7 @@

    sound: sound {
    compatible = "rockchip,rk3399-gru-sound";
    - rockchip,cpu = <&i2s0 &i2s2>;
    + rockchip,cpu = <&i2s0 &spdif>;
    };
    };

    @@ -438,10 +438,6 @@ ap_i2c_audio: &i2c8 {
    status = "okay";
    };

    -&i2s2 {
    - status = "okay";
    -};
    -
    &io_domains {
    status = "okay";

    @@ -538,6 +534,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";


    \
     
     \ /
      Last update: 2022-03-07 10:30    [W:11.454 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site