Commit cc99dd61 authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: msm8916: Move more supplies to msm8916-pm8916.dtsi 



So far we had some supplies defined for all boards in msm8916.dtsi,
while others were duplicated into every board-specific device tree.

Now that we have msm8916-pm8916.dtsi as a common include for all
standard MSM8916 devices using PM8916, move the remaining common
supplies to msm8916-pm8916.dtsi to reduce duplication a bit.

Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20200720085406.6716-9-stephan@gerhold.net


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent bfe9d754

arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

+0 −15
Original line number Diff line number Diff line
@@ -301,9 +301,6 @@ 
};



&dsi0 {

	vdda-supply = <&pm8916_l2>;

	vddio-supply = <&pm8916_l6>;



	ports {

		port@1 {

			endpoint {
@@ -314,10 +311,6 @@ 
	};

};



&dsi_phy0 {

	vddio-supply = <&pm8916_l6>;

};



&lpass {

	status = "okay";

};
@@ -334,9 +327,6 @@ 
&sdhc_1 {

	status = "okay";



	vmmc-supply = <&pm8916_l8>;

	vqmmc-supply = <&pm8916_l5>;



	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
@@ -345,9 +335,6 @@ 
&sdhc_2 {

	status = "okay";



	vmmc-supply = <&pm8916_l11>;

	vqmmc-supply = <&pm8916_l12>;



	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
@@ -410,8 +397,6 @@ 
};



&usb_hs_phy {

	v1p8-supply = <&pm8916_l7>;

	v3p3-supply = <&pm8916_l13>;

	extcon = <&usb_id>;

};

arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts

+0 −8
Original line number Diff line number Diff line
@@ -72,9 +72,6 @@ 
&sdhc_1 {

	status = "okay";



	vmmc-supply = <&pm8916_l8>;

	vqmmc-supply = <&pm8916_l5>;



	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
@@ -83,9 +80,6 @@ 
&sdhc_2 {

	status = "okay";



	vmmc-supply = <&pm8916_l11>;

	vqmmc-supply = <&pm8916_l12>;



	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
@@ -105,8 +99,6 @@ 


&usb_hs_phy {

	extcon = <&usb_vbus>;

	v1p8-supply = <&pm8916_l7>;

	v3p3-supply = <&pm8916_l13>;

};



&smd_rpm_regulators {

arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi

+24 −0
Original line number Diff line number Diff line
@@ -7,6 +7,15 @@ 
	vdda-supply = <&pm8916_l2>;

};



&dsi0 {

	vdda-supply = <&pm8916_l2>;

	vddio-supply = <&pm8916_l6>;

};



&dsi_phy0 {

	vddio-supply = <&pm8916_l6>;

};



&mpss {

	cx-supply = <&pm8916_s1>;

	mx-supply = <&pm8916_l3>;
@@ -25,6 +34,21 @@ 
	};

};



&sdhc_1 {

	vmmc-supply = <&pm8916_l8>;

	vqmmc-supply = <&pm8916_l5>;

};



&sdhc_2 {

	vmmc-supply = <&pm8916_l11>;

	vqmmc-supply = <&pm8916_l12>;

};



&usb_hs_phy {

	v1p8-supply = <&pm8916_l7>;

	v3p3-supply = <&pm8916_l13>;

};



&rpm_requests {

	smd_rpm_regulators: pm8916-regulators {

		compatible = "qcom,rpm-pm8916-regulators";

arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi

+0 −15
Original line number Diff line number Diff line
@@ -125,18 +125,11 @@ 
	#address-cells = <1>;

	#size-cells = <0>;



	vdda-supply = <&pm8916_l2>;

	vddio-supply = <&pm8916_l6>;



	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&mdss_default>;

	pinctrl-1 = <&mdss_sleep>;

};



&dsi_phy0 {

	vddio-supply = <&pm8916_l6>;

};



&pm8916_resin {

	status = "okay";

	linux,code = <KEY_VOLUMEDOWN>;
@@ -149,9 +142,6 @@ 
&sdhc_1 {

	status = "okay";



	vmmc-supply = <&pm8916_l8>;

	vqmmc-supply = <&pm8916_l5>;



	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
@@ -160,9 +150,6 @@ 
&sdhc_2 {

	status = "okay";



	vmmc-supply = <&pm8916_l11>;

	vqmmc-supply = <&pm8916_l12>;



	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
@@ -181,8 +168,6 @@ 


&usb_hs_phy {

	extcon = <&muic>;

	v1p8-supply = <&pm8916_l7>;

	v3p3-supply = <&pm8916_l13>;

};



&smd_rpm_regulators {