Skip to content

Commit d7d36c3

Browse files
committed
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
2 parents 5cdfedf + 8655a4e commit d7d36c3

6 files changed

Lines changed: 23 additions & 9 deletions

File tree

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra-ccplex-cluster.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ properties:
2424
enum:
2525
- nvidia,tegra186-ccplex-cluster
2626
- nvidia,tegra234-ccplex-cluster
27+
- nvidia,tegra238-ccplex-cluster
2728

2829
reg:
2930
maxItems: 1

Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ properties:
3535
- description: v2 of CPUFREQ HW (EPSS)
3636
items:
3737
- enum:
38+
- qcom,eliza-cpufreq-epss
3839
- qcom,milos-cpufreq-epss
3940
- qcom,qcs8300-cpufreq-epss
4041
- qcom,qdu1000-cpufreq-epss

MAINTAINERS

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6616,6 +6616,17 @@ M: Bence Csókás <bence98@sch.bme.hu>
66166616
S: Maintained
66176617
F: drivers/i2c/busses/i2c-cp2615.c
66186618

6619+
CPU FREQUENCY DRIVERS - CPPC CPUFREQ
6620+
M: "Rafael J. Wysocki" <rafael@kernel.org>
6621+
M: Viresh Kumar <viresh.kumar@linaro.org>
6622+
R: Jie Zhan <zhanjie9@hisilicon.com>
6623+
R: Lifeng Zheng <zhenglifeng1@huawei.com>
6624+
R: Pierre Gondois <pierre.gondois@arm.com>
6625+
R: Sumit Gupta <sumitg@nvidia.com>
6626+
L: linux-pm@vger.kernel.org
6627+
S: Maintained
6628+
F: drivers/cpufreq/cppc_cpufreq.c
6629+
66196630
CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
66206631
M: Viresh Kumar <viresh.kumar@linaro.org>
66216632
M: Sudeep Holla <sudeep.holla@kernel.org>
@@ -6624,6 +6635,12 @@ S: Maintained
66246635
W: http://www.arm.com/products/processors/technologies/biglittleprocessing.php
66256636
F: drivers/cpufreq/vexpress-spc-cpufreq.c
66266637

6638+
CPU FREQUENCY DRIVERS - VIRTUAL MACHINE CPUFREQ
6639+
M: Saravana Kannan <saravanak@kernel.org>
6640+
L: linux-pm@vger.kernel.org
6641+
S: Maintained
6642+
F: drivers/cpufreq/virtual-cpufreq.c
6643+
66276644
CPU FREQUENCY SCALING FRAMEWORK
66286645
M: "Rafael J. Wysocki" <rafael@kernel.org>
66296646
M: Viresh Kumar <viresh.kumar@linaro.org>
@@ -6643,12 +6660,6 @@ F: kernel/sched/cpufreq*.c
66436660
F: rust/kernel/cpufreq.rs
66446661
F: tools/testing/selftests/cpufreq/
66456662

6646-
CPU FREQUENCY DRIVERS - VIRTUAL MACHINE CPUFREQ
6647-
M: Saravana Kannan <saravanak@kernel.org>
6648-
L: linux-pm@vger.kernel.org
6649-
S: Maintained
6650-
F: drivers/cpufreq/virtual-cpufreq.c
6651-
66526663
CPU HOTPLUG
66536664
M: Thomas Gleixner <tglx@kernel.org>
66546665
M: Peter Zijlstra <peterz@infradead.org>

drivers/cpufreq/Kconfig.arm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ config ARM_TEGRA186_CPUFREQ
248248

249249
config ARM_TEGRA194_CPUFREQ
250250
tristate "Tegra194 CPUFreq support"
251-
depends on ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC || (64BIT && COMPILE_TEST)
251+
depends on ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC
252252
depends on TEGRA_BPMP
253253
default ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC
254254
help

drivers/cpufreq/cpufreq-dt-platdev.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ static const struct of_device_id blocklist[] __initconst = {
159159
{ .compatible = "qcom,qcm2290", },
160160
{ .compatible = "qcom,qcm6490", },
161161
{ .compatible = "qcom,qcs404", },
162+
{ .compatible = "qcom,qcs8300", },
162163
{ .compatible = "qcom,qdu1000", },
163164
{ .compatible = "qcom,sa8155p" },
164165
{ .compatible = "qcom,sa8540p" },

drivers/cpufreq/tegra194-cpufreq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ static const struct tegra_cpufreq_soc tegra234_cpufreq_soc = {
196196
.refclk_delta_min = 16000,
197197
};
198198

199-
static const struct tegra_cpufreq_soc tegra239_cpufreq_soc = {
199+
static const struct tegra_cpufreq_soc tegra238_cpufreq_soc = {
200200
.ops = &tegra234_cpufreq_ops,
201201
.actmon_cntr_base = 0x4000,
202202
.maxcpus_per_cluster = 8,
@@ -807,7 +807,7 @@ static void tegra194_cpufreq_remove(struct platform_device *pdev)
807807
static const struct of_device_id tegra194_cpufreq_of_match[] = {
808808
{ .compatible = "nvidia,tegra194-ccplex", .data = &tegra194_cpufreq_soc },
809809
{ .compatible = "nvidia,tegra234-ccplex-cluster", .data = &tegra234_cpufreq_soc },
810-
{ .compatible = "nvidia,tegra239-ccplex-cluster", .data = &tegra239_cpufreq_soc },
810+
{ .compatible = "nvidia,tegra238-ccplex-cluster", .data = &tegra238_cpufreq_soc },
811811
{ /* sentinel */ }
812812
};
813813
MODULE_DEVICE_TABLE(of, tegra194_cpufreq_of_match);

0 commit comments

Comments
 (0)