Commit 915b6a8b authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files

arm64: dts: rockchip: fix the px30-evb power tree 



Add the board's pmic (rk809) and hook up the real supplies to their
consumers. This is especially important as cpufreq would otherwise hang
the system when scaling the frequency without adjusting the voltage.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20190917082659.25549-5-heiko@sntech.de
parent cdfebb27

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

+246 −8
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
	backlight: backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm1 0 25000 0>;

		power-supply = <&vcc3v3_lcd>;

	};



	sdio_pwrseq: sdio-pwrseq {
@@ -74,13 +75,6 @@ 
		reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO3_A4 */

	};



	vcc_phy: vcc-phy-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc_phy";

		regulator-always-on;

		regulator-boot-on;

	};



	vcc5v0_sys: vccsys {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_sys";
@@ -91,6 +85,22 @@ 
	};

};



&cpu0 {

	cpu-supply = <&vdd_arm>;

};



&cpu1 {

	cpu-supply = <&vdd_arm>;

};



&cpu2 {

	cpu-supply = <&vdd_arm>;

};



&cpu3 {

	cpu-supply = <&vdd_arm>;

};



&display_subsystem {

	status = "okay";

};
@@ -100,12 +110,14 @@ 
	cap-mmc-highspeed;

	mmc-hs200-1_8v;

	non-removable;

	vmmc-supply = <&vcc_3v0>;

	vqmmc-supply = <&vccio_flash>;

	status = "okay";

};



&gmac {

	clock_in_out = "output";

	phy-supply = <&vcc_phy>;

	phy-supply = <&vcc_rmii>;

	snps,reset-gpio = <&gpio2 13 GPIO_ACTIVE_LOW>;

	snps,reset-active-low;

	snps,reset-delays-us = <0 50000 50000>;
@@ -114,6 +126,219 @@ 


&i2c0 {

	status = "okay";



	rk809: pmic@20 {

		compatible = "rockchip,rk809";

		reg = <0x20>;

		interrupt-parent = <&gpio0>;

		interrupts = <7 IRQ_TYPE_LEVEL_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&pmic_int>;

		rockchip,system-power-controller;

		wakeup-source;

		#clock-cells = <0>;

		clock-output-names = "xin32k";



		vcc1-supply = <&vcc5v0_sys>;

		vcc2-supply = <&vcc5v0_sys>;

		vcc3-supply = <&vcc5v0_sys>;

		vcc4-supply = <&vcc5v0_sys>;

		vcc5-supply = <&vcc3v3_sys>;

		vcc6-supply = <&vcc3v3_sys>;

		vcc7-supply = <&vcc3v3_sys>;

		vcc8-supply = <&vcc3v3_sys>;

		vcc9-supply = <&vcc5v0_sys>;



		regulators {

			vdd_log: DCDC_REG1 {

				regulator-name = "vdd_log";

				regulator-min-microvolt = <950000>;

				regulator-max-microvolt = <1350000>;

				regulator-ramp-delay = <6001>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <950000>;

				};

			};



			vdd_arm: DCDC_REG2 {

				regulator-name = "vdd_arm";

				regulator-min-microvolt = <950000>;

				regulator-max-microvolt = <1350000>;

				regulator-ramp-delay = <6001>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-off-in-suspend;

					regulator-suspend-microvolt = <950000>;

				};

			};



			vcc_ddr: DCDC_REG3 {

				regulator-name = "vcc_ddr";

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

				};

			};



			vcc_3v0: vcc_rmii: DCDC_REG4 {

				regulator-name = "vcc_3v0";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3000000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3000000>;

				};

			};



			vcc3v3_sys: DCDC_REG5 {

				regulator-name = "vcc3v3_sys";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3300000>;

				};

			};



			vcc_1v0: LDO_REG1 {

				regulator-name = "vcc_1v0";

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1000000>;

				};

			};



			vcc_1v8: vccio_flash: vccio_sdio: LDO_REG2 {

				regulator-name = "vcc_1v8";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1800000>;

				};

			};



			vdd_1v0: LDO_REG3 {

				regulator-name = "vdd_1v0";

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1000000>;

				};

			};



			vcc3v0_pmu: LDO_REG4 {

				regulator-name = "vcc3v0_pmu";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3000000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3000000>;

				};

			};



			vccio_sd: LDO_REG5 {

				regulator-name = "vccio_sd";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3300000>;

				};

			};



			vcc_sd: LDO_REG6 {

				regulator-name = "vcc_sd";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3300000>;

				};

			};



			vcc2v8_dvp: LDO_REG7 {

				regulator-name = "vcc2v8_dvp";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				regulator-boot-on;



				regulator-state-mem {

					regulator-off-in-suspend;

					regulator-suspend-microvolt = <2800000>;

				};

			};



			vcc1v8_dvp: LDO_REG8 {

				regulator-name = "vcc1v8_dvp";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1800000>;

				};

			};



			vcc1v5_dvp: LDO_REG9 {

				regulator-name = "vcc1v5_dvp";

				regulator-min-microvolt = <1500000>;

				regulator-max-microvolt = <1500000>;

				regulator-boot-on;



				regulator-state-mem {

					regulator-off-in-suspend;

					regulator-suspend-microvolt = <1500000>;

				};

			};



			vcc3v3_lcd: SWITCH_REG1 {

				regulator-name = "vcc3v3_lcd";

				regulator-boot-on;

			};



			vcc5v0_host: SWITCH_REG2 {

				regulator-name = "vcc5v0_host";

				regulator-always-on;

				regulator-boot-on;

			};

		};

	};

};



&i2s1_2ch {
@@ -122,6 +347,13 @@ 


&io_domains {

	status = "okay";



	vccio1-supply = <&vccio_sdio>;

	vccio2-supply = <&vccio_sd>;

	vccio3-supply = <&vcc_3v0>;

	vccio4-supply = <&vcc3v0_pmu>;

	vccio5-supply = <&vcc_3v0>;

	vccio6-supply = <&vccio_flash>;

};



&pinctrl {
@@ -164,6 +396,9 @@ 


&pmu_io_domains {

	status = "okay";



	pmuio1-supply = <&vcc3v0_pmu>;

	pmuio2-supply = <&vcc3v0_pmu>;

};



&pwm1 {
@@ -171,6 +406,7 @@ 
};



&saradc {

	vref-supply = <&vcc_1v8>;

	status = "okay";

};
@@ -183,6 +419,8 @@ 
	sd-uhs-sdr25;

	sd-uhs-sdr50;

	sd-uhs-sdr104;

	vmmc-supply = <&vcc_sd>;

	vqmmc-supply = <&vccio_sd>;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE