From c784dae0e9a2727a1e6d4c84c3343beb4a5c3416 Mon Sep 17 00:00:00 2001 From: Niranjana Vishwanathapura Date: Wed, 8 Jan 2014 13:01:50 -0500 Subject: [PATCH] ARM: dts: msm: Update FSM9900 cpufreq table FSM9900 PVS tables are revised to work around a target lockup issue on some parts. Change-Id: I6fde86f6f9f5fd9fc8c9c033ac67b1a1bc7dd41a Acked-by: Kaushik Sikdar Signed-off-by: Niranjana Vishwanathapura --- arch/arm/boot/dts/qcom/fsm9900-regulator.dtsi | 10 +- arch/arm/boot/dts/qcom/fsm9900.dtsi | 319 +++++++++--------- 2 files changed, 162 insertions(+), 167 deletions(-) diff --git a/arch/arm/boot/dts/qcom/fsm9900-regulator.dtsi b/arch/arm/boot/dts/qcom/fsm9900-regulator.dtsi index 060b2c90a08a..9a57b2f32a3b 100644 --- a/arch/arm/boot/dts/qcom/fsm9900-regulator.dtsi +++ b/arch/arm/boot/dts/qcom/fsm9900-regulator.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, The Linux Foundation. All rights reserved. +/* Copyright (c) 2013-2014, 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 @@ -16,15 +16,15 @@ compatible = "qcom,stub-regulator"; regulator-name = "8084_s1"; qcom,set = <1>; - regulator-min-microvolt = <950000>; - regulator-max-microvolt = <950000>; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; }; pma8084_s2: regulator-s2 { compatible = "qcom,stub-regulator"; regulator-name = "8084_s2"; qcom,set = <1>; - regulator-min-microvolt = <915000>; - regulator-max-microvolt = <915000>; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; }; pma8084_l12_ao: regulator-l12-ao { compatible = "qcom,stub-regulator"; diff --git a/arch/arm/boot/dts/qcom/fsm9900.dtsi b/arch/arm/boot/dts/qcom/fsm9900.dtsi index 9d7493af1f36..ebb9d0c11799 100644 --- a/arch/arm/boot/dts/qcom/fsm9900.dtsi +++ b/arch/arm/boot/dts/qcom/fsm9900.dtsi @@ -589,12 +589,7 @@ < 1036800 1036800 3509 >, < 1190400 1190400 3509 >, < 1344000 1344000 6103 >, - < 1497600 1344000 6103 >, - < 1651200 1344000 6103 >, - < 1804800 1344000 6103 >, - < 1958400 1344000 6103 >, - < 2112000 1651200 6103 >, - < 2265600 1651200 6103 >; + < 1497600 1497600 6103 >; }; qcom,clock-krait@f9016000 { @@ -630,201 +625,201 @@ /* 2.3GHz */ qcom,speed2-pvs0-bin-v0 = < 0 0 0 >, - < 300000000 800000 72 >, - < 422400000 810000 102 >, - < 576000000 830000 141 >, - < 729600000 850000 182 >, - < 883200000 870000 224 >, - < 1036800000 890000 267 >, - < 1190400000 910000 311 >, - < 1344000000 930000 357 >, - < 1497600000 950000 404 >, - < 1651200000 970000 452 >, - < 1804800000 990000 501 >, - < 1958400000 1010000 553 >, - < 2112000000 1030000 606 >, - < 2265600000 1050000 658 >; + < 300000000 1050000 569 >, + < 422400000 1050000 569 >, + < 576000000 1050000 569 >, + < 729600000 1050000 569 >, + < 883200000 1050000 569 >, + < 1036800000 1050000 569 >, + < 1190400000 1050000 569 >, + < 1344000000 1050000 569 >, + < 1497600000 1050000 569 >, + < 1651200000 1050000 569 >, + < 1804800000 1050000 569 >, + < 1958400000 1050000 569 >, + < 2112000000 1050000 569 >, + < 2265600000 1050000 569 >; qcom,speed2-pvs1-bin-v0 = < 0 0 0 >, - < 300000000 800000 72 >, - < 422400000 805000 102 >, - < 576000000 815000 141 >, - < 729600000 825000 182 >, - < 883200000 845000 224 >, - < 1036800000 865000 267 >, - < 1190400000 885000 311 >, - < 1344000000 905000 357 >, - < 1497600000 925000 404 >, - < 1651200000 945000 452 >, - < 1804800000 965000 501 >, - < 1958400000 985000 553 >, - < 2112000000 1005000 606 >, - < 2265600000 1025000 658 >; + < 300000000 1050000 569 >, + < 422400000 1050000 569 >, + < 576000000 1050000 569 >, + < 729600000 1050000 569 >, + < 883200000 1050000 569 >, + < 1036800000 1050000 569 >, + < 1190400000 1050000 569 >, + < 1344000000 1050000 569 >, + < 1497600000 1050000 569 >, + < 1651200000 1050000 569 >, + < 1804800000 1050000 569 >, + < 1958400000 1050000 569 >, + < 2112000000 1050000 569 >, + < 2265600000 1050000 569 >; qcom,speed2-pvs2-bin-v0 = < 0 0 0 >, - < 300000000 800000 72 >, - < 422400000 800000 102 >, - < 576000000 800000 141 >, - < 729600000 810000 182 >, - < 883200000 820000 224 >, - < 1036800000 840000 267 >, - < 1190400000 860000 311 >, - < 1344000000 880000 357 >, - < 1497600000 900000 404 >, - < 1651200000 920000 452 >, - < 1804800000 940000 501 >, - < 1958400000 960000 553 >, - < 2112000000 980000 606 >, - < 2265600000 1000000 658 >; + < 300000000 1050000 569 >, + < 422400000 1050000 569 >, + < 576000000 1050000 569 >, + < 729600000 1050000 569 >, + < 883200000 1050000 569 >, + < 1036800000 1050000 569 >, + < 1190400000 1050000 569 >, + < 1344000000 1050000 569 >, + < 1497600000 1050000 569 >, + < 1651200000 1050000 569 >, + < 1804800000 1050000 569 >, + < 1958400000 1050000 569 >, + < 2112000000 1050000 569 >, + < 2265600000 1050000 569 >; /* 2.0GHz */ qcom,speed0-pvs0-bin-v0 = < 0 0 0 >, - < 300000000 850000 75 >, - < 422400000 850000 105 >, - < 576000000 870000 146 >, - < 729600000 890000 188 >, - < 883200000 910000 231 >, - < 1036800000 930000 276 >, - < 1190400000 950000 321 >, - < 1344000000 970000 368 >, - < 1497600000 990000 416 >, - < 1651200000 1010000 467 >, - < 1804800000 1030000 518 >, + < 300000000 1050000 569 >, + < 422400000 1050000 569 >, + < 576000000 1050000 569 >, + < 729600000 1050000 569 >, + < 883200000 1050000 569 >, + < 1036800000 1050000 569 >, + < 1190400000 1050000 569 >, + < 1344000000 1050000 569 >, + < 1497600000 1050000 569 >, + < 1651200000 1050000 569 >, + < 1804800000 1050000 569 >, < 1958400000 1050000 569 >; qcom,speed0-pvs1-bin-v0 = < 0 0 0 >, - < 300000000 850000 75 >, - < 422400000 850000 105 >, - < 576000000 850000 146 >, - < 729600000 865000 188 >, - < 883200000 885000 231 >, - < 1036800000 905000 276 >, - < 1190400000 925000 321 >, - < 1344000000 945000 368 >, - < 1497600000 965000 416 >, - < 1651200000 985000 467 >, - < 1804800000 1005000 518 >, - < 1958400000 1025000 569 >; + < 300000000 1050000 569 >, + < 422400000 1050000 569 >, + < 576000000 1050000 569 >, + < 729600000 1050000 569 >, + < 883200000 1050000 569 >, + < 1036800000 1050000 569 >, + < 1190400000 1050000 569 >, + < 1344000000 1050000 569 >, + < 1497600000 1050000 569 >, + < 1651200000 1050000 569 >, + < 1804800000 1050000 569 >, + < 1958400000 1050000 569 >; qcom,speed0-pvs2-bin-v0 = < 0 0 0 >, - < 300000000 800000 75 >, - < 422400000 800000 105 >, - < 576000000 820000 146 >, - < 729600000 840000 188 >, - < 883200000 860000 231 >, - < 1036800000 880000 276 >, - < 1190400000 900000 321 >, - < 1344000000 920000 368 >, - < 1497600000 940000 416 >, - < 1651200000 960000 467 >, - < 1804800000 980000 518 >, - < 1958400000 1000000 569 >; + < 300000000 1050000 569 >, + < 422400000 1050000 569 >, + < 576000000 1050000 569 >, + < 729600000 1050000 569 >, + < 883200000 1050000 569 >, + < 1036800000 1050000 569 >, + < 1190400000 1050000 569 >, + < 1344000000 1050000 569 >, + < 1497600000 1050000 569 >, + < 1651200000 1050000 569 >, + < 1804800000 1050000 569 >, + < 1958400000 1050000 569 >; qcom,speed0-pvs3-bin-v0 = < 0 0 0 >, - < 300000000 800000 75 >, - < 422400000 800000 105 >, - < 576000000 800000 146 >, - < 729600000 815000 188 >, - < 883200000 835000 231 >, - < 1036800000 855000 276 >, - < 1190400000 875000 321 >, - < 1344000000 895000 368 >, - < 1497600000 915000 416 >, - < 1651200000 935000 467 >, - < 1804800000 955000 518 >, - < 1958400000 975000 569 >; + < 300000000 1050000 569 >, + < 422400000 1050000 569 >, + < 576000000 1050000 569 >, + < 729600000 1050000 569 >, + < 883200000 1050000 569 >, + < 1036800000 1050000 569 >, + < 1190400000 1050000 569 >, + < 1344000000 1050000 569 >, + < 1497600000 1050000 569 >, + < 1651200000 1050000 569 >, + < 1804800000 1050000 569 >, + < 1958400000 1050000 569 >; qcom,speed0-pvs4-bin-v0 = < 0 0 0 >, - < 300000000 775000 75 >, - < 422400000 775000 105 >, - < 576000000 775000 146 >, - < 729600000 790000 188 >, - < 883200000 810000 231 >, - < 1036800000 830000 276 >, - < 1190400000 850000 321 >, - < 1344000000 870000 368 >, - < 1497600000 890000 416 >, - < 1651200000 910000 467 >, - < 1804800000 930000 518 >, - < 1958400000 950000 569 >; + < 300000000 1050000 569 >, + < 422400000 1050000 569 >, + < 576000000 1050000 569 >, + < 729600000 1050000 569 >, + < 883200000 1050000 569 >, + < 1036800000 1050000 569 >, + < 1190400000 1050000 569 >, + < 1344000000 1050000 569 >, + < 1497600000 1050000 569 >, + < 1651200000 1050000 569 >, + < 1804800000 1050000 569 >, + < 1958400000 1050000 569 >; /* 1.8GHz */ qcom,speed1-pvs0-bin-v0 = < 0 0 0 >, - < 300000000 850000 75 >, - < 422400000 870000 105 >, - < 576000000 890000 146 >, - < 729600000 910000 188 >, - < 883200000 930000 231 >, - < 1036800000 950000 276 >, - < 1190400000 970000 321 >, - < 1344000000 990000 368 >, - < 1497600000 1010000 416 >, - < 1651200000 1030000 467 >, - < 1804800000 1050000 518 >; + < 300000000 1050000 569 >, + < 422400000 1050000 569 >, + < 576000000 1050000 569 >, + < 729600000 1050000 569 >, + < 883200000 1050000 569 >, + < 1036800000 1050000 569 >, + < 1190400000 1050000 569 >, + < 1344000000 1050000 569 >, + < 1497600000 1050000 569 >, + < 1651200000 1050000 569 >, + < 1804800000 1050000 569 >; qcom,speed1-pvs1-bin-v0 = < 0 0 0 >, - < 300000000 850000 75 >, - < 422400000 850000 105 >, - < 576000000 865000 146 >, - < 729600000 885000 188 >, - < 883200000 905000 231 >, - < 1036800000 925000 276 >, - < 1190400000 945000 321 >, - < 1344000000 965000 368 >, - < 1497600000 985000 416 >, - < 1651200000 1005000 467 >, - < 1804800000 1025000 518 >; + < 300000000 1050000 569 >, + < 422400000 1050000 569 >, + < 576000000 1050000 569 >, + < 729600000 1050000 569 >, + < 883200000 1050000 569 >, + < 1036800000 1050000 569 >, + < 1190400000 1050000 569 >, + < 1344000000 1050000 569 >, + < 1497600000 1050000 569 >, + < 1651200000 1050000 569 >, + < 1804800000 1050000 569 >; qcom,speed1-pvs2-bin-v0 = < 0 0 0 >, - < 300000000 800000 75 >, - < 422400000 820000 105 >, - < 576000000 840000 146 >, - < 729600000 860000 188 >, - < 883200000 880000 231 >, - < 1036800000 900000 276 >, - < 1190400000 920000 321 >, - < 1344000000 940000 368 >, - < 1497600000 960000 416 >, - < 1651200000 980000 467 >, - < 1804800000 1000000 518 >; + < 300000000 1050000 569 >, + < 422400000 1050000 569 >, + < 576000000 1050000 569 >, + < 729600000 1050000 569 >, + < 883200000 1050000 569 >, + < 1036800000 1050000 569 >, + < 1190400000 1050000 569 >, + < 1344000000 1050000 569 >, + < 1497600000 1050000 569 >, + < 1651200000 1050000 569 >, + < 1804800000 1050000 569 >; qcom,speed1-pvs3-bin-v0 = < 0 0 0 >, - < 300000000 800000 75 >, - < 422400000 800000 105 >, - < 576000000 815000 146 >, - < 729600000 835000 188 >, - < 883200000 855000 231 >, - < 1036800000 875000 276 >, - < 1190400000 895000 321 >, - < 1344000000 915000 368 >, - < 1497600000 935000 416 >, - < 1651200000 955000 467 >, - < 1804800000 975000 518 >; + < 300000000 1050000 569 >, + < 422400000 1050000 569 >, + < 576000000 1050000 569 >, + < 729600000 1050000 569 >, + < 883200000 1050000 569 >, + < 1036800000 1050000 569 >, + < 1190400000 1050000 569 >, + < 1344000000 1050000 569 >, + < 1497600000 1050000 569 >, + < 1651200000 1050000 569 >, + < 1804800000 1050000 569 >; qcom,speed1-pvs4-bin-v0 = < 0 0 0 >, - < 300000000 775000 75 >, - < 422400000 775000 105 >, - < 576000000 790000 146 >, - < 729600000 810000 188 >, - < 883200000 830000 231 >, - < 1036800000 850000 276 >, - < 1190400000 870000 321 >, - < 1344000000 890000 368 >, - < 1497600000 910000 416 >, - < 1651200000 930000 467 >, - < 1804800000 950000 518 >; + < 300000000 1050000 569 >, + < 422400000 1050000 569 >, + < 576000000 1050000 569 >, + < 729600000 1050000 569 >, + < 883200000 1050000 569 >, + < 1036800000 1050000 569 >, + < 1190400000 1050000 569 >, + < 1344000000 1050000 569 >, + < 1497600000 1050000 569 >, + < 1651200000 1050000 569 >, + < 1804800000 1050000 569 >; }; qcom,bbif@fd300000 {