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

Commit 02c043ee authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "ARM: dts: msm: Enable ACD functionality for sdm630 CPU rails""

parents 81e9edba 4b9f893b

arch/arm/boot/dts/qcom/sdm630-pm.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
		qcom,vctl-timeout-us = <500>;

		qcom,vctl-port = <0x0>;

		qcom,phase-port = <0x1>;

		qcom,saw2-avs-ctl = <0x101c031>;

		qcom,saw2-avs-ctl = <0x1010031>;

		qcom,saw2-avs-limit = <0x4580458>;

		qcom,pfm-port = <0x2>;

	};
@@ -40,7 +40,7 @@ 
		qcom,vctl-timeout-us = <500>;

		qcom,vctl-port = <0x0>;

		qcom,phase-port = <0x1>;

		qcom,saw2-avs-ctl = <0x101c031>;

		qcom,saw2-avs-ctl = <0x1010031>;

		qcom,saw2-avs-limit = <0x4580458>;

		qcom,pfm-port = <0x2>;

	};

arch/arm/boot/dts/qcom/sdm630.dtsi

+2 −11
Original line number Diff line number Diff line
@@ -1306,18 +1306,9 @@ 
		compatible = "qcom,clk-cpu-osm-sdm630";

		reg = <0x179c0000 0x4000>, <0x17916000 0x1000>,

			<0x17816000 0x1000>, <0x179d1000 0x1000>,

			<0x00784130 0x8>, <0x17914800 0x800>,

			<0x17814800 0x800>;

			<0x00784130 0x8>;

		reg-names = "osm", "pwrcl_pll", "perfcl_pll",

			"apcs_common", "perfcl_efuse",

			"pwrcl_acd", "perfcl_acd";



		qcom,acdtd-val = <0x0000a111 0x0000a111>;

		qcom,acdcr-val = <0x002c5ffd 0x002c5ffd>;

		qcom,acdsscr-val = <0x00000901 0x00000901>;

		qcom,acdextint0-val = <0x2cf9ae8 0x2cf9ae8>;

		qcom,acdextint1-val = <0x2cf9afe 0x2cf9afe>;

		qcom,acdautoxfer-val = <0x00000015 0x00000015>;

			"apcs_common", "perfcl_efuse";



		vdd-pwrcl-supply = <&apc0_pwrcl_vreg>;

		vdd-perfcl-supply = <&apc1_perfcl_vreg>;