From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 30 May 2025 18:11:09 +0000 (+0200)
Subject: Merge branch 'pm-cpufreq'
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=25961ae6c80b2b940e941f0b3bd0c5c8c1b9ee60;p=linux-2.6-microblaze.git

Merge branch 'pm-cpufreq'

Merge Rust support for cpufreq and OPP, a new Rust-based cpufreq-dt
driver, an SCMI cpufreq driver cleanup, and an ACPI cpufreq driver
regression fix:

 - Add Rust abstractions for CPUFreq framework (Viresh Kumar).

 - Add Rust abstractions for OPP framework (Viresh Kumar).

 - Add basic Rust abstractions for Clk and Cpumask frameworks (Viresh
   Kumar).

 - Clean up the SCMI cpufreq driver somewhat (Mike Tipton).

 - Use KHz as the nominal_freq units in get_max_boost_ratio() in the
   ACPI cpufreq driver (iGautham Shenoy).

* pm-cpufreq:
  acpi-cpufreq: Fix nominal_freq units to KHz in get_max_boost_ratio()
  rust: opp: Move `cfg(CONFIG_OF)` attribute to the top of doc test
  rust: opp: Make the doctest example depend on CONFIG_OF
  cpufreq: scmi: Skip SCMI devices that aren't used by the CPUs
  cpufreq: Add Rust-based cpufreq-dt driver
  rust: opp: Extend OPP abstractions with cpufreq support
  rust: cpufreq: Extend abstractions for driver registration
  rust: cpufreq: Extend abstractions for policy and driver ops
  rust: cpufreq: Add initial abstractions for cpufreq framework
  rust: opp: Add abstractions for the configuration options
  rust: opp: Add abstractions for the OPP table
  rust: opp: Add initial abstractions for OPP framework
  rust: cpu: Add from_cpu()
  rust: macros: enable use of hyphens in module names
  rust: clk: Add initial abstractions
  rust: clk: Add helpers for Rust code
  MAINTAINERS: Add entry for Rust cpumask API
  rust: cpumask: Add initial abstractions
  rust: cpumask: Add few more helpers
---

25961ae6c80b2b940e941f0b3bd0c5c8c1b9ee60
diff --cc rust/bindings/bindings_helper.h
index f600a1f945f4,7c1d78f68076..a5a6fb45d405
--- a/rust/bindings/bindings_helper.h
+++ b/rust/bindings/bindings_helper.h
@@@ -16,7 -10,9 +16,10 @@@
  #include <linux/blk-mq.h>
  #include <linux/blk_types.h>
  #include <linux/blkdev.h>
+ #include <linux/clk.h>
 +#include <linux/configfs.h>
+ #include <linux/cpu.h>
+ #include <linux/cpufreq.h>
  #include <linux/cpumask.h>
  #include <linux/cred.h>
  #include <linux/device/faux.h>
diff --cc rust/kernel/lib.rs
index 1cf1bd5b73fc,133ebee4f9d3..24440751ca26
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@@ -44,8 -42,11 +44,13 @@@ pub mod auxiliary
  pub mod block;
  #[doc(hidden)]
  pub mod build_assert;
+ pub mod clk;
 +#[cfg(CONFIG_CONFIGFS_FS)]
 +pub mod configfs;
+ pub mod cpu;
+ #[cfg(CONFIG_CPU_FREQ)]
+ pub mod cpufreq;
+ pub mod cpumask;
  pub mod cred;
  pub mod device;
  pub mod device_id;