Commit 2f9eb526 authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files

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



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: 5c96e633 ("arm64: dts: rockchip: adapt regulator nodenames to preferred form")
Tested-by: default avatarVicente Bergas <vicencb@gmail.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20250116143631.3650469-1-heiko@sntech.de
parent 5ae4dca7

arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -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 */

arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -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 {

	};



	/*

arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi

+11 −11
Original line number Diff line number Diff line
@@ -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 {