diff mbox series

[PATCHv2] Follow-up patch rk3566-roc-pc audio nodes

Message ID 20230110184008.21492-1-f.kardame@manjaro.org (mailing list archive)
State New, archived
Headers show
Series [PATCHv2] Follow-up patch rk3566-roc-pc audio nodes | expand

Commit Message

Furkan Kardame Jan. 10, 2023, 6:40 p.m. UTC
Enabled hdmi_sound
i2s1_8ch only uses a single channel
i2s1m0_sdo{1,2,3} and i2s1m0_sdi{1,2,3} is used by pcie

Signed-off-by: Furkan Kardame <f.kardame@manjaro.org>
---
 arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Heiko Stuebner Jan. 10, 2023, 10:51 p.m. UTC | #1
Hi Furkan,

Am Dienstag, 10. Januar 2023, 19:40:08 CET schrieb Furkan Kardame:
> Enabled hdmi_sound
> i2s1_8ch only uses a single channel
> i2s1m0_sdo{1,2,3} and i2s1m0_sdi{1,2,3} is used by pcie
> 
> Signed-off-by: Furkan Kardame <f.kardame@manjaro.org>

so I've folded the changes from this into the original commit because I
applied the other one just today.


But normally I would expect what is called a "follow up commit" to really
be a regular commit with a correct subject etc.

So the following is moot, because I took in the changes, but normally I
would expect 2 commits from the code below:
- arm64: dts: rockchip: enable hdmi-sound on rk3566-roc-pc
- arm64: dts: rockchip: change i2s1-8ch to single-channel on rk3566-roc-pc


Heiko

> ---
>  arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
> index e60643581..42889c590 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
> @@ -216,6 +216,10 @@ hdmi_out_con: endpoint {
>  	};
>  };
>  
> +&hdmi_sound {
> +	status = "okay";
> +};
> +
>  &i2c0 {
>  	status = "okay";
>  
> @@ -481,6 +485,9 @@ &i2s0_8ch {
>  };
>  
>  &i2s1_8ch {
> +	pinctrl-0 = <&i2s1m0_sclktx &i2s1m0_sclkrx
> +			&i2s1m0_lrcktx &i2s1m0_lrckrx
> +			&i2s1m0_sdi0   &i2s1m0_sdo0>;
>  	rockchip,trcm-sync-tx-only;
>  	status = "okay";
>  };
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
index e60643581..42889c590 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
@@ -216,6 +216,10 @@  hdmi_out_con: endpoint {
 	};
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
 &i2c0 {
 	status = "okay";
 
@@ -481,6 +485,9 @@  &i2s0_8ch {
 };
 
 &i2s1_8ch {
+	pinctrl-0 = <&i2s1m0_sclktx &i2s1m0_sclkrx
+			&i2s1m0_lrcktx &i2s1m0_lrckrx
+			&i2s1m0_sdi0   &i2s1m0_sdo0>;
 	rockchip,trcm-sync-tx-only;
 	status = "okay";
 };