Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cpufreq: omap: remove driver

The omap-cpufreq driver is not used in the corresponding defconfigs.
The pseudo platform device to use it was removed by
commit cb6675d6a868 ("ARM: OMAP2+: Remove legacy PM init")
10 years ago.

Checking if there is any need to reactivate it:
For omap3, dra7 there is ti-cpufreq to create cpufreq-dt device
For omap2/4/5 there is cpufreq-dt-plat to create cpufreq-dt device.
For omap1 this driver cannot be selected at all.

So no users, no need to reactivate the driver somehow. So remove it.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Acked-by: Kevin Hilman <khilman@baylibre.com>
Link: https://patch.msgid.link/20260108-omap-cpufreq-removal-v1-1-8fe42f130f48@kemnade.info
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Andreas Kemnade and committed by
Rafael J. Wysocki
0cc7933c 78d83b29

-201
-5
drivers/cpufreq/Kconfig.arm
··· 141 141 The driver implements the cpufreq interface for this HW engine. 142 142 Say Y if you want to support CPUFreq HW. 143 143 144 - config ARM_OMAP2PLUS_CPUFREQ 145 - bool "TI OMAP2+" 146 - depends on ARCH_OMAP2PLUS || COMPILE_TEST 147 - default ARCH_OMAP2PLUS 148 - 149 144 config ARM_QCOM_CPUFREQ_NVMEM 150 145 tristate "Qualcomm nvmem based CPUFreq" 151 146 depends on ARCH_QCOM || COMPILE_TEST
-1
drivers/cpufreq/Makefile
··· 69 69 obj-$(CONFIG_ARM_MEDIATEK_CPUFREQ) += mediatek-cpufreq.o 70 70 obj-$(CONFIG_ARM_MEDIATEK_CPUFREQ_HW) += mediatek-cpufreq-hw.o 71 71 obj-$(CONFIG_MACH_MVEBU_V7) += mvebu-cpufreq.o 72 - obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o 73 72 obj-$(CONFIG_ARM_PXA2xx_CPUFREQ) += pxa2xx-cpufreq.o 74 73 obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o 75 74 obj-$(CONFIG_ARM_QCOM_CPUFREQ_HW) += qcom-cpufreq-hw.o
-195
drivers/cpufreq/omap-cpufreq.c
··· 1 - // SPDX-License-Identifier: GPL-2.0-only 2 - /* 3 - * CPU frequency scaling for OMAP using OPP information 4 - * 5 - * Copyright (C) 2005 Nokia Corporation 6 - * Written by Tony Lindgren <tony@atomide.com> 7 - * 8 - * Based on cpu-sa1110.c, Copyright (C) 2001 Russell King 9 - * 10 - * Copyright (C) 2007-2011 Texas Instruments, Inc. 11 - * - OMAP3/4 support by Rajendra Nayak, Santosh Shilimkar 12 - */ 13 - 14 - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 15 - 16 - #include <linux/types.h> 17 - #include <linux/kernel.h> 18 - #include <linux/sched.h> 19 - #include <linux/cpufreq.h> 20 - #include <linux/delay.h> 21 - #include <linux/init.h> 22 - #include <linux/err.h> 23 - #include <linux/clk.h> 24 - #include <linux/io.h> 25 - #include <linux/pm_opp.h> 26 - #include <linux/cpu.h> 27 - #include <linux/module.h> 28 - #include <linux/platform_device.h> 29 - #include <linux/regulator/consumer.h> 30 - 31 - /* OPP tolerance in percentage */ 32 - #define OPP_TOLERANCE 4 33 - 34 - static struct cpufreq_frequency_table *freq_table; 35 - static atomic_t freq_table_users = ATOMIC_INIT(0); 36 - static struct device *mpu_dev; 37 - static struct regulator *mpu_reg; 38 - 39 - static int omap_target(struct cpufreq_policy *policy, unsigned int index) 40 - { 41 - int r, ret; 42 - struct dev_pm_opp *opp; 43 - unsigned long freq, volt = 0, volt_old = 0, tol = 0; 44 - unsigned int old_freq, new_freq; 45 - 46 - old_freq = policy->cur; 47 - new_freq = freq_table[index].frequency; 48 - 49 - freq = new_freq * 1000; 50 - ret = clk_round_rate(policy->clk, freq); 51 - if (ret < 0) { 52 - dev_warn(mpu_dev, 53 - "CPUfreq: Cannot find matching frequency for %lu\n", 54 - freq); 55 - return ret; 56 - } 57 - freq = ret; 58 - 59 - if (mpu_reg) { 60 - opp = dev_pm_opp_find_freq_ceil(mpu_dev, &freq); 61 - if (IS_ERR(opp)) { 62 - dev_err(mpu_dev, "%s: unable to find MPU OPP for %d\n", 63 - __func__, new_freq); 64 - return -EINVAL; 65 - } 66 - volt = dev_pm_opp_get_voltage(opp); 67 - dev_pm_opp_put(opp); 68 - tol = volt * OPP_TOLERANCE / 100; 69 - volt_old = regulator_get_voltage(mpu_reg); 70 - } 71 - 72 - dev_dbg(mpu_dev, "cpufreq-omap: %u MHz, %ld mV --> %u MHz, %ld mV\n", 73 - old_freq / 1000, volt_old ? volt_old / 1000 : -1, 74 - new_freq / 1000, volt ? volt / 1000 : -1); 75 - 76 - /* scaling up? scale voltage before frequency */ 77 - if (mpu_reg && (new_freq > old_freq)) { 78 - r = regulator_set_voltage(mpu_reg, volt - tol, volt + tol); 79 - if (r < 0) { 80 - dev_warn(mpu_dev, "%s: unable to scale voltage up.\n", 81 - __func__); 82 - return r; 83 - } 84 - } 85 - 86 - ret = clk_set_rate(policy->clk, new_freq * 1000); 87 - 88 - /* scaling down? scale voltage after frequency */ 89 - if (mpu_reg && (new_freq < old_freq)) { 90 - r = regulator_set_voltage(mpu_reg, volt - tol, volt + tol); 91 - if (r < 0) { 92 - dev_warn(mpu_dev, "%s: unable to scale voltage down.\n", 93 - __func__); 94 - clk_set_rate(policy->clk, old_freq * 1000); 95 - return r; 96 - } 97 - } 98 - 99 - return ret; 100 - } 101 - 102 - static inline void freq_table_free(void) 103 - { 104 - if (atomic_dec_and_test(&freq_table_users)) 105 - dev_pm_opp_free_cpufreq_table(mpu_dev, &freq_table); 106 - } 107 - 108 - static int omap_cpu_init(struct cpufreq_policy *policy) 109 - { 110 - int result; 111 - 112 - policy->clk = clk_get(NULL, "cpufreq_ck"); 113 - if (IS_ERR(policy->clk)) 114 - return PTR_ERR(policy->clk); 115 - 116 - if (!freq_table) { 117 - result = dev_pm_opp_init_cpufreq_table(mpu_dev, &freq_table); 118 - if (result) { 119 - dev_err(mpu_dev, 120 - "%s: cpu%d: failed creating freq table[%d]\n", 121 - __func__, policy->cpu, result); 122 - clk_put(policy->clk); 123 - return result; 124 - } 125 - } 126 - 127 - atomic_inc_return(&freq_table_users); 128 - 129 - /* FIXME: what's the actual transition time? */ 130 - cpufreq_generic_init(policy, freq_table, 300 * 1000); 131 - 132 - return 0; 133 - } 134 - 135 - static void omap_cpu_exit(struct cpufreq_policy *policy) 136 - { 137 - freq_table_free(); 138 - clk_put(policy->clk); 139 - } 140 - 141 - static struct cpufreq_driver omap_driver = { 142 - .flags = CPUFREQ_NEED_INITIAL_FREQ_CHECK, 143 - .verify = cpufreq_generic_frequency_table_verify, 144 - .target_index = omap_target, 145 - .get = cpufreq_generic_get, 146 - .init = omap_cpu_init, 147 - .exit = omap_cpu_exit, 148 - .register_em = cpufreq_register_em_with_opp, 149 - .name = "omap", 150 - }; 151 - 152 - static int omap_cpufreq_probe(struct platform_device *pdev) 153 - { 154 - mpu_dev = get_cpu_device(0); 155 - if (!mpu_dev) { 156 - pr_warn("%s: unable to get the MPU device\n", __func__); 157 - return -EINVAL; 158 - } 159 - 160 - mpu_reg = regulator_get(mpu_dev, "vcc"); 161 - if (IS_ERR(mpu_reg)) { 162 - pr_warn("%s: unable to get MPU regulator\n", __func__); 163 - mpu_reg = NULL; 164 - } else { 165 - /* 166 - * Ensure physical regulator is present. 167 - * (e.g. could be dummy regulator.) 168 - */ 169 - if (regulator_get_voltage(mpu_reg) < 0) { 170 - pr_warn("%s: physical regulator not present for MPU\n", 171 - __func__); 172 - regulator_put(mpu_reg); 173 - mpu_reg = NULL; 174 - } 175 - } 176 - 177 - return cpufreq_register_driver(&omap_driver); 178 - } 179 - 180 - static void omap_cpufreq_remove(struct platform_device *pdev) 181 - { 182 - cpufreq_unregister_driver(&omap_driver); 183 - } 184 - 185 - static struct platform_driver omap_cpufreq_platdrv = { 186 - .driver = { 187 - .name = "omap-cpufreq", 188 - }, 189 - .probe = omap_cpufreq_probe, 190 - .remove = omap_cpufreq_remove, 191 - }; 192 - module_platform_driver(omap_cpufreq_platdrv); 193 - 194 - MODULE_DESCRIPTION("cpufreq driver for OMAP SoCs"); 195 - MODULE_LICENSE("GPL");