Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 530f2f0c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Handle mmc registers after kernel hibernation"

parents 417edfbb ba64f084

arch/arm64/boot/dts/qcom/sa6155-adp-air.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ 
	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on &sdc1_rclk_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off &sdc1_rclk_off>;



	qcom,restore-after-cx-collapse;

	status = "ok";

};

arch/arm64/boot/dts/qcom/sa6155-adp-star.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ 
	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on &sdc1_rclk_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off &sdc1_rclk_off>;



	qcom,restore-after-cx-collapse;

	status = "ok";

};

arch/arm64/boot/dts/qcom/sa6155.dtsi

+0 −5
Original line number Diff line number Diff line
@@ -87,11 +87,6 @@ 
	vdd_mx-supply = <&VDD_CX_LEVEL>;

};



&sdhc_1 {

	qcom,restore-after-cx-collapse;

	status = "ok";

};



#include "sa6155-pcie.dtsi"



&soc {