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

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

Pull OPP (Operating Performance Points) updates for 6.3 from Viresh
Kumar:

"- Add missing 'cache-unified' property in example for kryo OPP bindings
   (Rob Herring).

 - Fix error checking in opp_migrate_dentry() (Qi Zheng).

 - Remove "select SRCU" (Paul E. McKenney).

 - Let qcom,opp-fuse-level be a 2-long array for qcom SoCs (Konrad
   Dybcio)."

* tag 'opp-updates-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  OPP: fix error checking in opp_migrate_dentry()
  dt-bindings: opp: v2-qcom-level: Let qcom,opp-fuse-level be a 2-long array
  drivers/opp: Remove "select SRCU"
  dt-bindings: opp: opp-v2-kryo-cpu: Add missing 'cache-unified' property in example
parents ceaa837f eca4c0ee

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

+2 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ examples: 
                L2_0: l2-cache {

                    compatible = "cache";

                    cache-level = <2>;

                    cache-unified;

                };

            };
@@ -140,6 +141,7 @@ examples: 
                L2_1: l2-cache {

                    compatible = "cache";

                    cache-level = <2>;

                    cache-unified;

                };

            };

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

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ patternProperties: 
          this OPP node. Sometimes several corners/levels shares a certain fuse

          corner/level. A fuse corner/level contains e.g. ref uV, min uV,

          and max uV.

        $ref: /schemas/types.yaml#/definitions/uint32

        $ref: /schemas/types.yaml#/definitions/uint32-array

        minItems: 1

        maxItems: 2



    required:

      - opp-level

drivers/opp/Kconfig

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config PM_OPP

	bool

	select SRCU

	help

	  SOCs have a standard set of tuples consisting of frequency and

	  voltage pairs that the device will support per voltage domain. This

drivers/opp/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static void opp_migrate_dentry(struct opp_device *opp_dev, 


	dentry = debugfs_rename(rootdir, opp_dev->dentry, rootdir,

				opp_table->dentry_name);

	if (!dentry) {

	if (IS_ERR(dentry)) {

		dev_err(dev, "%s: Failed to rename link from: %s to %s\n",

			__func__, dev_name(opp_dev->dev), dev_name(dev));

		return;