diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-02-24 21:18:05 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-02-24 21:18:05 +0100 |
| commit | 17162a117cd0733ad1db728fa804e62ded9a87d6 (patch) | |
| tree | 24339c44f10e0d524baabb4bd7535f9dd42ec872 /arch/arm | |
| parent | 8cbd468bdeb5ed3acac2d7a9f7494d5b77e46297 (diff) | |
| parent | 1222d527f314c86a3b59a522115d62facc5a7965 (diff) | |
| download | linux-0-day-17162a117cd0733ad1db728fa804e62ded9a87d6.tar.gz linux-0-day-17162a117cd0733ad1db728fa804e62ded9a87d6.tar.xz | |
Merge back earlier cpufreq material for v5.1.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-davinci/da850.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/cpufreq.h | 26 |
2 files changed, 1 insertions, 27 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index e7b78df2bfefb..a02ff431ba479 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -21,6 +21,7 @@ #include <linux/mfd/da8xx-cfgchip.h> #include <linux/platform_data/clk-da8xx-cfgchip.h> #include <linux/platform_data/clk-davinci-pll.h> +#include <linux/platform_data/davinci-cpufreq.h> #include <linux/platform_data/gpio-davinci.h> #include <linux/platform_device.h> #include <linux/regmap.h> @@ -29,7 +30,6 @@ #include <asm/mach/map.h> #include <mach/common.h> -#include <mach/cpufreq.h> #include <mach/cputype.h> #include <mach/da8xx.h> #include <mach/irqs.h> diff --git a/arch/arm/mach-davinci/include/mach/cpufreq.h b/arch/arm/mach-davinci/include/mach/cpufreq.h deleted file mode 100644 index 3c089cfb6cd63..0000000000000 --- a/arch/arm/mach-davinci/include/mach/cpufreq.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * TI DaVinci CPUFreq platform support. - * - * Copyright (C) 2009 Texas Instruments, Inc. http://www.ti.com/ - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation version 2. - * - * This program is distributed "as is" WITHOUT ANY WARRANTY of any - * kind, whether express or implied; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ -#ifndef _MACH_DAVINCI_CPUFREQ_H -#define _MACH_DAVINCI_CPUFREQ_H - -#include <linux/cpufreq.h> - -struct davinci_cpufreq_config { - struct cpufreq_frequency_table *freq_table; - int (*set_voltage) (unsigned int index); - int (*init) (void); -}; - -#endif |