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

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

Merge "clk: msm: clock-cpu-8996: Add CPU clocks support for msm8996 Lite"

parents ded39c65 c631715e

Documentation/devicetree/bindings/regulator/cpr3-hmss-regulator.txt

+13 −2
Original line number Diff line number Diff line
@@ -160,8 +160,19 @@ HMSS specific properties: 
		    the device.  This value is utilized by several other

		    properties.  Supported values are 1 up to the maximum

		    possible for a given regulator type.  For HMSS the maximum

		    supported value is 8.  These combos correspond to CPR

		    revision fuse values 0 to 7 in order.

		    supported value is 16.  The first 8 fuse combos correspond

		    to speed bin fuse value 0 along with CPR revision fuse

		    values 0 to 7.  The last 8 fuse combos correspond to speed

		    bin fuse value 1 along with CPR revision fuse values 0 to 7.



- qcom,cpr-speed-bins

	Usage:      optional

	Value type: <u32>

	Definition: Specifies the number of speed bins being supported by the

		    device.  This value is utilized by several other properties.

		    Supported values are 1 up to the maximum possible for a

		    given regulator type.  For HMSS the maximum supported value

		    is 2.



- qcom,ldo-headroom-voltage

	Usage:      required if qcom,vdd-threadN-ldo-supply is specified for the

Documentation/devicetree/bindings/regulator/cpr3-mmss-regulator.txt

+24 −13
Original line number Diff line number Diff line
@@ -72,6 +72,15 @@ MMSS specific properties: 
		    supported value is 8.  These combos correspond to CPR

		    revision fuse values from 0 to 7 in order.



- qcom,cpr-speed-bins

	Usage:      optional

	Value type: <u32>

	Definition: Specifies the number of speed bins being supported by the

		    device.  This value is utilized by several other properties.

		    Supported values are 1 up to the maximum possible for a

		    given regulator type.  For MMSS the maximum supported value

		    is 1.



- qcom,cpr-target-quotients

	Usage:      required

	Value type: <prop-encoded-array>
@@ -82,18 +91,20 @@ MMSS specific properties: 
		    RO15 in order.  If a given RO is unused for a corner, then

		    its target quotient should be specified as 0.



		    The tuple list grouping must contain qcom,cpr-fuse-combos

		    number of tuple lists in which case the lists are matched to

		    fuse combinations 1-to-1 or qcom,cpr-speed-bins number of

		    tuples lists in which case the lists are matched to speed

		    bins 1-to-1 or exactly 1 list which is used regardless of

		    the fuse combination and speed bin found on a given chip.



		    Each tuple list must contain the number of tuples defined in

		    the corresponding element of the qcom,cpr-corners property.

		    A single tuple list may only be specified if all of the

		    corner counts in qcom,cpr-corners are the same.  The tuples

		    in a given list are ordered from the lowest corner to the

		    highest corner.



		    The tuple list grouping must contain either

		    qcom,cpr-fuse-combos number of tuple lists in which case the

		    lists are matched to fuse combinations 1-to-1 or the

		    grouping must contain exactly 1 list which is used

		    regardless of the fuse combination found on a given chip.

		    the corresponding element of the qcom,cpr-corners property

		    or the qcom,cpr-speed-bins property.  A single tuple list

		    may only be specified if all of the corner counts in

		    qcom,cpr-corners and are qcom,cpr-speed-bins the same.

		    The tuples in a given list are ordered from the lowest

		    corner to the highest corner.



- qcom,cpr-ro-scaling-factor

	Usage:      required if qcom,cpr-closed-loop-voltage-adjustment is
@@ -105,8 +116,8 @@ MMSS specific properties: 


		    Each tuple list must contain the number of tuples defined in

		    the corresponding element of the qcom,cpr-corners property

		    as opposed to the value of the qcom,cpr-fuse-corners

		    property.

		    or the qcom,cpr-speed-bins property as opposed to the value

		    of the qcom,cpr-fuse-corners property.



Note that the qcom,cpr-closed-loop-voltage-fuse-adjustment property is not

meaningful for MMSS CPR3 regulator nodes since target quotients are not defined

Documentation/devicetree/bindings/regulator/cpr3-regulator.txt

+74 −88
Original line number Diff line number Diff line
@@ -239,6 +239,19 @@ Platform independent properties: 
		    possible for a given regulator type.  See platform specific

		    binding files for further details.



- qcom,cpr-speed-bins

	Usage:      optional

	Value type: <u32>

	Definition: Specifies the number of speed bins being supported by the

		    device.  This value is utilized by several other properties.

		    Supported values are 1 up to the maximum possible for a

		    given regulator type.  See platform specific binding files

		    for further details.



		    This property can only be utilized if the number of corners

		    for all fuse combinations associated with a given speed bin

		    is the same.



- qcom,cpr-corners

	Usage:      required

	Value type: <prop-encoded-array>
@@ -250,19 +263,30 @@ Platform independent properties: 
		    element which is used regardless of the fuse combination

		    found on a given chip.



- qcom,cpr-speed-bin-corners

	Usage:      required if qcom,cpr-speed-bins is specified

	Value type: <prop-encoded-array>

	Definition: A list of integers which defines how many voltage corners

		    are to be used for each speed bin.  The list must contain

		    qcom,cpr-speed-bins number of elements.



- qcom,cpr-corner-fmax-map

	Usage:      required

	Value type: <prop-encoded-array>

	Definition: A list of integer tuples which each define the highest

		    (i.e. maximum frequency) 1-based corner value associated

		    with each fuse-corner.  Each tuple must have a number of

		    elements equal to the value of the qcom,cpr-fuse-corners

		    property.  The elements of a tuple are ordered from lowest

		    to highest fuse corner.  The list must contain either

		    qcom,cpr-fuse-combos number of tuples in which case the

		    tuple mappings are applied to fuse combinations 1-to-1 or

		    the list must contain exactly 1 tuple which is used

		    regardless of the fuse combination found on a given chip.

		    with each fuse-corner.



		    Each tuple must have a number of elements equal to the value

		    of the qcom,cpr-fuse-corners property.  The elements of a

		    tuple are ordered from lowest to highest fuse corner.



		    The list must contain qcom,cpr-fuse-combos number of tuples

		    in which case the tuples are matched to fuse combinations

		    1-to-1 or qcom,cpr-speed-bins number of tuples in which case

		    the tuples are matched to speed bins 1-to-1 or exactly 1

		    tuple which is used regardless of the fuse combination and

		    speed bin found on a given chip.



- qcom,cpr-voltage-ceiling

	Usage:      required
@@ -271,16 +295,18 @@ Platform independent properties: 
		    voltage in microvolts for each voltage corner in order from

		    lowest to highest.



		    The list must contain either qcom,cpr-fuse-combos number of

		    tuples in which case the tuples are matched to fuse

		    combinations 1-to-1 or the list must contain exactly 1 tuple

		    which is used regardless of the fuse combination found on a

		    given chip.

		    The list must contain qcom,cpr-fuse-combos number of tuples

		    in which case the tuples are matched to fuse combinations

		    1-to-1 or qcom,cpr-speed-bins number of tuples in which case

		    the tuples are matched to speed bins 1-to-1 or exactly 1

		    tuple which is used regardless of the fuse combination and

		    speed bin found on a given chip.



		    Each tuple must be of the length defined in the

		    corresponding element of the qcom,cpr-corners property.  A

		    single tuple may only be specified if all of the corner

		    counts in qcom,cpr-corners are the same.

		    corresponding element of the qcom,cpr-corners property or

		    the qcom,cpr-speed-bins property.  A single tuple may only

		    be specified if all of the corner counts in qcom,cpr-corners

		    are the same.



- qcom,cpr-voltage-floor

	Usage:      required
@@ -353,14 +379,8 @@ Platform independent properties: 
		    applied to the values read from fuses before the values are

		    used in interpolation for intermediate corners.



		    The list must contain either qcom,cpr-fuse-combos number of

		    tuples in which case the tuples are matched to fuse

		    combinations 1-to-1 or the list must contain exactly 1 tuple

		    which is used regardless of the fuse combination found on a

		    given chip.



		    Each tuple must have a number of elements equal to the value

		    of the qcom,cpr-fuse-corners property.

		    The list and tuples must meet the same size requirements as

		    those specified for qcom,cpr-corner-fmax-map above.



		    The open-loop voltage for a given fuse corner corresponds to

		    the voltage that is safe to use under all circumstances.
@@ -376,16 +396,8 @@ Platform independent properties: 
		    the open-loop voltage values after they have been

		    interpolated for intermediate corners.



		    The list must contain either qcom,cpr-fuse-combos number of

		    tuples in which case the tuples are matched to fuse

		    combinations 1-to-1 or the list must contain exactly 1 tuple

		    which is used regardless of the fuse combination found on a

		    given chip.



		    Each tuple must be of the length defined in the

		    corresponding element of the qcom,cpr-corners property.  A

		    single tuple may only be specified if all of the corner

		    counts in qcom,cpr-corners are the same.

		    The list and tuples must meet the same size requirements as

		    those specified for qcom,cpr-voltage-ceiling above.



- qcom,cpr-open-loop-voltage-min-diff

	Usage:      optional; only meaningful if the
@@ -406,16 +418,8 @@ Platform independent properties: 
		    voltage values have been interpolated for intermediate

		    corners and after adjustments have been applied.



		    The list must contain either qcom,cpr-fuse-combos number of

		    tuples in which case the tuples are matched to fuse

		    combinations 1-to-1 or the list must contain exactly 1 tuple

		    which is used regardless of the fuse combination found on a

		    given chip.



		    Each tuple must be of the length defined in the

		    corresponding element of the qcom,cpr-corners property.  A

		    single tuple may only be specified if all of the corner

		    counts in qcom,cpr-corners are the same.

		    The list and tuples must meet the same size requirements as

		    those specified for qcom,cpr-voltage-ceiling above.



		    If this property is not specified, then the minimum

		    difference is assumed to be 0 uV for all corners.
@@ -429,16 +433,11 @@ Platform independent properties: 
		    applied to the values read from fuses before the values are

		    used in interpolation for intermediate corners.



		    The list must contain either qcom,cpr-fuse-combos number of

		    tuples in which case the tuples are matched to fuse

		    combinations 1-to-1 or the list must contain exactly 1 tuple

		    which is used regardless of the fuse combination found on a

		    given chip.

		    The list and tuples must meet the same size requirements as

		    those specified for qcom,cpr-corner-fmax-map above.



		    Each tuple must have a number of elements equal to the value

		    of the qcom,cpr-fuse-corners property.

		    The qcom,cpr-ro-scaling-factor property must be specified

		    in order to utilize this property.

		    The qcom,cpr-ro-scaling-factor property must be specified in

		    order to utilize this property.



		    The closed-loop voltage for a given fuse corner corresponds

		    to the voltage that the CPR controller settles the VDD
@@ -454,17 +453,10 @@ Platform independent properties: 
		    target quotient values after they have been interpolated

		    for intermediate corners.



		    The list must contain either qcom,cpr-fuse-combos number of

		    tuples in which case the tuples are matched to fuse

		    combinations 1-to-1 or the list must contain exactly 1 tuple

		    which is used regardless of the fuse combination found on a

		    given chip.

		    The list and tuples must meet the same size requirements as

		    those specified for qcom,cpr-voltage-ceiling above.



		    Each tuple must be of the length defined in the

		    corresponding element of the qcom,cpr-corners property.  A

		    single tuple may only be specified if all of the corner

		    counts in qcom,cpr-corners are the same.  The

		    qcom,cpr-ro-scaling-factor property must be specified in

		    The qcom,cpr-ro-scaling-factor property must be specified in

		    order to utilize this property.



- qcom,cpr-ro-scaling-factor
@@ -485,11 +477,12 @@ Platform independent properties: 
		    list are ordered from the lowest fuse corner to the highest

		    fuse corner.



		    The tuple list grouping must contain either

		    qcom,cpr-fuse-combos number of tuple lists in which case the

		    lists are matched to fuse combinations 1-to-1 or the

		    grouping must contain exactly 1 list which is used

		    regardless of the fuse combination found on a given chip.

		    The tuple list grouping must contain qcom,cpr-fuse-combos

		    number of tuple lists in which case the lists are matched to

		    fuse combinations 1-to-1 or qcom,cpr-speed-bins number of

		    tuple lists in which case the lists are matched to

		    speed bins 1-to-1 or exactly 1 list which is used regardless

		    of the fuse combination and speed bin found on a given chip.



		    The target quotient adjustment to apply for each RO of a

		    given corner is determined by multiplying the adjustment
@@ -506,11 +499,13 @@ Platform independent properties: 
			0 - do not perform CPR aging adjustment

			1 - perform CPR aging adjustment



		    The list must contain either qcom,cpr-fuse-combos number of

		    elements in which case the elements are applied to fuse

		    combinations 1-to-1 or the list must contain exactly 1

		    element which is used regardless of the fuse combination

		    found on a given chip.

		    The list must contain qcom,cpr-fuse-combos number of

		    elements in which case the elements are matched to fuse

		    combinations 1-to-1 or qcom,cpr-speed-bins number of

		    elements in which case the elements are matched to

		    speed bins 1-to-1 or exactly 1 element which is used

		    regardless of the fuse combination and speed bin found

		    on a given chip.



- qcom,cpr-aging-max-voltage-adjustment

	Usage:      required if qcom,allow-aging-voltage-adjustment is specified
@@ -521,11 +516,8 @@ Platform independent properties: 
		    and the adjustment specified is greater than 0, then aging

		    adjustments are required for this regulator.



		    The list must contain either qcom,cpr-fuse-combos number of

		    elements in which case the max adjustments are applied to

		    fuse combinations 1-to-1 or the list must contain exactly 1

		    element which is used regardless of the fuse combination

		    found on a given chip.

		    The list must meet the same size requirements as those

		    specified for qcom,allow-aging-voltage-adjustment above.



- qcom,cpr-aging-ref-corner

	Usage:      required if qcom,allow-aging-voltage-adjustment is specified
@@ -534,11 +526,8 @@ Platform independent properties: 
		    for this regulator to use during aging measurements for each

		    fuse combination.



		    The list must contain either qcom,cpr-fuse-combos number of

		    elements in which case the max adjustments are applied to

		    fuse combinations 1-to-1 or the list must contain exactly 1

		    element which is used regardless of the fuse combination

		    found on a given chip.

		    The list must meet the same size requirements as those

		    specified for qcom,allow-aging-voltage-adjustment above.



- qcom,cpr-aging-ro-scaling-factor

	Usage:      required if qcom,allow-aging-voltage-adjustment is specified
@@ -547,11 +536,8 @@ Platform independent properties: 
		    oscillator (RO) scaling factor with units of QUOT/V to use

		    during aging measurements for each fuse combination.



		    The list must contain either qcom,cpr-fuse-combos number of

		    elements in which case the scaling factors are applied to

		    fuse combinations 1-to-1 or the list must contain exactly 1

		    element which is used regardless of the fuse combination

		    found on a given chip.

		    The list must meet the same size requirements as those

		    specified for qcom,allow-aging-voltage-adjustment above.



- qcom,cpr-aging-derate

	Usage:      optional, though only meaningful if

arch/arm/boot/dts/qcom/msm8996-regulator.dtsi

+281 −30

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/qcom/msm8996-v3.dtsi

+55 −0
Original line number Diff line number Diff line
@@ -395,6 +395,21 @@ 
			< 1401600000 14 >,

			< 1478400000 15 >,

			< 1593600000 16 >;

		qcom,pwrcl-speedbin1-v0 =

			<          0  0 >,

			<  307200000  1 >,

			<  422400000  2 >,

			<  480000000  3 >,

			<  556800000  4 >,

			<  652800000  5 >,

			<  729600000  6 >,

			<  844800000  7 >,

			<  960000000  8 >,

			< 1036800000  9 >,

			< 1113600000 10 >,

			< 1190400000 11 >,

			< 1228800000 12 >,

			< 1363200000 13 >;

		qcom,perfcl-speedbin0-v0 =

			<          0  0 >,

			<  307200000  1 >,
@@ -422,6 +437,29 @@ 
			< 1996800000 23 >,

			< 2073600000 24 >,

			< 2150400000 25 >;

		qcom,perfcl-speedbin1-v0 =

			<          0  0 >,

			<  307200000  1 >,

			<  403200000  2 >,

			<  480000000  3 >,

			<  556800000  4 >,

			<  652800000  5 >,

			<  729600000  6 >,

			<  806400000  7 >,

			<  883200000  8 >,

			<  940800000  9 >,

			< 1036800000 10 >,

			< 1113600000 11 >,

			< 1190400000 12 >,

			< 1248000000 13 >,

			< 1324800000 14 >,

			< 1401600000 15 >,

			< 1478400000 16 >,

			< 1555200000 17 >,

			< 1632000000 18 >,

			< 1708800000 19 >,

			< 1785600000 20 >,

			< 1804800000 21 >;

		qcom,cbf-speedbin0-v0 =

			<	   0  0 >,

			<  307200000  1 >,
@@ -443,6 +481,23 @@ 
			< 1459200000 17 >,

			< 1536000000 18 >,

			< 1593600000 19 >;

		qcom,cbf-speedbin1-v0 =

			<	   0  0 >,

			<  307200000  1 >,

			<  384000000  2 >,

			<  460800000  3 >,

			<  537600000  4 >,

			<  595200000  5 >,

			<  672000000  6 >,

			<  748800000  7 >,

			<  825600000  8 >,

			<  902400000  9 >,

			<  979200000 10 >,

			< 1056000000 11 >,

			< 1132800000 12 >,

			< 1190400000 13 >,

			< 1228800000 14 >,

			< 1305600000 15 >;

};



&msm_cpufreq {