Skip to content

Commit

Permalink
Merge tag 'opp-updates-6.3' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/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
  • Loading branch information
Rafael J. Wysocki committed Feb 14, 2023
2 parents ceaa837 + eca4c0e commit 9953706
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ examples:
L2_0: l2-cache {
compatible = "cache";
cache-level = <2>;
cache-unified;
};
};
Expand Down Expand Up @@ -140,6 +141,7 @@ examples:
L2_1: l2-cache {
compatible = "cache";
cache-level = <2>;
cache-unified;
};
};
Expand Down
4 changes: 3 additions & 1 deletion Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion drivers/opp/Kconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# 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
Expand Down
2 changes: 1 addition & 1 deletion drivers/opp/debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9953706

Please sign in to comment.