Commit 5c96e633 authored by Johan Jonker's avatar Johan Jonker Committed by Heiko Stuebner
Browse files

arm64: dts: rockchip: adapt regulator nodenames to preferred form 



The preferred nodename for fixed-regulators has changed to
pattern: '^regulator(-[0-9]+v[0-9]+|-[0-9a-z-]+)?$'

Fix all Rockchip DT regulator nodenames.

Signed-off-by: default avatarJohan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/0ae40493-93e9-40cd-9ca9-990ae064f21a@gmail.com


[adapted rebased on top of a number of other changes and included
 neu6a-wifi + wolfvision-pf5-io-expander overlays]
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 3fb369c1

arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ aliases { 
		mmc2 = &sdio;

	};



	vcc5v0_sys: vcc5v0-sys {

	vcc5v0_sys: regulator-vcc5v0-sys {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_sys";	/* +5V */

		regulator-always-on;
@@ -42,7 +42,7 @@ vcc3v3_btreg: vcc3v3-btreg { 
		states = <3300000 0x0>;

	};



	vcc3v3_rf_aux_mod: vcc3v3-rf-aux-mod {

	vcc3v3_rf_aux_mod: regulator-vcc3v3-rf-aux-mod {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3_rf_aux_mod";

		regulator-min-microvolt = <3300000>;

arch/arm64/boot/dts/rockchip/px30-evb.dts

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ sdio_pwrseq: sdio-pwrseq { 
		reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO3_A4 */

	};



	vcc5v0_sys: vccsys {

	vcc5v0_sys: regulator-vccsys {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_sys";

		regulator-always-on;

arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core-mb.dts

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ chosen { 
		stdout-path = "serial2:115200n8";

	};



	dc_12v: dc-12v-regulator {

	dc_12v: regulator-dc-12v {

		compatible = "regulator-fixed";

		regulator-name = "dc_12v";

		regulator-always-on;
@@ -85,7 +85,7 @@ sdio_pwrseq: sdio-pwrseq { 
		reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO3_A4 */

	};



	vcc5v0_baseboard: vcc5v0-baseboard-regulator {

	vcc5v0_baseboard: regulator-vcc5v0-baseboard {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_baseboard";

		regulator-always-on;

arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ emmc_pwrseq: emmc-pwrseq { 
		reset-gpios = <&gpio1 RK_PB3 GPIO_ACTIVE_HIGH>;

	};



	vcc5v0_sys: vcc5v0-sys-regulator {

	vcc5v0_sys: regulator-vcc5v0-sys {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_sys";

		regulator-always-on;

arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts

+5 −5
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ sgtl5000_clk: sgtl5000-oscillator { 
		clock-frequency = <24576000>;

	};



	dc_12v: dc-12v-regulator {

	dc_12v: regulator-dc-12v {

		compatible = "regulator-fixed";

		regulator-name = "dc_12v";

		regulator-always-on;
@@ -99,7 +99,7 @@ dc_12v: dc-12v-regulator { 
		regulator-max-microvolt = <12000000>;

	};



	vcc3v3_baseboard: vcc3v3-baseboard-regulator {

	vcc3v3_baseboard: regulator-vcc3v3-baseboard {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3_baseboard";

		regulator-always-on;
@@ -109,7 +109,7 @@ vcc3v3_baseboard: vcc3v3-baseboard-regulator { 
		vin-supply = <&dc_12v>;

	};



	vcc5v0_baseboard: vcc5v0-baseboard-regulator {

	vcc5v0_baseboard: regulator-vcc5v0-baseboard {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_baseboard";

		regulator-always-on;
@@ -119,7 +119,7 @@ vcc5v0_baseboard: vcc5v0-baseboard-regulator { 
		vin-supply = <&dc_12v>;

	};



	vdda_codec: vdda-codec-regulator {

	vdda_codec: regulator-vdda-codec {

		compatible = "regulator-fixed";

		regulator-name = "vdda_codec";

		regulator-boot-on;
@@ -128,7 +128,7 @@ vdda_codec: vdda-codec-regulator { 
		vin-supply = <&vcc5v0_baseboard>;

	};



	vddd_codec: vddd-codec-regulator {

	vddd_codec: regulator-vddd-codec {

		compatible = "regulator-fixed";

		regulator-name = "vddd_codec";

		regulator-boot-on;