Commit 39e62f41 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: rename PM2250 to PM4125 



It seems, the only actual mentions of PM2250 can be found are related to
the Qualcomm RB1 platform. However even RB1 schematics use PM4125 as a
PMIC name. Rename PM2250 to PM4125 to follow the documentation.

Note, this doesn't change the compatible strings. There was a previous
argument regarding renaming of compat strings.

Fixes: c309b9a5 ("arm64: dts: qcom: Add initial PM2250 device tree")
Acked-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240128-pm2250-pm4125-rename-v2-2-d51987e9f83a@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent d51b2d5c

arch/arm64/boot/dts/qcom/pm2250.dtsi→arch/arm64/boot/dts/qcom/pm4125.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ pon@800 { 
			compatible = "qcom,pm8916-pon";

			reg = <0x800>;



			pm2250_pwrkey: pwrkey {

			pm4125_pwrkey: pwrkey {

				compatible = "qcom,pm8941-pwrkey";

				interrupts-extended = <&spmi_bus 0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;

				linux,code = <KEY_POWER>;
@@ -27,7 +27,7 @@ pm2250_pwrkey: pwrkey { 
				bias-pull-up;

			};



			pm2250_resin: resin {

			pm4125_resin: resin {

				compatible = "qcom,pm8941-resin";

				interrupts-extended = <&spmi_bus 0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;

				debounce = <15625>;
@@ -43,11 +43,11 @@ rtc@6000 { 
			interrupts-extended = <&spmi_bus 0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;

		};



		pm2250_gpios: gpio@c000 {

		pm4125_gpios: gpio@c000 {

			compatible = "qcom,pm2250-gpio", "qcom,spmi-gpio";

			reg = <0xc000>;

			gpio-controller;

			gpio-ranges = <&pm2250_gpios 0 0 10>;

			gpio-ranges = <&pm4125_gpios 0 0 10>;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <2>;

arch/arm64/boot/dts/qcom/qrb2210-rb1.dts

+39 −39
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


#include <dt-bindings/leds/common.h>

#include "qcm2290.dtsi"

#include "pm2250.dtsi"

#include "pm4125.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Robotics RB1";
@@ -226,7 +226,7 @@ &mdss { 
};



&mdss_dsi0 {

	vdda-supply = <&pm2250_l5>;

	vdda-supply = <&pm4125_l5>;

	status = "okay";

};
@@ -239,7 +239,7 @@ &mdss_dsi0_phy { 
	status = "okay";

};



&pm2250_resin {

&pm4125_resin {

	linux,code = <KEY_VOLUMEDOWN>;

	status = "okay";

};
@@ -263,23 +263,23 @@ regulators { 
		compatible = "qcom,rpm-pm2250-regulators";

		vdd_s3-supply = <&vph_pwr>;

		vdd_s4-supply = <&vph_pwr>;

		vdd_l1_l2_l3_l5_l6_l7_l8_l9_l10_l11_l12-supply = <&pm2250_s3>;

		vdd_l1_l2_l3_l5_l6_l7_l8_l9_l10_l11_l12-supply = <&pm4125_s3>;

		vdd_l4_l17_l18_l19_l20_l21_l22-supply = <&vph_pwr>;

		vdd_l13_l14_l15_l16-supply = <&pm2250_s4>;

		vdd_l13_l14_l15_l16-supply = <&pm4125_s4>;



		/*

		 * S1 - VDD_APC

		 * S2 - VDD_CX

		 */



		pm2250_s3: s3 {

		pm4125_s3: s3 {

			/* 0.4V-1.6625V -> 1.3V (Power tree requirements) */

			regulator-min-microvolt = <1352000>;

			regulator-max-microvolt = <1352000>;

			regulator-boot-on;

		};



		pm2250_s4: s4 {

		pm4125_s4: s4 {

			/* 1.2V-2.35V -> 2.05V (Power tree requirements) */

			regulator-min-microvolt = <2072000>;

			regulator-max-microvolt = <2072000>;
@@ -288,7 +288,7 @@ pm2250_s4: s4 { 


		/* L1 - VDD_MX */



		pm2250_l2: l2 {

		pm4125_l2: l2 {

			/* LPDDR4X VDD2 */

			regulator-min-microvolt = <1136000>;

			regulator-max-microvolt = <1136000>;
@@ -296,7 +296,7 @@ pm2250_l2: l2 { 
			regulator-boot-on;

		};



		pm2250_l3: l3 {

		pm4125_l3: l3 {

			/* LPDDR4X VDDQ */

			regulator-min-microvolt = <616000>;

			regulator-max-microvolt = <616000>;
@@ -304,14 +304,14 @@ pm2250_l3: l3 { 
			regulator-boot-on;

		};



		pm2250_l4: l4 {

		pm4125_l4: l4 {

			/* max = 3.05V -> max = 2.7 to disable 3V signaling (SDHCI2) */

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2700000>;

			regulator-allow-set-load;

		};



		pm2250_l5: l5 {

		pm4125_l5: l5 {

			/* CSI/DSI */

			regulator-min-microvolt = <1232000>;

			regulator-max-microvolt = <1232000>;
@@ -319,7 +319,7 @@ pm2250_l5: l5 { 
			regulator-boot-on;

		};



		pm2250_l6: l6 {

		pm4125_l6: l6 {

			/* DRAM PLL */

			regulator-min-microvolt = <928000>;

			regulator-max-microvolt = <928000>;
@@ -327,7 +327,7 @@ pm2250_l6: l6 { 
			regulator-boot-on;

		};



		pm2250_l7: l7 {

		pm4125_l7: l7 {

			/* Wi-Fi CX/MX */

			regulator-min-microvolt = <664000>;

			regulator-max-microvolt = <664000>;
@@ -338,20 +338,20 @@ pm2250_l7: l7 { 
		 * L9 - VDD_LPI_MX

		 */



		pm2250_l10: l10 {

		pm4125_l10: l10 {

			/* Wi-Fi RFA */

			regulator-min-microvolt = <1304000>;

			regulator-max-microvolt = <1304000>;

		};



		pm2250_l11: l11 {

		pm4125_l11: l11 {

			/* GPS RF1 */

			regulator-min-microvolt = <1000000>;

			regulator-max-microvolt = <1000000>;

			regulator-boot-on;

		};



		pm2250_l12: l12 {

		pm4125_l12: l12 {

			/* USB PHYs */

			regulator-min-microvolt = <928000>;

			regulator-max-microvolt = <928000>;
@@ -359,7 +359,7 @@ pm2250_l12: l12 { 
			regulator-boot-on;

		};



		pm2250_l13: l13 {

		pm4125_l13: l13 {

			/* USB/QFPROM/PLLs */

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;
@@ -367,7 +367,7 @@ pm2250_l13: l13 { 
			regulator-boot-on;

		};



		pm2250_l14: l14 {

		pm4125_l14: l14 {

			/* SDHCI1 VQMMC */

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;
@@ -376,7 +376,7 @@ pm2250_l14: l14 { 
			regulator-always-on;

		};



		pm2250_l15: l15 {

		pm4125_l15: l15 {

			/* WCD/DSI/BT VDDIO */

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;
@@ -385,38 +385,38 @@ pm2250_l15: l15 { 
			regulator-boot-on;

		};



		pm2250_l16: l16 {

		pm4125_l16: l16 {

			/* GPS RF2 */

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-boot-on;

		};



		pm2250_l17: l17 {

		pm4125_l17: l17 {

			regulator-min-microvolt = <3000000>;

			regulator-max-microvolt = <3000000>;

		};



		pm2250_l18: l18 {

		pm4125_l18: l18 {

			/* VDD_PXn */

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



		pm2250_l19: l19 {

		pm4125_l19: l19 {

			/* VDD_PXn */

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



		pm2250_l20: l20 {

		pm4125_l20: l20 {

			/* SDHCI1 VMMC */

			regulator-min-microvolt = <2400000>;

			regulator-max-microvolt = <3600000>;

			regulator-allow-set-load;

		};



		pm2250_l21: l21 {

		pm4125_l21: l21 {

			/* SDHCI2 VMMC */

			regulator-min-microvolt = <2960000>;

			regulator-max-microvolt = <3300000>;
@@ -424,7 +424,7 @@ pm2250_l21: l21 { 
			regulator-boot-on;

		};



		pm2250_l22: l22 {

		pm4125_l22: l22 {

			/* Wi-Fi */

			regulator-min-microvolt = <3312000>;

			regulator-max-microvolt = <3312000>;
@@ -433,8 +433,8 @@ pm2250_l22: l22 { 
};



&sdhc_1 {

	vmmc-supply = <&pm2250_l20>;

	vqmmc-supply = <&pm2250_l14>;

	vmmc-supply = <&pm4125_l20>;

	vqmmc-supply = <&pm4125_l14>;

	pinctrl-0 = <&sdc1_state_on>;

	pinctrl-1 = <&sdc1_state_off>;

	pinctrl-names = "default", "sleep";
@@ -446,8 +446,8 @@ &sdhc_1 { 
};



&sdhc_2 {

	vmmc-supply = <&pm2250_l21>;

	vqmmc-supply = <&pm2250_l4>;

	vmmc-supply = <&pm4125_l21>;

	vqmmc-supply = <&pm4125_l4>;

	cd-gpios = <&tlmm 88 GPIO_ACTIVE_LOW>;

	pinctrl-0 = <&sdc2_state_on &sd_det_in_on>;

	pinctrl-1 = <&sdc2_state_off &sd_det_in_off>;
@@ -518,8 +518,8 @@ &usb { 
};



&usb_qmpphy {

	vdda-phy-supply = <&pm2250_l12>;

	vdda-pll-supply = <&pm2250_l13>;

	vdda-phy-supply = <&pm4125_l12>;

	vdda-pll-supply = <&pm4125_l13>;

	status = "okay";

};
@@ -528,17 +528,17 @@ &usb_dwc3 { 
};



&usb_hsphy {

	vdd-supply = <&pm2250_l12>;

	vdda-pll-supply = <&pm2250_l13>;

	vdda-phy-dpdm-supply = <&pm2250_l21>;

	vdd-supply = <&pm4125_l12>;

	vdda-pll-supply = <&pm4125_l13>;

	vdda-phy-dpdm-supply = <&pm4125_l21>;

	status = "okay";

};



&wifi {

	vdd-0.8-cx-mx-supply = <&pm2250_l7>;

	vdd-1.8-xo-supply = <&pm2250_l13>;

	vdd-1.3-rfa-supply = <&pm2250_l10>;

	vdd-3.3-ch0-supply = <&pm2250_l22>;

	vdd-0.8-cx-mx-supply = <&pm4125_l7>;

	vdd-1.8-xo-supply = <&pm4125_l13>;

	vdd-1.3-rfa-supply = <&pm4125_l10>;

	vdd-3.3-ch0-supply = <&pm4125_l22>;

	qcom,ath10k-calibration-variant = "Thundercomm_RB1";

	status = "okay";

};