cpufreq: davinci: move configuration to include/linux/platform_data
Subsystems (4)
PATCH 1/1 cpufreq: davinci: move configuration to include/linux/platform_data
From: Bartosz Golaszewski <[email protected]>
The header containing the configuration structure for davinci cpufreq driver lives in mach-davinci/include/mach/. This is fine for now but if we want to make davinci part of the multi_v5 build, no code external to mach-davinci should include machine-specific headers.
Move the configuration structure to include/linux/platform_data.
While we're at it: convert the GPL-2.0 boilerplate to a proper SPDX license identifier.
--- arch/arm/mach-davinci/da850.c | 2 +- arch/arm/mach-davinci/include/mach/cpufreq.h | 26 ------------------- drivers/cpufreq/davinci-cpufreq.c | 5 +--- include/linux/platform_data/davinci-cpufreq.h | 19 ++++++++++++++ 4 files changed, 21 insertions(+), 31 deletions(-) delete mode 100644 arch/arm/mach-davinci/include/mach/cpufreq.h create mode 100644 include/linux/platform_data/davinci-cpufreq.h
arch/arm/mach-davinci/da850.c +1 -1
@@ -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>
arch/arm/mach-davinci/include/mach/cpufreq.h deleted +0 -26
@@ -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
drivers/cpufreq/davinci-cpufreq.c +1 -4
@@ -23,13 +23,10 @@#include <linux/init.h> #include <linux/err.h> #include <linux/clk.h> +#include <linux/platform_data/davinci-cpufreq.h> #include <linux/platform_device.h> #include <linux/export.h> -#include <mach/hardware.h> -#include <mach/cpufreq.h> -#include <mach/common.h> -struct davinci_cpufreq {struct device *dev;struct clk *armclk;
include/linux/platform_data/davinci-cpufreq.h new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* TI DaVinci CPUFreq platform support. +* +* Copyright (C) 2009 Texas Instruments, Inc. http://www.ti.com/ +*/ + +#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 /* _MACH_DAVINCI_CPUFREQ_H */
Signature · 1 line
2.20.1
Quoted 108 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
The header containing the configuration structure for davinci cpufreq driver lives in mach-davinci/include/mach/. This is fine for now but if we want to make davinci part of the
multi_v5build, no code external to mach-davinci should include machine-specific headers.Move the configuration structure to
include/linux/platform_data.While we're at it: convert the GPL-2.0 boilerplate to a proper SPDX license identifier.
Signed-off-by Bartosz Golaszewski <[email protected]>--- arch/arm/mach-davinci/da850.c | 2 +- arch/arm/mach-davinci/include/mach/cpufreq.h | 26 ------------------- drivers/cpufreq/davinci-cpufreq.c | 5 +--- include/linux/platform_data/davinci-cpufreq.h | 19 ++++++++++++++ 4 files changed, 21 insertions(+), 31 deletions(-) delete mode 100644 arch/arm/mach-davinci/include/mach/cpufreq.h create mode 100644 include/linux/platform_data/davinci-cpufreq.harch/arm/mach-davinci/da850.c +1
-1@@ -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> arch/arm/mach-davinci/include/mach/cpufreq.h deleted +0
-26@@ -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 drivers/cpufreq/davinci-cpufreq.c +1
-4@@ -23,13 +23,10 @@#include <linux/init.h> #include <linux/err.h> #include <linux/clk.h> +#include <linux/platform_data/davinci-cpufreq.h> #include <linux/platform_device.h> #include <linux/export.h> -#include <mach/hardware.h> -#include <mach/cpufreq.h> -#include <mach/common.h> -struct davinci_cpufreq {struct device *dev;struct clk *armclk;include/linux/platform_data/davinci-cpufreq.h new file +9
-0@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* TI DaVinci CPUFreq platform support. +* +* Copyright (C) 2009 Texas Instruments, Inc. http://www.ti.com/ +*/ + +#ifndef _MACH_DAVINCI_CPUFREQ_H +#define _MACH_DAVINCI_CPUFREQ_H
include/linux/platform_data/davinci-cpufreq.h line 19
Quoted 10 lines
include/linux/platform_data/davinci-cpufreq.h new file +10
-0+ +#include <linux/cpufreq.h> + +struct davinci_cpufreq_config { +struct cpufreq_frequency_table *freq_table; +int (*set_voltage)(unsigned int index); +int (*init)(void ); +}; + +#endif /* _MACH_DAVINCI_CPUFREQ_H */
Applied. Thanks.
Signature · 1 line
viresh
Sekhar Nori
Acked-byQuoted 1 line · Viresh Kumar
Applied. Thanks.
Here is a belated ack from my side.
Thanks,
Sekhar
Viresh Kumar
maintainerQuoted 6 lines · Sekhar Nori
Quoted 1 line · Viresh Kumar
Applied. Thanks.
Here is a belated ack from my side.
Acked-by Sekhar Nori <[email protected]>
Included that and pushed again :)
Signature · 1 line
viresh