summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-09-06 21:53:13 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-09-06 21:53:13 +0300
commit339d9d8792aef5b42909c8732ee7c228d0eca310 (patch)
tree09a6fd3cba01525bd10f67e6e96c1e2259532441
parent431c1646e1f86b949fa3685efc50b660a364c2b6 (diff)
parenta84372012e9329daba8082efac98f3bc0b443aa2 (diff)
downloadlinux-339d9d8792aef5b42909c8732ee7c228d0eca310.tar.xz
Merge tag 'opp-updates-6.12' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/vireshk/pm
Merge OPP Updates for 6.12 from Viresh Kumar: "- Update maintainers for operating-points-v2-ti-cpu file (Dhruva Gole). - Drop unnecessary of_match_ptr() for TI driver (Rob Herring)." * tag 'opp-updates-6.12' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/vireshk/pm: dt-bindings: opp: operating-points-v2-ti-cpu: Update maintainers opp: ti: Drop unnecessary of_match_ptr()
-rw-r--r--Documentation/devicetree/bindings/opp/operating-points-v2-ti-cpu.yaml2
-rw-r--r--drivers/opp/ti-opp-supply.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/opp/operating-points-v2-ti-cpu.yaml b/Documentation/devicetree/bindings/opp/operating-points-v2-ti-cpu.yaml
index 02d1d2c17129..fd0c8d5c5f3e 100644
--- a/Documentation/devicetree/bindings/opp/operating-points-v2-ti-cpu.yaml
+++ b/Documentation/devicetree/bindings/opp/operating-points-v2-ti-cpu.yaml
@@ -19,7 +19,7 @@ description:
the hardware description for the scheme mentioned above.
maintainers:
- - Nishanth Menon <nm@ti.com>
+ - Dhruva Gole <d-gole@ti.com>
allOf:
- $ref: opp-v2-base.yaml#
diff --git a/drivers/opp/ti-opp-supply.c b/drivers/opp/ti-opp-supply.c
index ec0056a4bb13..5f0fb3ea385b 100644
--- a/drivers/opp/ti-opp-supply.c
+++ b/drivers/opp/ti-opp-supply.c
@@ -405,7 +405,7 @@ static struct platform_driver ti_opp_supply_driver = {
.probe = ti_opp_supply_probe,
.driver = {
.name = "ti_opp_supply",
- .of_match_table = of_match_ptr(ti_opp_supply_of_match),
+ .of_match_table = ti_opp_supply_of_match,
},
};
module_platform_driver(ti_opp_supply_driver);