diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2021-03-03 17:05:29 +0300 |
|---|---|---|
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | 2021-03-10 12:59:11 +0300 |
| commit | b1158c5e14b30396bb92f63a7a26ad7b85e70c06 (patch) | |
| tree | fbcdae8ad9dc3075e8acf6e11400f03b366dd7fa /arch/arm64/boot/dts/renesas/salvator-common.dtsi | |
| parent | d765a4f302cc046ca23453ba990d21120ceadbbd (diff) | |
| download | linux-b1158c5e14b30396bb92f63a7a26ad7b85e70c06.tar.xz | |
arm64: dts: renesas: Consolidate Salvator-X(S) HDMI0 handling
Now all Salvator-X(S) SoC/board combinations have support for HDMI
sound, all HDMI0 connector and sound descriptions are identical.
Replace them by shared descriptions in salvator-common.dtsi, to reduce
duplication.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20210303140529.3941670-1-geert+renesas@glider.be
Diffstat (limited to 'arch/arm64/boot/dts/renesas/salvator-common.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/renesas/salvator-common.dtsi | 39 |
1 files changed, 38 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi index c02a167f2ee4..810497c746d7 100644 --- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi +++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi @@ -201,7 +201,8 @@ label = "rcar-sound"; - dais = <&rsnd_port0>; + dais = <&rsnd_port0 /* ak4613 */ + &rsnd_port1>; /* HDMI0 */ }; vbus0_usb2: regulator-vbus0-usb2 { @@ -397,6 +398,29 @@ clock-frequency = <32768>; }; +&hdmi0 { + status = "okay"; + + ports { + port@1 { + reg = <1>; + rcar_dw_hdmi0_out: endpoint { + remote-endpoint = <&hdmi0_con>; + }; + }; + port@2 { + reg = <2>; + dw_hdmi0_snd_in: endpoint { + remote-endpoint = <&rsnd_endpoint1>; + }; + }; + }; +}; + +&hdmi0_con { + remote-endpoint = <&rcar_dw_hdmi0_out>; +}; + &hscif1 { pinctrl-0 = <&hscif1_pins>; pinctrl-names = "default"; @@ -780,6 +804,19 @@ capture = <&ssi1>, <&src1>, <&dvc1>; }; }; + + rsnd_port1: port@1 { + reg = <1>; + rsnd_endpoint1: endpoint { + remote-endpoint = <&dw_hdmi0_snd_in>; + + dai-format = "i2s"; + bitclock-master = <&rsnd_endpoint1>; + frame-master = <&rsnd_endpoint1>; + + playback = <&ssi2>; + }; + }; }; }; |