Skip to contentSkip to conversation

arm64: dts: rockchip: rk3328-roc-cc: Misc improvements

PATCH Applied Chen-Yu Tsai 2 participants 5 messages Nov 26, 2020 – Nov 30, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover arm64: dts: rockchip: rk3328-roc-cc: Misc improvements

From: Chen-Yu Tsai <[email protected]>

Hi,

Here are some improvements for the ROC-RK3328-CC.

Patch 1 sets dr_mode to "host" for OTG. Since the board has a type A host port wired to the OTG controller, setting this is appropriate.

Patch 2 enables HDMI audio.

Patch 3 enables analog audio.

I opted to use one simple-card for each audio interface since a) the definitions are already in the .dtsi file and b) having one card per interface with proper names makes them easier to identify.

The changes are quite trivial. Hope they can be merged for the next release.

Regards
ChenYu

Chen-Yu Tsai (3):
arm64: dts: rockchip: rk3328-roc-cc: Set dr_mode to "host" for OTG
arm64: dts: rockchip: rk3328-roc-cc: Enable HDMI audio
arm64: dts: rockchip: rk3328-roc-cc: Enable analog audio

 .../arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
Signature · 7 lines
2.29.2


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#1 lore raw

PATCH 1/3 arm64: dts: rockchip: rk3328-roc-cc: Set dr_mode to "host" for OTG

From: Chen-Yu Tsai <[email protected]>

The board has a standard USB A female port connected to the USB OTG controller's data pins. Set dr_mode in the OTG controller node to indicate this usage, instead of having the implementation guess.

Fixes 2171f4fdac06 ("arm64: dts: rockchip: add roc-rk3328-cc board")
---
 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +1 -0
index b70ffb1c6a63..b76282e704de 100644
@@ -334,6 +334,7 @@ &uart2 {
 };
 
 &usb20_otg {
+	dr_mode = "host";
 	status = "okay";
 };
 
Signature · 1 line
2.29.2
#2 lore raw

PATCH 2/3 arm64: dts: rockchip: rk3328-roc-cc: Enable HDMI audio

In reply to Chen-Yu Tsai

From: Chen-Yu Tsai <[email protected]>

The RK3328-ROC-CC already has HDMI display output enabled. Now that audio for the HDMI controller is supported, it can be enabled as well.

Enable the simple-audio-card, and the I2S interface the audio is fed from.

---
 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +8 -0
index b76282e704de..697fce709031 100644
@@ -161,6 +161,10 @@ &hdmiphy {
 	status = "okay";
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
 &i2c1 {
 	status = "okay";
 
@@ -270,6 +274,10 @@ regulator-state-mem {
 	};
 };
 
+&i2s0 {
+	status = "okay";
+};
+
 &io_domains {
 	status = "okay";
 
Signature · 1 line
2.29.2
#3 lore raw

PATCH 3/3 arm64: dts: rockchip: rk3328-roc-cc: Enable analog audio

In reply to Chen-Yu Tsai

From: Chen-Yu Tsai <[email protected]>

Now that driver support for the RK3328's audio codec, and the plumbing is defined at the SoC level, we can enable analog audio at the board level.

Enable analog audio by enabling the codec and the I2S interface connected and the simple-audio-card that binds them together.

---
 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +12 -0
index 697fce709031..19959bfba451 100644
@@ -104,6 +104,14 @@ user_led: led-1 {
 	};
 };
 
+&analog_sound {
+	status = "okay";
+};
+
+&codec {
+	status = "okay";
+};
+
 &cpu0 {
 	cpu-supply = <&vdd_arm>;
 };
@@ -278,6 +286,10 @@ &i2s0 {
 	status = "okay";
 };
 
+&i2s1 {
+	status = "okay";
+};
+
 &io_domains {
 	status = "okay";
 
Signature · 1 line
2.29.2
maintainer Applied
#4 lore raw
In reply to Chen-Yu Tsai
Quoted 8 lines · Chen-Yu Tsai

Here are some improvements for the ROC-RK3328-CC.

Patch 1 sets dr_mode to "host" for OTG. Since the board has a type A host port wired to the OTG controller, setting this is appropriate.

Patch 2 enables HDMI audio.

[...]

Applied, thanks!

[1/3] arm64: dts: rockchip: rk3328-roc-cc: Set dr_mode to "host" for OTG

      commit: 4076a007bd0f6171434bdb119a0b8797749b0502
[2/3] arm64: dts: rockchip: rk3328-roc-cc: Enable HDMI audio
      commit: 65f0b420dea7e70d70cd6ef0f12f9ff81ab90d23
[3/3] arm64: dts: rockchip: rk3328-roc-cc: Enable analog audio
      commit: 5df4d4d16ce4c6e6a5cb9d4b684b187f28258219

Best regards,

Signature · 6 lines
Heiko Stuebner <[email protected]>

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip