Commit 42f9508b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "These fix an uninitialized variable usage in the operating performance
  points code and add missing DT bindings for it.

  Specifics:

   - Fix uninitialized variable usage in dev_pm_opp_config_clks_simple()
     (Christophe JAILLET)

   - Add missing OPP DT properties (Rob Herring)"

* tag 'pm-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  dt-bindings: opp: Add missing (unevaluated|additional)Properties on child nodes
  OPP: Fix an un-initialized variable usage
parents 1a61b828 9614369a

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

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ properties: 
patternProperties:

  '^opp-?[0-9]+$':

    type: object

    additionalProperties: false



    properties:

      opp-hz: true

Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
patternProperties:

  '^opp-?[0-9]+$':

    type: object

    additionalProperties: false



    properties:

      opp-level: true

drivers/opp/core.c

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ int dev_pm_opp_config_clks_simple(struct device *dev, 
		}

	}



	return ret;

	return 0;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_config_clks_simple);