From: Frank Wunderlich <[email protected]>
This Series adds changes to Device tree for Bananapi-R2-Pro to support
HDMI output.
It is based on "drm/rockchip: RK356x VOP2 support"
v10:
https://patchwork.kernel.org/project/linux-rockchip/list/?series=630407
Frank Wunderlich (3):
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 the gpu on BPI-R2-Pro
.../boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 57 +++++++++++++++++++
1 file changed, 57 insertions(+)
--
2.25.1
From: Frank Wunderlich <[email protected]>
Set display related regulators to always-on on Banana PI R2 Pro
board.
Signed-off-by: Frank Wunderlich <[email protected]>
---
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 2700fb18a3bc..0950f9659bb4 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
@@ -225,6 +225,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>;
@@ -274,6 +275,7 @@ regulator-state-mem {
vdda0v9_image: LDO_REG1 {
regulator-name = "vdda0v9_image";
+ regulator-always-on;
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <900000>;
@@ -369,6 +371,7 @@ regulator-state-mem {
vcca1v8_image: LDO_REG9 {
regulator-name = "vcca1v8_image";
+ regulator-always-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
--
2.25.1
From: Frank Wunderlich <[email protected]>
Enable the GPU core on the Rockchip RK3568 BananaPi R2 Pro
Signed-off-by: Frank Wunderlich <[email protected]>
---
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 7 +++++++
1 file changed, 7 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 cc3591251bab..10f68d054f76 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
@@ -196,6 +196,11 @@ &gmac1m1_rgmii_clk
status = "okay";
};
+&gpu {
+ mali-supply = <&vdd_gpu>;
+ status = "okay";
+};
+
&hdmi {
avdd-0v9-supply = <&vdda0v9_image>;
avdd-1v8-supply = <&vcca1v8_image>;
@@ -566,6 +571,8 @@ &spi3 {
};
&tsadc {
+ rockchip,hw-tshut-mode = <1>;
+ rockchip,hw-tshut-polarity = <0>;
status = "okay";
};
--
2.25.1
Am Freitag, 15. April 2022, 12:49:51 CEST schrieb Frank Wunderlich:
> From: Frank Wunderlich <[email protected]>
>
> Enable the GPU core on the Rockchip RK3568 BananaPi R2 Pro
>
> Signed-off-by: Frank Wunderlich <[email protected]>
> ---
> arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 7 +++++++
> 1 file changed, 7 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 cc3591251bab..10f68d054f76 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
> @@ -196,6 +196,11 @@ &gmac1m1_rgmii_clk
> status = "okay";
> };
>
> +&gpu {
> + mali-supply = <&vdd_gpu>;
> + status = "okay";
> +};
> +
> &hdmi {
> avdd-0v9-supply = <&vdda0v9_image>;
> avdd-1v8-supply = <&vcca1v8_image>;
> @@ -566,6 +571,8 @@ &spi3 {
> };
>
> &tsadc {
> + rockchip,hw-tshut-mode = <1>;
> + rockchip,hw-tshut-polarity = <0>;
This is not gpu-specific, so if needed should be a separate patch.
> status = "okay";
> };
>
>
Am Freitag, 15. April 2022, 12:49:49 CEST schrieb Frank Wunderlich:
> From: Frank Wunderlich <[email protected]>
>
> Set display related regulators to always-on on Banana PI R2 Pro
> board.
Hmm, I'd expect some sort of explanation for the "why" here.
It looks like both the gpu patch as well as the vop patch do
reference the relevant regulators for the gpu+hdmi nodes,
so in theory this shouldn't be necessary anymore?
>
> Signed-off-by: Frank Wunderlich <[email protected]>
> ---
> 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 2700fb18a3bc..0950f9659bb4 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
> @@ -225,6 +225,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>;
> @@ -274,6 +275,7 @@ regulator-state-mem {
>
> vdda0v9_image: LDO_REG1 {
> regulator-name = "vdda0v9_image";
> + regulator-always-on;
> regulator-min-microvolt = <900000>;
> regulator-max-microvolt = <900000>;
>
> @@ -369,6 +371,7 @@ regulator-state-mem {
>
> vcca1v8_image: LDO_REG9 {
> regulator-name = "vcca1v8_image";
> + regulator-always-on;
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
>
>
On Tue, May 17, 2022 at 2:47 PM Heiko Stuebner <[email protected]> wrote:
>
> Am Freitag, 15. April 2022, 12:49:49 CEST schrieb Frank Wunderlich:
> > From: Frank Wunderlich <[email protected]>
> >
> > Set display related regulators to always-on on Banana PI R2 Pro
> > board.
>
> Hmm, I'd expect some sort of explanation for the "why" here.
> It looks like both the gpu patch as well as the vop patch do
> reference the relevant regulators for the gpu+hdmi nodes,
> so in theory this shouldn't be necessary anymore?
I agree the hdmi power nodes don't need to be always on, if the hdmi
driver is handling them correctly. Unfortunately 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 like the one
mentioned in Lee's email, and issues where the gpu-regulator gets shut
down and we start getting mmu faults.
>
> >
> > Signed-off-by: Frank Wunderlich <[email protected]>
> > ---
> > 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 2700fb18a3bc..0950f9659bb4 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
> > +++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
> > @@ -225,6 +225,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>;
> > @@ -274,6 +275,7 @@ regulator-state-mem {
> >
> > vdda0v9_image: LDO_REG1 {
> > regulator-name = "vdda0v9_image";
> > + regulator-always-on;
> > regulator-min-microvolt = <900000>;
> > regulator-max-microvolt = <900000>;
> >
> > @@ -369,6 +371,7 @@ regulator-state-mem {
> >
> > vcca1v8_image: LDO_REG9 {
> > regulator-name = "vcca1v8_image";
> > + regulator-always-on;
> > regulator-min-microvolt = <1800000>;
> > regulator-max-microvolt = <1800000>;
> >
> >
>
>
>
>