diff mbox series

arm64: dts: rockchip: fix fixed-regulator renames on rk3399-gru devices

Message ID 20250116143631.3650469-1-heiko@sntech.de (mailing list archive)
State New
Headers show
Series arm64: dts: rockchip: fix fixed-regulator renames on rk3399-gru devices | expand

Commit Message

Heiko Stübner Jan. 16, 2025, 2:36 p.m. UTC 
rk3399-gru chromebooks have a regulator chains where one named regulator
supplies multiple regulators pp900-usb pp900_pcie that supply
the named peripherals.

The dtsi used somewhat creative structure to describe that in creating
the base node 3 times with different phandles and describing the EC
dependency in a comment.

This didn't register in the recent regulator-node renaming, as the
additional nodes were empty, so adapt the missing node names for now.

Fixes: 5c96e6330197 ("arm64: dts: rockchip: adapt regulator nodenames to preferred form")
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
Hi Vicente,

in theory, this should fix your issue?

While we may want to restructure those regulators in some way,
this below should be the smaller change to include as a fix.


Heiko

 .../dts/rockchip/rk3399-gru-chromebook.dtsi   |  8 +++----
 .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi |  6 ++---
 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi  | 22 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

Comments

Vicente Bergas Jan. 17, 2025, 12:44 a.m. UTC | #1 
On Thu, Jan 16, 2025 at 3:36 PM Heiko Stuebner <heiko@sntech.de> wrote:
>
> rk3399-gru chromebooks have a regulator chains where one named regulator
> supplies multiple regulators pp900-usb pp900_pcie that supply
> the named peripherals.
>
> The dtsi used somewhat creative structure to describe that in creating
> the base node 3 times with different phandles and describing the EC
> dependency in a comment.
>
> This didn't register in the recent regulator-node renaming, as the
> additional nodes were empty, so adapt the missing node names for now.
>
> Fixes: 5c96e6330197 ("arm64: dts: rockchip: adapt regulator nodenames to preferred form")
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
> Hi Vicente,
>
> in theory, this should fix your issue?
>
> While we may want to restructure those regulators in some way,
> this below should be the smaller change to include as a fix.
>
>
> Heiko

Thanks Heiko!

Just now i am testing it on gru-kevin and it works, so:
Tested-by: Vicente Bergas <vicencb@gmail.com>

Regards,
  Vicente.


>  .../dts/rockchip/rk3399-gru-chromebook.dtsi   |  8 +++----
>  .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi |  6 ++---
>  arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi  | 22 +++++++++----------
>  3 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
> index 988e6ca32fac..a9ea4b0daa04 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
> @@ -22,11 +22,11 @@ pp900_ap: regulator-pp900-ap {
>         };
>
>         /* EC turns on w/ pp900_usb_en */
> -       pp900_usb: pp900-ap {
> +       pp900_usb: regulator-pp900-ap {
>         };
>
>         /* EC turns on w/ pp900_pcie_en */
> -       pp900_pcie: pp900-ap {
> +       pp900_pcie: regulator-pp900-ap {
>         };
>
>         pp3000: regulator-pp3000 {
> @@ -126,7 +126,7 @@ pp1800_pcie: regulator-pp1800-pcie {
>         };
>
>         /* Always on; plain and simple */
> -       pp3000_ap: pp3000_emmc: pp3000 {
> +       pp3000_ap: pp3000_emmc: regulator-pp3000 {
>         };
>
>         pp1500_ap_io: regulator-pp1500-ap-io {
> @@ -160,7 +160,7 @@ pp3300_disp: regulator-pp3300-disp {
>         };
>
>         /* EC turns on w/ pp3300_usb_en_l */
> -       pp3300_usb: pp3300 {
> +       pp3300_usb: regulator-pp3300 {
>         };
>
>         /* gpio is shared with pp1800_pcie and pinctrl is set there */
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
> index 19b23b438965..5e068377a0a2 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
> @@ -92,7 +92,7 @@ pp900_s3: regulator-pp900-s3 {
>         };
>
>         /* EC turns on pp1800_s3_en */
> -       pp1800_s3: pp1800 {
> +       pp1800_s3: regulator-pp1800 {
>         };
>
>         /* pp3300 children, sorted by name */
> @@ -109,11 +109,11 @@ pp2800_cam: regulator-pp2800-avdd {
>         };
>
>         /* EC turns on pp3300_s0_en */
> -       pp3300_s0: pp3300 {
> +       pp3300_s0: regulator-pp3300 {
>         };
>
>         /* EC turns on pp3300_s3_en */
> -       pp3300_s3: pp3300 {
> +       pp3300_s3: regulator-pp3300 {
>         };
>
>         /*
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
> index 6d9e60b01225..7eca1da78cff 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
> @@ -189,39 +189,39 @@ ppvar_gpu: ppvar-gpu {
>         };
>
>         /* EC turns on w/ pp900_ddrpll_en */
> -       pp900_ddrpll: pp900-ap {
> +       pp900_ddrpll: regulator-pp900-ap {
>         };
>
>         /* EC turns on w/ pp900_pll_en */
> -       pp900_pll: pp900-ap {
> +       pp900_pll: regulator-pp900-ap {
>         };
>
>         /* EC turns on w/ pp900_pmu_en */
> -       pp900_pmu: pp900-ap {
> +       pp900_pmu: regulator-pp900-ap {
>         };
>
>         /* EC turns on w/ pp1800_s0_en_l */
> -       pp1800_ap_io: pp1800_emmc: pp1800_nfc: pp1800_s0: pp1800 {
> +       pp1800_ap_io: pp1800_emmc: pp1800_nfc: pp1800_s0: regulator-pp1800 {
>         };
>
>         /* EC turns on w/ pp1800_avdd_en_l */
> -       pp1800_avdd: pp1800 {
> +       pp1800_avdd: regulator-pp1800 {
>         };
>
>         /* EC turns on w/ pp1800_lid_en_l */
> -       pp1800_lid: pp1800_mic: pp1800 {
> +       pp1800_lid: pp1800_mic: regulator-pp1800 {
>         };
>
>         /* EC turns on w/ lpddr_pwr_en */
> -       pp1800_lpddr: pp1800 {
> +       pp1800_lpddr: regulator-pp1800 {
>         };
>
>         /* EC turns on w/ pp1800_pmu_en_l */
> -       pp1800_pmu: pp1800 {
> +       pp1800_pmu: regulator-pp1800 {
>         };
>
>         /* EC turns on w/ pp1800_usb_en_l */
> -       pp1800_usb: pp1800 {
> +       pp1800_usb: regulator-pp1800 {
>         };
>
>         pp3000_sd_slot: regulator-pp3000-sd-slot {
> @@ -259,11 +259,11 @@ ppvar_sd_card_io: ppvar-sd-card-io {
>         };
>
>         /* EC turns on w/ pp3300_trackpad_en_l */
> -       pp3300_trackpad: pp3300-trackpad {
> +       pp3300_trackpad: regulator-pp3300-trackpad {
>         };
>
>         /* EC turns on w/ usb_a_en */
> -       pp5000_usb_a_vbus: pp5000 {
> +       pp5000_usb_a_vbus: regulator-pp5000 {
>         };
>
>         ap_rtc_clk: ap-rtc-clk {
> --
> 2.45.2
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
index 988e6ca32fac..a9ea4b0daa04 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
@@ -22,11 +22,11 @@  pp900_ap: regulator-pp900-ap {
 	};
 
 	/* EC turns on w/ pp900_usb_en */
-	pp900_usb: pp900-ap {
+	pp900_usb: regulator-pp900-ap {
 	};
 
 	/* EC turns on w/ pp900_pcie_en */
-	pp900_pcie: pp900-ap {
+	pp900_pcie: regulator-pp900-ap {
 	};
 
 	pp3000: regulator-pp3000 {
@@ -126,7 +126,7 @@  pp1800_pcie: regulator-pp1800-pcie {
 	};
 
 	/* Always on; plain and simple */
-	pp3000_ap: pp3000_emmc: pp3000 {
+	pp3000_ap: pp3000_emmc: regulator-pp3000 {
 	};
 
 	pp1500_ap_io: regulator-pp1500-ap-io {
@@ -160,7 +160,7 @@  pp3300_disp: regulator-pp3300-disp {
 	};
 
 	/* EC turns on w/ pp3300_usb_en_l */
-	pp3300_usb: pp3300 {
+	pp3300_usb: regulator-pp3300 {
 	};
 
 	/* gpio is shared with pp1800_pcie and pinctrl is set there */
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
index 19b23b438965..5e068377a0a2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
@@ -92,7 +92,7 @@  pp900_s3: regulator-pp900-s3 {
 	};
 
 	/* EC turns on pp1800_s3_en */
-	pp1800_s3: pp1800 {
+	pp1800_s3: regulator-pp1800 {
 	};
 
 	/* pp3300 children, sorted by name */
@@ -109,11 +109,11 @@  pp2800_cam: regulator-pp2800-avdd {
 	};
 
 	/* EC turns on pp3300_s0_en */
-	pp3300_s0: pp3300 {
+	pp3300_s0: regulator-pp3300 {
 	};
 
 	/* EC turns on pp3300_s3_en */
-	pp3300_s3: pp3300 {
+	pp3300_s3: regulator-pp3300 {
 	};
 
 	/*
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index 6d9e60b01225..7eca1da78cff 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -189,39 +189,39 @@  ppvar_gpu: ppvar-gpu {
 	};
 
 	/* EC turns on w/ pp900_ddrpll_en */
-	pp900_ddrpll: pp900-ap {
+	pp900_ddrpll: regulator-pp900-ap {
 	};
 
 	/* EC turns on w/ pp900_pll_en */
-	pp900_pll: pp900-ap {
+	pp900_pll: regulator-pp900-ap {
 	};
 
 	/* EC turns on w/ pp900_pmu_en */
-	pp900_pmu: pp900-ap {
+	pp900_pmu: regulator-pp900-ap {
 	};
 
 	/* EC turns on w/ pp1800_s0_en_l */
-	pp1800_ap_io: pp1800_emmc: pp1800_nfc: pp1800_s0: pp1800 {
+	pp1800_ap_io: pp1800_emmc: pp1800_nfc: pp1800_s0: regulator-pp1800 {
 	};
 
 	/* EC turns on w/ pp1800_avdd_en_l */
-	pp1800_avdd: pp1800 {
+	pp1800_avdd: regulator-pp1800 {
 	};
 
 	/* EC turns on w/ pp1800_lid_en_l */
-	pp1800_lid: pp1800_mic: pp1800 {
+	pp1800_lid: pp1800_mic: regulator-pp1800 {
 	};
 
 	/* EC turns on w/ lpddr_pwr_en */
-	pp1800_lpddr: pp1800 {
+	pp1800_lpddr: regulator-pp1800 {
 	};
 
 	/* EC turns on w/ pp1800_pmu_en_l */
-	pp1800_pmu: pp1800 {
+	pp1800_pmu: regulator-pp1800 {
 	};
 
 	/* EC turns on w/ pp1800_usb_en_l */
-	pp1800_usb: pp1800 {
+	pp1800_usb: regulator-pp1800 {
 	};
 
 	pp3000_sd_slot: regulator-pp3000-sd-slot {
@@ -259,11 +259,11 @@  ppvar_sd_card_io: ppvar-sd-card-io {
 	};
 
 	/* EC turns on w/ pp3300_trackpad_en_l */
-	pp3300_trackpad: pp3300-trackpad {
+	pp3300_trackpad: regulator-pp3300-trackpad {
 	};
 
 	/* EC turns on w/ usb_a_en */
-	pp5000_usb_a_vbus: pp5000 {
+	pp5000_usb_a_vbus: regulator-pp5000 {
 	};
 
 	ap_rtc_clk: ap-rtc-clk {