Skip to content

Commit 9953706

Browse files
committed
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
2 parents ceaa837 + eca4c0e commit 9953706

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ examples:
106106
L2_0: l2-cache {
107107
compatible = "cache";
108108
cache-level = <2>;
109+
cache-unified;
109110
};
110111
};
111112
@@ -140,6 +141,7 @@ examples:
140141
L2_1: l2-cache {
141142
compatible = "cache";
142143
cache-level = <2>;
144+
cache-unified;
143145
};
144146
};
145147

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ patternProperties:
3030
this OPP node. Sometimes several corners/levels shares a certain fuse
3131
corner/level. A fuse corner/level contains e.g. ref uV, min uV,
3232
and max uV.
33-
$ref: /schemas/types.yaml#/definitions/uint32
33+
$ref: /schemas/types.yaml#/definitions/uint32-array
34+
minItems: 1
35+
maxItems: 2
3436

3537
required:
3638
- opp-level

drivers/opp/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config PM_OPP
33
bool
4-
select SRCU
54
help
65
SOCs have a standard set of tuples consisting of frequency and
76
voltage pairs that the device will support per voltage domain. This

drivers/opp/debugfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ static void opp_migrate_dentry(struct opp_device *opp_dev,
235235

236236
dentry = debugfs_rename(rootdir, opp_dev->dentry, rootdir,
237237
opp_table->dentry_name);
238-
if (!dentry) {
238+
if (IS_ERR(dentry)) {
239239
dev_err(dev, "%s: Failed to rename link from: %s to %s\n",
240240
__func__, dev_name(opp_dev->dev), dev_name(dev));
241241
return;

0 commit comments

Comments
 (0)