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

Merge tag 'opp-fixes-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm 

Pull OPP fixes for 6.0 from Viresh Kumar:

"- Fix un-initialized variable usage (Christophe JAILLET).

 - Add missing DT properties (Rob Herring)."

* tag 'opp-fixes-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  dt-bindings: opp: Add missing (unevaluated|additional)Properties on child nodes
  OPP: Fix an un-initialized variable usage
parents 521a547c c7e31e36

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);