* [PATCH v2 1/5] arm64: dts: rockchip: set display regulators to always-on on BPI-R2-Pro
2022-06-06 17:07 [PATCH v2 0/5] Add hdmi Support for BPI-R2-Pro Frank Wunderlich
@ 2022-06-06 17:07 ` Frank Wunderlich
2022-06-06 17:08 ` [PATCH v2 2/5] arm64: dts: rockchip: enable vop2 and hdmi tx " Frank Wunderlich
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Frank Wunderlich @ 2022-06-06 17:07 UTC (permalink / raw)
To: linux-rockchip; +Cc: Frank Wunderlich, Heiko Stuebner
From: Frank Wunderlich <frank-w@public-files.de>
The gpu power supply needs to stay always on until the issues with power-
domains not being regulator aware is resolved. Otherwise we run into
issues where the gpu-regulator gets shut down and we start getting mmu
faults.
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
---
v2: Add description why always-on is required
---
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
index 7e5b3947e28f..5bb49bc2630f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
@@ -215,6 +215,7 @@ regulator-state-mem {
vdd_gpu: DCDC_REG2 {
regulator-name = "vdd_gpu";
+ regulator-always-on;
regulator-init-microvolt = <900000>;
regulator-initial-mode = <0x2>;
regulator-min-microvolt = <500000>;
@@ -264,6 +265,7 @@ regulator-state-mem {
vdda0v9_image: LDO_REG1 {
regulator-name = "vdda0v9_image";
+ regulator-always-on;
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <900000>;
@@ -359,6 +361,7 @@ regulator-state-mem {
vcca1v8_image: LDO_REG9 {
regulator-name = "vcca1v8_image";
+ regulator-always-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
--
2.34.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 2/5] arm64: dts: rockchip: enable vop2 and hdmi tx on BPI-R2-Pro
2022-06-06 17:07 [PATCH v2 0/5] Add hdmi Support for BPI-R2-Pro Frank Wunderlich
2022-06-06 17:07 ` [PATCH v2 1/5] arm64: dts: rockchip: set display regulators to always-on on BPI-R2-Pro Frank Wunderlich
@ 2022-06-06 17:08 ` Frank Wunderlich
2022-06-06 17:08 ` [PATCH v2 3/5] arm64: dts: rockchip: Enable HDMI audio on BPI R2 Pro Frank Wunderlich
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Frank Wunderlich @ 2022-06-06 17:08 UTC (permalink / raw)
To: linux-rockchip; +Cc: Frank Wunderlich, Heiko Stuebner
From: Frank Wunderlich <frank-w@public-files.de>
Enable the RK356x Video Output Processor (VOP) 2 on the
BananaPi R2 Pro board.
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
---
.../boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 47 +++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
index 5bb49bc2630f..eeaf02461f9b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
@@ -8,6 +8,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/soc/rockchip,vop2.h>
#include "rk3568.dtsi"
/ {
@@ -54,6 +55,17 @@ dc_12v: dc-12v {
regulator-max-microvolt = <12000000>;
};
+ hdmi-con {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_con_in: endpoint {
+ remote-endpoint = <&hdmi_out_con>;
+ };
+ };
+ };
+
vcc3v3_sys: vcc3v3-sys {
compatible = "regulator-fixed";
regulator-name = "vcc3v3_sys";
@@ -174,6 +186,24 @@ &gmac1m1_rgmii_clk
status = "okay";
};
+&hdmi {
+ avdd-0v9-supply = <&vdda0v9_image>;
+ avdd-1v8-supply = <&vcca1v8_image>;
+ status = "okay";
+};
+
+&hdmi_in {
+ hdmi_in_vp0: endpoint {
+ remote-endpoint = <&vp0_out_hdmi>;
+ };
+};
+
+&hdmi_out {
+ hdmi_out_con: endpoint {
+ remote-endpoint = <&hdmi_con_in>;
+ };
+};
+
&i2c0 {
status = "okay";
@@ -613,3 +643,20 @@ &usb2phy0_otg {
phy-supply = <&vcc5v0_usb_otg>;
status = "okay";
};
+
+&vop {
+ assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
+ assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
+ status = "okay";
+};
+
+&vop_mmu {
+ status = "okay";
+};
+
+&vp0 {
+ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
+ reg = <ROCKCHIP_VOP2_EP_HDMI0>;
+ remote-endpoint = <&hdmi_in_vp0>;
+ };
+};
--
2.34.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 3/5] arm64: dts: rockchip: Enable HDMI audio on BPI R2 Pro
2022-06-06 17:07 [PATCH v2 0/5] Add hdmi Support for BPI-R2-Pro Frank Wunderlich
2022-06-06 17:07 ` [PATCH v2 1/5] arm64: dts: rockchip: set display regulators to always-on on BPI-R2-Pro Frank Wunderlich
2022-06-06 17:08 ` [PATCH v2 2/5] arm64: dts: rockchip: enable vop2 and hdmi tx " Frank Wunderlich
@ 2022-06-06 17:08 ` Frank Wunderlich
2022-06-06 17:08 ` [PATCH v2 4/5] arm64: dts: rockchip: configure thermal shutdown for BPI-R2-Pro Frank Wunderlich
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Frank Wunderlich @ 2022-06-06 17:08 UTC (permalink / raw)
To: linux-rockchip; +Cc: Frank Wunderlich, Heiko Stuebner
From: Frank Wunderlich <frank-w@public-files.de>
This enables the i2s0 controller and the hdmi-sound node on
the Bananapi R2 Pro single-board computer.
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
---
this needs this patch/series (now yet applied in 5.19-rc1):
https://patchwork.kernel.org/project/linux-rockchip/patch/20211126122718.631506-2-frattaroli.nicolas@gmail.com/
---
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
index eeaf02461f9b..57ddb7608976 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
@@ -204,6 +204,10 @@ hdmi_out_con: endpoint {
};
};
+&hdmi_sound {
+ status = "okay";
+};
+
&i2c0 {
status = "okay";
@@ -444,6 +448,11 @@ &i2c5 {
status = "disabled";
};
+&i2s0_8ch {
+ /* hdmi sound */
+ status = "okay";
+};
+
&mdio1 {
rgmii_phy1: ethernet-phy@0 {
compatible = "ethernet-phy-ieee802.3-c22";
--
2.34.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 4/5] arm64: dts: rockchip: configure thermal shutdown for BPI-R2-Pro
2022-06-06 17:07 [PATCH v2 0/5] Add hdmi Support for BPI-R2-Pro Frank Wunderlich
` (2 preceding siblings ...)
2022-06-06 17:08 ` [PATCH v2 3/5] arm64: dts: rockchip: Enable HDMI audio on BPI R2 Pro Frank Wunderlich
@ 2022-06-06 17:08 ` Frank Wunderlich
2022-06-06 17:08 ` [PATCH v2 5/5] arm64: dts: rockchip: enable the gpu on BPI-R2-Pro Frank Wunderlich
2022-06-11 16:35 ` [PATCH v2 0/5] Add hdmi Support for BPI-R2-Pro Heiko Stuebner
5 siblings, 0 replies; 7+ messages in thread
From: Frank Wunderlich @ 2022-06-06 17:08 UTC (permalink / raw)
To: linux-rockchip; +Cc: Frank Wunderlich, Heiko Stuebner
From: Frank Wunderlich <frank-w@public-files.de>
Add thermal shutdown configuration for use of GPU.
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
---
v2: new Patch as heiko suggested splitting it from gpu dts patch
---
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
index 57ddb7608976..75ddca1561e0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
@@ -588,6 +588,8 @@ &spi3 {
};
&tsadc {
+ rockchip,hw-tshut-mode = <1>;
+ rockchip,hw-tshut-polarity = <0>;
status = "okay";
};
--
2.34.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 5/5] arm64: dts: rockchip: enable the gpu on BPI-R2-Pro
2022-06-06 17:07 [PATCH v2 0/5] Add hdmi Support for BPI-R2-Pro Frank Wunderlich
` (3 preceding siblings ...)
2022-06-06 17:08 ` [PATCH v2 4/5] arm64: dts: rockchip: configure thermal shutdown for BPI-R2-Pro Frank Wunderlich
@ 2022-06-06 17:08 ` Frank Wunderlich
2022-06-11 16:35 ` [PATCH v2 0/5] Add hdmi Support for BPI-R2-Pro Heiko Stuebner
5 siblings, 0 replies; 7+ messages in thread
From: Frank Wunderlich @ 2022-06-06 17:08 UTC (permalink / raw)
To: linux-rockchip; +Cc: Frank Wunderlich, Heiko Stuebner
From: Frank Wunderlich <frank-w@public-files.de>
Enable the GPU core on the Rockchip RK3568 BananaPi R2 Pro
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
---
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
index 75ddca1561e0..77cf6b435007 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
@@ -186,6 +186,11 @@ &gmac1m1_rgmii_clk
status = "okay";
};
+&gpu {
+ mali-supply = <&vdd_gpu>;
+ status = "okay";
+};
+
&hdmi {
avdd-0v9-supply = <&vdda0v9_image>;
avdd-1v8-supply = <&vcca1v8_image>;
--
2.34.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 0/5] Add hdmi Support for BPI-R2-Pro
2022-06-06 17:07 [PATCH v2 0/5] Add hdmi Support for BPI-R2-Pro Frank Wunderlich
` (4 preceding siblings ...)
2022-06-06 17:08 ` [PATCH v2 5/5] arm64: dts: rockchip: enable the gpu on BPI-R2-Pro Frank Wunderlich
@ 2022-06-11 16:35 ` Heiko Stuebner
5 siblings, 0 replies; 7+ messages in thread
From: Heiko Stuebner @ 2022-06-11 16:35 UTC (permalink / raw)
To: Frank Wunderlich, linux-rockchip; +Cc: Heiko Stuebner, Frank Wunderlich
On Mon, 6 Jun 2022 19:07:58 +0200, Frank Wunderlich wrote:
> This Series adds changes to device tree for Bananapi-R2-Pro to support
> HDMI output.
>
> v2:
> - explain why always-on regulators currently needed
> - splitted gpu patch to have thermal shutdown config in separate patch
> - added hdmi audio patch
> - needs this patch/series before:
> https://patchwork.kernel.org/project/linux-rockchip/patch/20211125100836.423808-2-frattaroli.nicolas@gmail.com/
> Frank Wunderlich (5):
> arm64: dts: rockchip: set display regulators to always-on on
> BPI-R2-Pro
> arm64: dts: rockchip: enable vop2 and hdmi tx on BPI-R2-Pro
> arm64: dts: rockchip: Enable HDMI audio on BPI R2 Pro
> arm64: dts: rockchip: configure thermal shutdown for BPI-R2-Pro
> arm64: dts: rockchip: enable the gpu on BPI-R2-Pro
>
> [...]
Applied, thanks!
[1/5] arm64: dts: rockchip: set display regulators to always-on on BPI-R2-Pro
commit: 2cda380102ff195b6f206660344bf59e47b72e3d
[2/5] arm64: dts: rockchip: enable vop2 and hdmi tx on BPI-R2-Pro
commit: adecf85c9a853adc89c65c799a11a4a3dc1e4a22
[3/5] arm64: dts: rockchip: Enable HDMI audio on BPI R2 Pro
commit: f48387c005fa91487cad072bd047b929edfb7947
[4/5] arm64: dts: rockchip: configure thermal shutdown for BPI-R2-Pro
commit: 870b4dada9a10d93d7904ec9bb32169acdee3eaa
[5/5] arm64: dts: rockchip: enable the gpu on BPI-R2-Pro
commit: 1526c3a09ecc3e3fc08495fe4a7ff82167354ca2
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 7+ messages in thread