Commit f0f8e9e7 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'cpufreq-arm-updates-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm 

Pull cpufreq ARM updates for 6.3 from Viresh Kumar:

"- Enable thermal cooling for Tegra194 (Yi-Wei Wang).

 - Register module device table and add missing compatibles for
   cpufreq-qcom-hw (Nícolas F. R. A. Prado, Abel Vesa and Luca Weiss).

 - Various dt binding updates for qcom-cpufreq-nvmem and opp-v2-kryo-cpu
   (Christian Marangi)."

* tag 'cpufreq-arm-updates-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  dt-bindings: opp: opp-v2-kryo-cpu: enlarge opp-supported-hw maximum
  dt-bindings: cpufreq: qcom-cpufreq-nvmem: make cpr bindings optional
  dt-bindings: cpufreq: qcom-cpufreq-nvmem: specify supported opp tables
  dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM8550 compatible
  dt-bindings: cpufreq: cpufreq-qcom-hw: Add missing compatibles
  cpufreq: mediatek-hw: Register to module device table
  cpufreq: tegra194: Enable CPUFREQ thermal cooling
parents 3500e221 ba38f3cb

Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml

+5 −0
Original line number Diff line number Diff line
@@ -26,8 +26,13 @@ properties: 
        items:

          - enum:

              - qcom,qdu1000-cpufreq-epss

              - qcom,sc7280-cpufreq-epss

              - qcom,sc8280xp-cpufreq-epss

              - qcom,sm6375-cpufreq-epss

              - qcom,sm8250-cpufreq-epss

              - qcom,sm8350-cpufreq-epss

              - qcom,sm8450-cpufreq-epss

              - qcom,sm8550-cpufreq-epss

          - const: qcom,cpufreq-epss



  reg:

Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml

+56 −25
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ description: | 
  on the CPU OPP in use. The CPUFreq driver sets the CPR power domain level

  according to the required OPPs defined in the CPU OPP tables.



  For old implementation efuses are parsed to select the correct opp table and

  voltage and CPR is not supported/used.



select:

  properties:

    compatible:
@@ -33,6 +36,34 @@ select: 
  required:

    - compatible



patternProperties:

  '^opp-table(-[a-z0-9]+)?$':

    allOf:

      - if:

          properties:

            compatible:

              const: operating-points-v2-kryo-cpu

        then:

          $ref: /schemas/opp/opp-v2-kryo-cpu.yaml#



      - if:

          properties:

            compatible:

              const: operating-points-v2-qcom-level

        then:

          $ref: /schemas/opp/opp-v2-qcom-level.yaml#



    unevaluatedProperties: false



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,qcs404



    then:

      properties:

        cpus:

          type: object

Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml

+13 −3
Original line number Diff line number Diff line
@@ -50,12 +50,22 @@ patternProperties: 
      opp-supported-hw:

        description: |

          A single 32 bit bitmap value, representing compatible HW.

          Bitmap:

          Bitmap for MSM8996 format:

          0:  MSM8996, speedbin 0

          1:  MSM8996, speedbin 1

          2:  MSM8996, speedbin 2

          3-31:  unused

        maximum: 0x7

          3:  MSM8996, speedbin 3

          4-31:  unused



          Bitmap for MSM8996SG format (speedbin shifted of 4 left):

          0-3:  unused

          4:  MSM8996SG, speedbin 0

          5:  MSM8996SG, speedbin 1

          6:  MSM8996SG, speedbin 2

          7-31:  unused

        enum: [0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,

               0x9, 0xd, 0xe, 0xf,

               0x10, 0x20, 0x30, 0x70]



      clock-latency-ns: true

drivers/cpufreq/mediatek-cpufreq-hw.c

+1 −0
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ static const struct of_device_id mtk_cpufreq_hw_match[] = { 
	{ .compatible = "mediatek,cpufreq-hw", .data = &cpufreq_mtk_offsets },

	{}

};

MODULE_DEVICE_TABLE(of, mtk_cpufreq_hw_match);



static struct platform_driver mtk_cpufreq_hw_driver = {

	.probe = mtk_cpufreq_hw_driver_probe,

drivers/cpufreq/tegra194-cpufreq.c

+2 −1
Original line number Diff line number Diff line
@@ -411,7 +411,8 @@ static int tegra194_cpufreq_set_target(struct cpufreq_policy *policy, 


static struct cpufreq_driver tegra194_cpufreq_driver = {

	.name = "tegra194",

	.flags = CPUFREQ_CONST_LOOPS | CPUFREQ_NEED_INITIAL_FREQ_CHECK,

	.flags = CPUFREQ_CONST_LOOPS | CPUFREQ_NEED_INITIAL_FREQ_CHECK |

		 CPUFREQ_IS_COOLING_DEV,

	.verify = cpufreq_generic_frequency_table_verify,

	.target_index = tegra194_cpufreq_set_target,

	.get = tegra194_get_speed,