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

Commit 8dfc7eb4 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 SDM660 silver cluster""

parents 33ed817c 5a07b733

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

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -39,7 +39,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/sdm660-regulator.dtsi

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -777,8 +777,8 @@ 
					< (-4000)  4000  7000  19000 (-8000)>;



				qcom,cpr-closed-loop-voltage-fuse-adjustment =

					<(-32000) (-30000) (-29000) (-38000)

					(-36000)>;

					<(-32000) (-30000) (-29000) (-23000)

					(-21000)>;



				qcom,cpr-floor-to-ceiling-max-range =

					<32000  32000  32000  40000  44000

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

+3 −11
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1254,18 +1254,10 @@ 
		compatible = "qcom,clk-cpu-osm";

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

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

		      <0x00784130 0x8>, <0x00784130 0x8>,

		      <0x17914800 0x800>;

		      <0x00784130 0x8>, <0x00784130 0x8>;

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

			    "apcs_common", "pwrcl_efuse",

			    "perfcl_efuse", "pwrcl_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>;

			    "perfcl_efuse";



		vdd-pwrcl-supply = <&apc0_pwrcl_vreg>;

		vdd-perfcl-supply = <&apc1_perfcl_vreg>;