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

Merge tag 'cpufreq-arm-updates-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm

Pull CPUFreq Arm updates for 7.1 from Viresh Kumar:

"- Update qcom-hw DT bindings to include Eliza hardware (Abel Vesa).

 - Update cpufreq-dt-platdev blocklist (Faruque Ansari).

 - Minor updates to driver and dt-bindings for Tegra (Thierry Reding and
   Rosen Penev).

 - Add MAINTAINERS entry for CPPC driver (Viresh Kumar)."

* tag 'cpufreq-arm-updates-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  cpufreq: tegra194: remove COMPILE_TEST
  cpufreq: Add QCS8300 to cpufreq-dt-platdev blocklist
  cpufreq: Add MAINTAINERS entry for CPPC driver
  cpufreq: tegra194: Rename Tegra239 to Tegra238
  dt-bindings: arm: nvidia: Document the Tegra238 CCPLEX cluster
  dt-bindings: cpufreq: qcom-hw: document Eliza cpufreq hardware
parents 5cdfedf6 8655a4e3
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties:
    enum:
      - nvidia,tegra186-ccplex-cluster
      - nvidia,tegra234-ccplex-cluster
      - nvidia,tegra238-ccplex-cluster

  reg:
    maxItems: 1
+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ properties:
      - description: v2 of CPUFREQ HW (EPSS)
        items:
          - enum:
              - qcom,eliza-cpufreq-epss
              - qcom,milos-cpufreq-epss
              - qcom,qcs8300-cpufreq-epss
              - qcom,qdu1000-cpufreq-epss
+17 −6
Original line number Diff line number Diff line
@@ -6616,6 +6616,17 @@ M: Bence Csókás <bence98@sch.bme.hu>
S:	Maintained
F:	drivers/i2c/busses/i2c-cp2615.c
CPU FREQUENCY DRIVERS - CPPC CPUFREQ
M:	"Rafael J. Wysocki" <rafael@kernel.org>
M:	Viresh Kumar <viresh.kumar@linaro.org>
R:	Jie Zhan <zhanjie9@hisilicon.com>
R:	Lifeng Zheng <zhenglifeng1@huawei.com>
R:	Pierre Gondois <pierre.gondois@arm.com>
R:	Sumit Gupta <sumitg@nvidia.com>
L:	linux-pm@vger.kernel.org
S:	Maintained
F:	drivers/cpufreq/cppc_cpufreq.c
CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
M:	Viresh Kumar <viresh.kumar@linaro.org>
M:	Sudeep Holla <sudeep.holla@kernel.org>
@@ -6624,6 +6635,12 @@ S: Maintained
W:	http://www.arm.com/products/processors/technologies/biglittleprocessing.php
F:	drivers/cpufreq/vexpress-spc-cpufreq.c
CPU FREQUENCY DRIVERS - VIRTUAL MACHINE CPUFREQ
M:	Saravana Kannan <saravanak@kernel.org>
L:	linux-pm@vger.kernel.org
S:	Maintained
F:	drivers/cpufreq/virtual-cpufreq.c
CPU FREQUENCY SCALING FRAMEWORK
M:	"Rafael J. Wysocki" <rafael@kernel.org>
M:	Viresh Kumar <viresh.kumar@linaro.org>
@@ -6643,12 +6660,6 @@ F: kernel/sched/cpufreq*.c
F:	rust/kernel/cpufreq.rs
F:	tools/testing/selftests/cpufreq/
CPU FREQUENCY DRIVERS - VIRTUAL MACHINE CPUFREQ
M:	Saravana Kannan <saravanak@kernel.org>
L:	linux-pm@vger.kernel.org
S:	Maintained
F:	drivers/cpufreq/virtual-cpufreq.c
CPU HOTPLUG
M:	Thomas Gleixner <tglx@kernel.org>
M:	Peter Zijlstra <peterz@infradead.org>
+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ config ARM_TEGRA186_CPUFREQ

config ARM_TEGRA194_CPUFREQ
	tristate "Tegra194 CPUFreq support"
	depends on ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC || (64BIT && COMPILE_TEST)
	depends on ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC
	depends on TEGRA_BPMP
	default ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC
	help
+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ static const struct of_device_id blocklist[] __initconst = {
	{ .compatible = "qcom,qcm2290", },
	{ .compatible = "qcom,qcm6490", },
	{ .compatible = "qcom,qcs404", },
	{ .compatible = "qcom,qcs8300", },
	{ .compatible = "qcom,qdu1000", },
	{ .compatible = "qcom,sa8155p" },
	{ .compatible = "qcom,sa8540p" },
Loading