From: Viresh Kumar <viresh.kumar@linaro.org> To: Kukjin Kim <kgene.kim@samsung.com> Cc: rjw@sisk.pl, robin.randhawa@arm.com, Steve.Bannister@arm.com, Liviu.Dudau@arm.com, charles.garcia-tobin@arm.com, arvind.chauhan@arm.com, cpufreq@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org, patches@linaro.org, Ben Dooks <ben-linux@fluff.org>, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq Date: Fri, 5 Apr 2013 12:36:34 +0530 [thread overview] Message-ID: <CAKohpokk1Q+0gRpeW=ts0a8D+rGAUpHu62X+7ejdpfom_B6FYA@mail.gmail.com> (raw) In-Reply-To: <2a5901ce31c9$95160980$bf421c80$%kim@samsung.com> [-- Attachment #1: Type: text/plain, Size: 1239 bytes --] On 5 April 2013 12:18, Kukjin Kim <kgene.kim@samsung.com> wrote: > Basically, this moving looks good to me, but should be re-worked based on > for-next of samsung tree because this touches too many samsung stuff so this > should be sent to upstream via samsung tree. Hmm... Its already applied in Rafael's tree. But it doesn't mean that it can't be moved to your tree if there is a issue. What tree/branch? I used: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git for-next > Applying: cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq > error: patch failed: arch/arm/Kconfig:2166 > error: arch/arm/Kconfig: patch does not apply above two are obvious as you haven't applied other patches in this series. > error: patch failed: arch/arm/mach-s3c24xx/Kconfig:28 > error: arch/arm/mach-s3c24xx/Kconfig: patch does not apply > error: patch failed: arch/arm/mach-s3c24xx/Makefile:17 > error: arch/arm/mach-s3c24xx/Makefile: patch does not apply > error: patch failed: drivers/cpufreq/Makefile:63 > error: drivers/cpufreq/Makefile: patch does not apply Same here. > error: drivers/cpufreq/s3c2412-cpufreq.c: does not exist in index I can still see it in for-next. Attached is my patch based of your for-next [-- Attachment #2: 0001-cpufreq-s3c24xx-move-cpufreq-driver-to-drivers-cpufr.patch --] [-- Type: application/octet-stream, Size: 18050 bytes --] From 82f51a4ba40eb7d0af8dd49abcbece5d49467408 Mon Sep 17 00:00:00 2001 Message-Id: <82f51a4ba40eb7d0af8dd49abcbece5d49467408.1365145398.git.viresh.kumar@linaro.org> From: Viresh Kumar <viresh.kumar@linaro.org> Date: Thu, 4 Apr 2013 12:54:15 +0000 Subject: [PATCH] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq This patch moves cpufreq driver of Samsung's ARM based s3c24xx platform to drivers/cpufreq. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Conflicts: arch/arm/Kconfig arch/arm/mach-s3c24xx/Kconfig arch/arm/mach-s3c24xx/Makefile drivers/cpufreq/Makefile --- arch/arm/Kconfig | 47 --------------- arch/arm/mach-s3c24xx/Kconfig | 66 +++++++++------------- arch/arm/mach-s3c24xx/Makefile | 6 -- arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h | 0 arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +- arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 10 ++-- arch/arm/plat-samsung/include/plat/cpu-freq.h | 6 +- drivers/cpufreq/Kconfig.arm | 58 +++++++++++++++++++ drivers/cpufreq/Makefile | 9 ++- .../cpufreq/s3c2410-cpufreq.c | 0 .../cpufreq/s3c2412-cpufreq.c | 3 +- .../cpufreq/s3c2440-cpufreq.c | 0 .../cpufreq/s3c24xx-cpufreq-debugfs.c | 0 .../cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c | 0 14 files changed, 102 insertions(+), 105 deletions(-) rename arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h (100%) rename arch/arm/mach-s3c24xx/cpufreq-s3c2410.c => drivers/cpufreq/s3c2410-cpufreq.c (100%) rename arch/arm/mach-s3c24xx/cpufreq-s3c2412.c => drivers/cpufreq/s3c2412-cpufreq.c (99%) rename arch/arm/mach-s3c24xx/cpufreq-s3c2440.c => drivers/cpufreq/s3c2440-cpufreq.c (100%) rename arch/arm/mach-s3c24xx/cpufreq-debugfs.c => drivers/cpufreq/s3c24xx-cpufreq-debugfs.c (100%) rename arch/arm/mach-s3c24xx/cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c (100%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dd68dec..d2946131 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2189,53 +2189,6 @@ config CPU_FREQ_PXA default y select CPU_FREQ_DEFAULT_GOV_USERSPACE select CPU_FREQ_TABLE - -config CPU_FREQ_S3C - bool - help - Internal configuration node for common cpufreq on Samsung SoC - -config CPU_FREQ_S3C24XX - bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)" - depends on ARCH_S3C24XX && CPU_FREQ - select CPU_FREQ_S3C - help - This enables the CPUfreq driver for the Samsung S3C24XX family - of CPUs. - - For details, take a look at <file:Documentation/cpu-freq>. - - If in doubt, say N. - -config CPU_FREQ_S3C24XX_PLL - bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)" - depends on CPU_FREQ_S3C24XX - help - Compile in support for changing the PLL frequency from the - S3C24XX series CPUfreq driver. The PLL takes time to settle - after a frequency change, so by default it is not enabled. - - This also means that the PLL tables for the selected CPU(s) will - be built which may increase the size of the kernel image. - -config CPU_FREQ_S3C24XX_DEBUG - bool "Debug CPUfreq Samsung driver core" - depends on CPU_FREQ_S3C24XX - help - Enable s3c_freq_dbg for the Samsung S3C CPUfreq core - -config CPU_FREQ_S3C24XX_IODEBUG - bool "Debug CPUfreq Samsung driver IO timing" - depends on CPU_FREQ_S3C24XX - help - Enable s3c_freq_iodbg for the Samsung S3C CPUfreq core - -config CPU_FREQ_S3C24XX_DEBUGFS - bool "Export debugfs for CPUFreq" - depends on CPU_FREQ_S3C24XX && DEBUG_FS - help - Export status information via debugfs. - endif source "drivers/cpuidle/Kconfig" diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index f2f7088..ed8aadc 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig @@ -28,7 +28,7 @@ config CPU_S3C2410 select CPU_ARM920T select CPU_LLSERIAL_S3C2410 select S3C2410_CLOCK - select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX + select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ select S3C2410_PM if PM select SAMSUNG_HRT help @@ -204,27 +204,38 @@ config S3C24XX_GPIO_EXTRA128 Add an extra 128 gpio numbers to the available GPIO pool. This is available for boards that need extra gpios for external devices. +config S3C24XX_PLL + bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)" + depends on ARM_S3C24XX + help + Compile in support for changing the PLL frequency from the + S3C24XX series CPUfreq driver. The PLL takes time to settle + after a frequency change, so by default it is not enabled. + + This also means that the PLL tables for the selected CPU(s) will + be built which may increase the size of the kernel image. + # cpu frequency items common between s3c2410 and s3c2440/s3c2442 config S3C2410_IOTIMING bool - depends on CPU_FREQ_S3C24XX + depends on ARM_S3C24XX_CPUFREQ help Internal node to select io timing code that is common to the s3c2410 and s3c2440/s3c2442 cpu frequency support. config S3C2410_CPUFREQ_UTILS - bool - depends on CPU_FREQ_S3C24XX - help - Internal node to select timing code that is common to the s3c2410 - and s3c2440/s3c244 cpu frequency support. + bool + depends on ARM_S3C24XX_CPUFREQ + help + Internal node to select timing code that is common to the s3c2410 + and s3c2440/s3c244 cpu frequency support. # cpu frequency support common to s3c2412, s3c2413 and s3c2442 config S3C2412_IOTIMING bool - depends on CPU_FREQ_S3C24XX && (CPU_S3C2412 || CPU_S3C2443) + depends on ARM_S3C24XX_CPUFREQ && (CPU_S3C2412 || CPU_S3C2443) help Intel node to select io timing code that is common to the s3c2412 and the s3c2443. @@ -233,16 +244,9 @@ config S3C2412_IOTIMING if CPU_S3C2410 -config S3C2410_CPUFREQ - bool - depends on CPU_FREQ_S3C24XX - select S3C2410_CPUFREQ_UTILS - help - CPU Frequency scaling support for S3C2410 - config S3C2410_PLL bool - depends on S3C2410_CPUFREQ && CPU_FREQ_S3C24XX_PLL + depends on ARM_S3C2410_CPUFREQ && S3C24XX_PLL default y help Select the PLL table for the S3C2410 @@ -278,7 +282,7 @@ config ARCH_BAST bool "Simtec Electronics BAST (EB2410ITX)" select ISA select MACH_BAST_IDE - select S3C2410_IOTIMING if S3C2410_CPUFREQ + select S3C2410_IOTIMING if ARM_S3C2410_CPUFREQ select S3C24XX_DCLK select S3C24XX_SIMTEC_NOR select S3C24XX_SIMTEC_PM if PM @@ -385,14 +389,6 @@ config CPU_S3C2412_ONLY !CPU_S3C2442 && !CPU_S3C2443 default y -config S3C2412_CPUFREQ - bool - depends on CPU_FREQ_S3C24XX - default y - select S3C2412_IOTIMING - help - CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs. - config S3C2412_DMA bool help @@ -494,14 +490,6 @@ endif # CPU_S3C2416 if CPU_S3C2440 -config S3C2440_CPUFREQ - bool "S3C2440/S3C2442 CPU Frequency scaling support" - depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442) - default y - select S3C2410_CPUFREQ_UTILS - help - CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs. - config S3C2440_DMA bool help @@ -521,15 +509,15 @@ config S3C2440_XTAL_16934400 config S3C2440_PLL_12000000 bool - depends on S3C2440_CPUFREQ && S3C2440_XTAL_12000000 - default y if CPU_FREQ_S3C24XX_PLL + depends on ARM_S3C2440_CPUFREQ && S3C2440_XTAL_12000000 + default y if S3C24XX_PLL help PLL tables for S3C2440 or S3C2442 CPUs with 12MHz crystals. config S3C2440_PLL_16934400 bool - depends on S3C2440_CPUFREQ && S3C2440_XTAL_16934400 - default y if CPU_FREQ_S3C24XX_PLL + depends on ARM_S3C2440_CPUFREQ && S3C2440_XTAL_16934400 + default y if S3C24XX_PLL help PLL tables for S3C2440 or S3C2442 CPUs with 16.934MHz crystals. @@ -583,7 +571,7 @@ config MACH_NEXCODER_2440 config MACH_OSIRIS bool "Simtec IM2440D20 (OSIRIS) module" - select S3C2410_IOTIMING if S3C2440_CPUFREQ + select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ select S3C2440_XTAL_12000000 select S3C24XX_DCLK select S3C24XX_GPIO_EXTRA128 @@ -655,7 +643,7 @@ config MACH_RX1950 bool "HP iPAQ rx1950" select I2C select PM_H1940 if PM - select S3C2410_IOTIMING if S3C2440_CPUFREQ + select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ select S3C2440_XTAL_16934400 select S3C24XX_DCLK select S3C24XX_PWM diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index 6f46ecf..a3b495a 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile @@ -17,13 +17,11 @@ obj- := obj-y += common.o obj-$(CONFIG_CPU_S3C2410) += s3c2410.o -obj-$(CONFIG_S3C2410_CPUFREQ) += cpufreq-s3c2410.o obj-$(CONFIG_S3C2410_DMA) += dma-s3c2410.o obj-$(CONFIG_S3C2410_PLL) += pll-s3c2410.o obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o obj-$(CONFIG_CPU_S3C2412) += s3c2412.o clock-s3c2412.o -obj-$(CONFIG_S3C2412_CPUFREQ) += cpufreq-s3c2412.o obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o @@ -34,7 +32,6 @@ obj-$(CONFIG_S3C2416_PM) += pm-s3c2416.o obj-$(CONFIG_CPU_S3C2440) += s3c2440.o clock-s3c2440.o obj-$(CONFIG_CPU_S3C2442) += s3c2442.o obj-$(CONFIG_CPU_S3C244X) += s3c244x.o clock-s3c244x.o -obj-$(CONFIG_S3C2440_CPUFREQ) += cpufreq-s3c2440.o obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o obj-$(CONFIG_S3C2440_PLL_12000000) += pll-s3c2440-12000000.o obj-$(CONFIG_S3C2440_PLL_16934400) += pll-s3c2440-16934400.o @@ -59,9 +56,6 @@ obj-$(CONFIG_S3C2412_IOTIMING) += iotiming-s3c2412.o obj-$(CONFIG_S3C2443_COMMON) += common-s3c2443.o obj-$(CONFIG_S3C2443_DMA) += dma-s3c2443.o -obj-$(CONFIG_CPU_FREQ_S3C24XX) += cpufreq.o -obj-$(CONFIG_CPU_FREQ_S3C24XX_DEBUGFS) += cpufreq-debugfs.o - # # machine support # following is ordered alphabetically by option text. diff --git a/arch/arm/mach-s3c24xx/s3c2412.h b/arch/arm/mach-s3c24xx/include/mach/s3c2412.h similarity index 100% rename from arch/arm/mach-s3c24xx/s3c2412.h rename to arch/arm/mach-s3c24xx/include/mach/s3c2412.h diff --git a/arch/arm/mach-s3c24xx/iotiming-s3c2412.c b/arch/arm/mach-s3c24xx/iotiming-s3c2412.c index 663436d..bd064c0 100644 --- a/arch/arm/mach-s3c24xx/iotiming-s3c2412.c +++ b/arch/arm/mach-s3c24xx/iotiming-s3c2412.c @@ -31,7 +31,7 @@ #include <plat/cpu-freq-core.h> #include <plat/clock.h> -#include "s3c2412.h" +#include <mach/s3c2412.h> #define print_ns(x) ((x) / 10), ((x) % 10) diff --git a/arch/arm/plat-samsung/include/plat/cpu-freq-core.h b/arch/arm/plat-samsung/include/plat/cpu-freq-core.h index 95509d8..d7e1715 100644 --- a/arch/arm/plat-samsung/include/plat/cpu-freq-core.h +++ b/arch/arm/plat-samsung/include/plat/cpu-freq-core.h @@ -202,7 +202,7 @@ extern int s3c_plltab_register(struct cpufreq_frequency_table *plls, extern struct s3c_cpufreq_config *s3c_cpufreq_getconfig(void); extern struct s3c_iotimings *s3c_cpufreq_getiotimings(void); -#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUGFS +#ifdef CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS #define s3c_cpufreq_debugfs_call(x) x #else #define s3c_cpufreq_debugfs_call(x) NULL @@ -259,17 +259,17 @@ extern void s3c2412_iotiming_set(struct s3c_cpufreq_config *cfg, #define s3c2412_iotiming_set NULL #endif /* CONFIG_S3C2412_IOTIMING */ -#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUG +#ifdef CONFIG_ARM_S3C24XX_CPUFREQ_DEBUG #define s3c_freq_dbg(x...) printk(KERN_INFO x) #else #define s3c_freq_dbg(x...) do { if (0) printk(x); } while (0) -#endif /* CONFIG_CPU_FREQ_S3C24XX_DEBUG */ +#endif /* CONFIG_ARM_S3C24XX_CPUFREQ_DEBUG */ -#ifdef CONFIG_CPU_FREQ_S3C24XX_IODEBUG +#ifdef CONFIG_ARM_S3C24XX_CPUFREQ_IODEBUG #define s3c_freq_iodbg(x...) printk(KERN_INFO x) #else #define s3c_freq_iodbg(x...) do { if (0) printk(x); } while (0) -#endif /* CONFIG_CPU_FREQ_S3C24XX_IODEBUG */ +#endif /* CONFIG_ARM_S3C24XX_CPUFREQ_IODEBUG */ static inline int s3c_cpufreq_addfreq(struct cpufreq_frequency_table *table, int index, size_t table_size, diff --git a/arch/arm/plat-samsung/include/plat/cpu-freq.h b/arch/arm/plat-samsung/include/plat/cpu-freq.h index 80c4a80..85517ab 100644 --- a/arch/arm/plat-samsung/include/plat/cpu-freq.h +++ b/arch/arm/plat-samsung/include/plat/cpu-freq.h @@ -126,7 +126,7 @@ struct s3c_cpufreq_board { }; /* Things depending on frequency scaling. */ -#ifdef CONFIG_CPU_FREQ_S3C +#ifdef CONFIG_ARM_S3C_CPUFREQ #define __init_or_cpufreq #else #define __init_or_cpufreq __init @@ -134,7 +134,7 @@ struct s3c_cpufreq_board { /* Board functions */ -#ifdef CONFIG_CPU_FREQ_S3C +#ifdef CONFIG_ARM_S3C_CPUFREQ extern int s3c_cpufreq_setboard(struct s3c_cpufreq_board *board); #else @@ -142,4 +142,4 @@ static inline int s3c_cpufreq_setboard(struct s3c_cpufreq_board *board) { return 0; } -#endif /* CONFIG_CPU_FREQ_S3C */ +#endif /* CONFIG_ARM_S3C_CPUFREQ */ diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 030ddf6..f462951 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -8,6 +8,56 @@ config ARM_OMAP2PLUS_CPUFREQ default ARCH_OMAP2PLUS select CPU_FREQ_TABLE +config ARM_S3C_CPUFREQ + bool + help + Internal configuration node for common cpufreq on Samsung SoC + +config ARM_S3C24XX_CPUFREQ + bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)" + depends on ARCH_S3C24XX + select ARM_S3C_CPUFREQ + help + This enables the CPUfreq driver for the Samsung S3C24XX family + of CPUs. + + For details, take a look at <file:Documentation/cpu-freq>. + + If in doubt, say N. + +config ARM_S3C24XX_CPUFREQ_DEBUG + bool "Debug CPUfreq Samsung driver core" + depends on ARM_S3C24XX_CPUFREQ + help + Enable s3c_freq_dbg for the Samsung S3C CPUfreq core + +config ARM_S3C24XX_CPUFREQ_IODEBUG + bool "Debug CPUfreq Samsung driver IO timing" + depends on ARM_S3C24XX_CPUFREQ + help + Enable s3c_freq_iodbg for the Samsung S3C CPUfreq core + +config ARM_S3C24XX_CPUFREQ_DEBUGFS + bool "Export debugfs for CPUFreq" + depends on ARM_S3C24XX_CPUFREQ && DEBUG_FS + help + Export status information via debugfs. + +config ARM_S3C2410_CPUFREQ + bool + depends on ARM_S3C24XX_CPUFREQ && CPU_S3C2410 + select S3C2410_CPUFREQ_UTILS + help + CPU Frequency scaling support for S3C2410 + +config ARM_S3C2412_CPUFREQ + bool + depends on ARM_S3C24XX_CPUFREQ && CPU_S3C2412 + default y + select S3C2412_IOTIMING + help + CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs. + config ARM_S3C2416_CPUFREQ bool "S3C2416 CPU Frequency scaling support" depends on CPU_S3C2416 @@ -30,6 +80,14 @@ config ARM_S3C2416_CPUFREQ_VCORESCALE If in doubt, say N. +config ARM_S3C2440_CPUFREQ + bool "S3C2440/S3C2442 CPU Frequency scaling support" + depends on ARM_S3C24XX_CPUFREQ && (CPU_S3C2440 || CPU_S3C2442) + select S3C2410_CPUFREQ_UTILS + default y + help + CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs. + config ARM_S3C64XX_CPUFREQ bool "Samsung S3C64XX" depends on CPU_S3C6410 diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index 863fd18..40280db 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -45,8 +45,6 @@ obj-$(CONFIG_X86_INTEL_PSTATE) += intel_pstate.o ################################################################################## # ARM SoC drivers obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o -obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o -obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += exynos-cpufreq.o obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o @@ -54,6 +52,13 @@ obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o +obj-$(CONFIG_ARM_S3C24XX_CPUFREQ) += s3c24xx-cpufreq.o +obj-$(CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS) += s3c24xx-cpufreq-debugfs.o +obj-$(CONFIG_ARM_S3C2410_CPUFREQ) += s3c2410-cpufreq.o +obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o +obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o +obj-$(CONFIG_ARM_S3C2440_CPUFREQ) += s3c2440-cpufreq.o +obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o diff --git a/arch/arm/mach-s3c24xx/cpufreq-s3c2410.c b/drivers/cpufreq/s3c2410-cpufreq.c similarity index 100% rename from arch/arm/mach-s3c24xx/cpufreq-s3c2410.c rename to drivers/cpufreq/s3c2410-cpufreq.c diff --git a/arch/arm/mach-s3c24xx/cpufreq-s3c2412.c b/drivers/cpufreq/s3c2412-cpufreq.c similarity index 99% rename from arch/arm/mach-s3c24xx/cpufreq-s3c2412.c rename to drivers/cpufreq/s3c2412-cpufreq.c index 8bf0f3a..4645b48 100644 --- a/arch/arm/mach-s3c24xx/cpufreq-s3c2412.c +++ b/drivers/cpufreq/s3c2412-cpufreq.c @@ -25,13 +25,12 @@ #include <asm/mach/map.h> #include <mach/regs-clock.h> +#include <mach/s3c2412.h> #include <plat/cpu.h> #include <plat/clock.h> #include <plat/cpu-freq-core.h> -#include "s3c2412.h" - /* our clock resources. */ static struct clk *xtal; static struct clk *fclk; diff --git a/arch/arm/mach-s3c24xx/cpufreq-s3c2440.c b/drivers/cpufreq/s3c2440-cpufreq.c similarity index 100% rename from arch/arm/mach-s3c24xx/cpufreq-s3c2440.c rename to drivers/cpufreq/s3c2440-cpufreq.c diff --git a/arch/arm/mach-s3c24xx/cpufreq-debugfs.c b/drivers/cpufreq/s3c24xx-cpufreq-debugfs.c similarity index 100% rename from arch/arm/mach-s3c24xx/cpufreq-debugfs.c rename to drivers/cpufreq/s3c24xx-cpufreq-debugfs.c diff --git a/arch/arm/mach-s3c24xx/cpufreq.c b/drivers/cpufreq/s3c24xx-cpufreq.c similarity index 100% rename from arch/arm/mach-s3c24xx/cpufreq.c rename to drivers/cpufreq/s3c24xx-cpufreq.c -- 1.7.12.rc2.18.g61b472e
WARNING: multiple messages have this Message-ID (diff)
From: viresh.kumar@linaro.org (Viresh Kumar) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq Date: Fri, 5 Apr 2013 12:36:34 +0530 [thread overview] Message-ID: <CAKohpokk1Q+0gRpeW=ts0a8D+rGAUpHu62X+7ejdpfom_B6FYA@mail.gmail.com> (raw) In-Reply-To: <2a5901ce31c9$95160980$bf421c80$%kim@samsung.com> On 5 April 2013 12:18, Kukjin Kim <kgene.kim@samsung.com> wrote: > Basically, this moving looks good to me, but should be re-worked based on > for-next of samsung tree because this touches too many samsung stuff so this > should be sent to upstream via samsung tree. Hmm... Its already applied in Rafael's tree. But it doesn't mean that it can't be moved to your tree if there is a issue. What tree/branch? I used: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git for-next > Applying: cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq > error: patch failed: arch/arm/Kconfig:2166 > error: arch/arm/Kconfig: patch does not apply above two are obvious as you haven't applied other patches in this series. > error: patch failed: arch/arm/mach-s3c24xx/Kconfig:28 > error: arch/arm/mach-s3c24xx/Kconfig: patch does not apply > error: patch failed: arch/arm/mach-s3c24xx/Makefile:17 > error: arch/arm/mach-s3c24xx/Makefile: patch does not apply > error: patch failed: drivers/cpufreq/Makefile:63 > error: drivers/cpufreq/Makefile: patch does not apply Same here. > error: drivers/cpufreq/s3c2412-cpufreq.c: does not exist in index I can still see it in for-next. Attached is my patch based of your for-next -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-cpufreq-s3c24xx-move-cpufreq-driver-to-drivers-cpufr.patch Type: application/octet-stream Size: 18050 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130405/2fb30bb6/attachment-0001.obj>
next prev parent reply other threads:[~2013-04-05 7:06 UTC|newest] Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-04-04 12:54 [PATCH 00/18] For-3.10: CPUFreq: Move drivers to drivers/cpufreq Viresh Kumar 2013-04-04 12:54 ` [PATCH 01/18] cpufreq: ARM: Arrange drivers in alphabetical order Viresh Kumar 2013-04-04 12:54 ` Viresh Kumar 2013-04-04 12:54 ` [PATCH 02/18] cpufreq: tegra: Move driver to drivers/cpufreq Viresh Kumar 2013-04-04 12:54 ` Viresh Kumar 2013-04-04 12:54 ` [PATCH 03/18] cpufreq: davinci: move cpufreq " Viresh Kumar 2013-04-04 12:54 ` Viresh Kumar 2013-04-04 12:54 ` [PATCH 04/18] cpufreq: pxa3xx: " Viresh Kumar 2013-04-04 12:54 ` Viresh Kumar 2013-04-04 12:54 ` [PATCH 05/18] cpufreq: pxa2xx: " Viresh Kumar 2013-04-04 12:54 ` Viresh Kumar 2013-04-04 12:54 ` [PATCH 06/18] cpufreq: integrator: " Viresh Kumar 2013-04-04 12:54 ` Viresh Kumar 2013-04-04 12:54 ` [PATCH 07/18] cpufreq: s3c24xx: " Viresh Kumar 2013-04-04 12:54 ` Viresh Kumar 2013-04-05 6:48 ` Kukjin Kim 2013-04-05 6:48 ` Kukjin Kim 2013-04-05 7:06 ` Viresh Kumar [this message] 2013-04-05 7:06 ` Viresh Kumar 2013-04-05 11:36 ` Rafael J. Wysocki 2013-04-05 11:36 ` Rafael J. Wysocki 2013-04-05 11:36 ` Rafael J. Wysocki 2013-04-08 9:15 ` Kukjin Kim 2013-04-08 9:15 ` Kukjin Kim 2013-04-08 9:18 ` Viresh Kumar 2013-04-08 9:18 ` Viresh Kumar 2013-04-08 10:46 ` Rafael J. Wysocki 2013-04-08 10:46 ` Rafael J. Wysocki 2013-04-08 10:41 ` Kukjin Kim 2013-04-08 10:41 ` Kukjin Kim 2013-04-23 15:25 ` Kukjin Kim 2013-04-23 15:25 ` Kukjin Kim 2013-04-23 15:25 ` Kukjin Kim 2013-04-23 22:59 ` Rafael J. Wysocki 2013-04-23 22:59 ` Rafael J. Wysocki 2013-04-25 16:48 ` Kukjin Kim 2013-04-25 16:48 ` Kukjin Kim 2013-04-25 18:12 ` Rafael J. Wysocki 2013-04-25 18:12 ` Rafael J. Wysocki 2013-04-25 18:12 ` Rafael J. Wysocki 2013-05-13 6:05 ` Viresh Kumar 2013-05-13 6:05 ` Viresh Kumar 2013-05-13 7:18 ` Why rpm_idle called in rpm_resume ? Feng Hong 2013-05-13 11:55 ` Rafael J. Wysocki 2013-05-13 10:51 ` [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq Rafael J. Wysocki 2013-05-13 10:51 ` Rafael J. Wysocki 2013-05-13 10:46 ` Viresh Kumar 2013-05-13 10:46 ` Viresh Kumar 2013-05-14 12:36 ` Kukjin Kim 2013-05-14 12:36 ` Kukjin Kim 2013-05-14 13:00 ` Rafael J. Wysocki 2013-05-14 13:00 ` Rafael J. Wysocki 2013-05-20 5:29 ` Viresh Kumar 2013-05-20 5:29 ` Viresh Kumar 2013-05-20 13:47 ` Kukjin Kim 2013-05-20 13:47 ` Kukjin Kim 2013-04-08 4:54 ` Viresh Kumar 2013-04-08 4:54 ` Viresh Kumar 2013-04-04 12:54 ` [PATCH 08/18] cpufreq: sa11x0: " Viresh Kumar 2013-04-04 12:54 ` Viresh Kumar 2013-04-04 12:54 ` [PATCH 09/18] cpufreq: AVR32: " Viresh Kumar 2013-04-04 12:54 ` [PATCH 10/18] cpufreq: blackfin: " Viresh Kumar 2013-04-04 12:54 ` Viresh Kumar 2013-04-04 12:54 ` [PATCH 11/18] cpufreq: cris: " Viresh Kumar 2013-04-04 12:54 ` [PATCH 12/18] cpufreq: ia64: " Viresh Kumar 2013-04-04 12:59 ` Viresh Kumar 2013-04-04 12:54 ` [PATCH 13/18] cpufreq: mips: " Viresh Kumar 2013-04-04 12:54 ` [PATCH 14/18] cpufreq: sh: " Viresh Kumar 2013-04-04 12:58 ` Viresh Kumar 2013-04-09 12:55 ` Simon Horman 2013-04-09 12:55 ` Simon Horman 2013-04-09 14:12 ` Viresh Kumar 2013-04-09 14:24 ` Viresh Kumar 2013-04-10 2:12 ` Simon Horman 2013-04-10 2:12 ` Simon Horman 2013-04-10 2:51 ` Viresh Kumar 2013-04-10 2:51 ` Viresh Kumar 2013-04-10 4:30 ` Simon Horman 2013-04-10 4:30 ` Simon Horman 2013-04-04 12:54 ` [PATCH 15/18] cpufreq: unicore2: " Viresh Kumar 2013-04-04 12:54 ` [PATCH 16/18] cpufreq: sparc: " Viresh Kumar 2013-04-04 12:58 ` Viresh Kumar 2013-04-04 12:54 ` [PATCH 17/18] cpufreq: powerpc: " Viresh Kumar 2013-04-04 12:54 ` Viresh Kumar 2013-04-05 6:46 ` Viresh Kumar 2013-04-05 6:46 ` Viresh Kumar 2013-04-09 8:35 ` Viresh Kumar 2013-04-09 8:35 ` Viresh Kumar 2013-04-22 6:49 ` Viresh Kumar 2013-04-22 6:49 ` Viresh Kumar 2013-05-13 6:04 ` Viresh Kumar 2013-05-13 6:04 ` Viresh Kumar 2013-05-20 4:40 ` Viresh Kumar 2013-05-20 4:40 ` Viresh Kumar 2013-05-31 10:50 ` Viresh Kumar 2013-05-31 10:50 ` Viresh Kumar 2013-06-07 5:18 ` Viresh Kumar 2013-06-07 5:18 ` Viresh Kumar 2013-06-07 11:58 ` Rafael J. Wysocki 2013-06-07 11:58 ` Rafael J. Wysocki 2013-04-04 12:54 ` [PATCH 18/18] cpufreq: powerpc/platforms/cell: " Viresh Kumar 2013-04-04 12:54 ` Viresh Kumar 2013-04-04 13:02 ` Arnd Bergmann 2013-04-04 13:02 ` Arnd Bergmann 2013-04-04 13:50 ` Viresh Kumar 2013-04-04 13:50 ` Viresh Kumar 2013-04-04 14:48 ` Arnd Bergmann 2013-04-04 14:48 ` Arnd Bergmann 2013-04-04 22:36 ` [PATCH 00/18] For-3.10: CPUFreq: Move drivers " Rafael J. Wysocki 2013-04-05 1:17 ` Viresh Kumar
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAKohpokk1Q+0gRpeW=ts0a8D+rGAUpHu62X+7ejdpfom_B6FYA@mail.gmail.com' \ --to=viresh.kumar@linaro.org \ --cc=Liviu.Dudau@arm.com \ --cc=Steve.Bannister@arm.com \ --cc=arvind.chauhan@arm.com \ --cc=ben-linux@fluff.org \ --cc=charles.garcia-tobin@arm.com \ --cc=cpufreq@vger.kernel.org \ --cc=kgene.kim@samsung.com \ --cc=linaro-kernel@lists.linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=patches@linaro.org \ --cc=rjw@sisk.pl \ --cc=robin.randhawa@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.