public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
* [PATCHv2] Follow-up patch rk3566-roc-pc audio nodes
@ 2023-01-10 18:40 Furkan Kardame
  2023-01-10 22:51 ` Heiko Stübner
  0 siblings, 1 reply; 2+ messages in thread
From: Furkan Kardame @ 2023-01-10 18:40 UTC (permalink / raw)
  To: pgwipeout; +Cc: heiko, linux-rockchip, linux-arm-kernel, 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>
---
 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";
 };
-- 
2.39.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCHv2] Follow-up patch rk3566-roc-pc audio nodes
  2023-01-10 18:40 [PATCHv2] Follow-up patch rk3566-roc-pc audio nodes Furkan Kardame
@ 2023-01-10 22:51 ` Heiko Stübner
  0 siblings, 0 replies; 2+ messages in thread
From: Heiko Stübner @ 2023-01-10 22:51 UTC (permalink / raw)
  To: pgwipeout, Furkan Kardame
  Cc: linux-rockchip, linux-arm-kernel, Furkan Kardame

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";
>  };
> 





_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-01-10 22:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-10 18:40 [PATCHv2] Follow-up patch rk3566-roc-pc audio nodes Furkan Kardame
2023-01-10 22:51 ` Heiko Stübner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox