From patchwork Mon Mar 25 16:54:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 230754 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0480D2C0291 for ; Tue, 26 Mar 2013 03:57:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932659Ab3CYQ4P (ORCPT ); Mon, 25 Mar 2013 12:56:15 -0400 Received: from mail-pb0-f48.google.com ([209.85.160.48]:57391 "EHLO mail-pb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932653Ab3CYQ4N (ORCPT ); Mon, 25 Mar 2013 12:56:13 -0400 Received: by mail-pb0-f48.google.com with SMTP id wy12so4244196pbc.35 for ; Mon, 25 Mar 2013 09:56:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-gm-message-state; bh=6ivo5J2G/i6RSSjZk0LcgMh/2EFHM2z3AEeBT44ThsI=; b=WgDO1CR0+B+81oU0xh4EeucFHLA54DCUGih9Q8W2/deQfbddQsCsz8BJ+dcQUYQy0s In5PIpBBBOXO9v3SJrZiO1E20MDIHsCCGjcRTD18ndADJlB4TO2fNPbKUSuBWlgQChmu VphLqLkoySZKnyf9z4WCGK1wBZl9FlCG51XVTHn3HqEM476+5nDoNWHPOZjOrxoO9F+s YupFX1bsvU5EV4/JOJ9Bswb1ibCFY6pWOoSuMgLPwh+k8PmlsQDmdZ//fSrphB0vbWOq 7z31uN89ZO8gE7ASWqgxMMbDvREtuG9kIrZrVKMLtAvFRNZF8PqCzHaNKxFkp7d3sh38 svKA== X-Received: by 10.66.100.138 with SMTP id ey10mr18820303pab.131.1364230572724; Mon, 25 Mar 2013 09:56:12 -0700 (PDT) Received: from localhost ([122.167.78.240]) by mx.google.com with ESMTPS id bs1sm3252634pbc.8.2013.03.25.09.56.07 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 25 Mar 2013 09:56:12 -0700 (PDT) From: Viresh Kumar To: rjw@sisk.pl Cc: arvind.chauhan@arm.com, robin.randhawa@arm.com, Steve.Bannister@arm.com, Liviu.Dudau@arm.com, charles.garcia-tobin@arm.com, cpufreq@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org, arnd.bergmann@linaro.org, Viresh Kumar , "David S. Miller" , sparclinux@vger.kernel.org Subject: [PATCH 8/9] spark: cpufreq: move cpufreq driver to drivers/cpufreq Date: Mon, 25 Mar 2013 22:24:44 +0530 Message-Id: <2641a3f059f1698ee6825c7b6bfe25a3937e1474.1364229828.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQn9Cg9gFn1xmxBQqLheMk9ebQaH2hkpRlw/t9mpw9g6Tw67KWeC3S+P9CqbQ0oNrrcIM3qu Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org This patch moves cpufreq driver of SPARK architecture to drivers/cpufreq. Cc: David S. Miller Cc: sparclinux@vger.kernel.org Signed-off-by: Viresh Kumar --- arch/sparc/Kconfig | 23 ---------------------- arch/sparc/kernel/Makefile | 3 --- drivers/cpufreq/Kconfig | 23 ++++++++++++++++++++++ drivers/cpufreq/Makefile | 2 ++ .../cpufreq/spark-us2e-cpufreq.c | 0 .../cpufreq/spark-us3-cpufreq.c | 0 6 files changed, 25 insertions(+), 26 deletions(-) rename arch/sparc/kernel/us2e_cpufreq.c => drivers/cpufreq/spark-us2e-cpufreq.c (100%) rename arch/sparc/kernel/us3_cpufreq.c => drivers/cpufreq/spark-us3-cpufreq.c (100%) diff --git a/arch/sparc/kernel/us2e_cpufreq.c b/drivers/cpufreq/spark-us2e-cpufreq.c similarity index 100% rename from arch/sparc/kernel/us2e_cpufreq.c rename to drivers/cpufreq/spark-us2e-cpufreq.c diff --git a/arch/sparc/kernel/us3_cpufreq.c b/drivers/cpufreq/spark-us3-cpufreq.c similarity index 100% rename from arch/sparc/kernel/us3_cpufreq.c rename to drivers/cpufreq/spark-us3-cpufreq.c diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 289127d..52e7680 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -260,29 +260,6 @@ config HOTPLUG_CPU if SPARC64 source "drivers/cpufreq/Kconfig" - -config US3_FREQ - tristate "UltraSPARC-III CPU Frequency driver" - depends on CPU_FREQ - select CPU_FREQ_TABLE - help - This adds the CPUFreq driver for UltraSPARC-III processors. - - For details, take a look at . - - If in doubt, say N. - -config US2E_FREQ - tristate "UltraSPARC-IIe CPU Frequency driver" - depends on CPU_FREQ - select CPU_FREQ_TABLE - help - This adds the CPUFreq driver for UltraSPARC-IIe processors. - - For details, take a look at . - - If in doubt, say N. - endif config US3_MC diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile index 6cf591b..5276fd4 100644 --- a/arch/sparc/kernel/Makefile +++ b/arch/sparc/kernel/Makefile @@ -102,9 +102,6 @@ obj-$(CONFIG_PCI_MSI) += pci_msi.o obj-$(CONFIG_COMPAT) += sys32.o sys_sparc32.o signal32.o -# sparc64 cpufreq -obj-$(CONFIG_US3_FREQ) += us3_cpufreq.o -obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o obj-$(CONFIG_US3_MC) += chmc.o obj-$(CONFIG_KPROBES) += kprobes.o diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index 602d5db..5b2c312 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -258,6 +258,29 @@ depends on PPC32 || PPC64 source "drivers/cpufreq/Kconfig.powerpc" endmenu +menu "SPARK CPU frequency scaling drivers" +depends on SPARC64 +config SPARK_US3_CPUFREQ + tristate "UltraSPARC-III CPU Frequency driver" + select CPU_FREQ_TABLE + help + This adds the CPUFreq driver for UltraSPARC-III processors. + + For details, take a look at . + + If in doubt, say N. + +config SPARK_US2E_CPUFREQ + tristate "UltraSPARC-IIe CPU Frequency driver" + select CPU_FREQ_TABLE + help + This adds the CPUFreq driver for UltraSPARC-IIe processors. + + For details, take a look at . + + If in doubt, say N. +endmenu + menu "SH CPU Frequency scaling" depends on SUPERH config SH_CPU_FREQ diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index ab3a054..0203a06 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -85,4 +85,6 @@ obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o obj-$(CONFIG_SH_CPU_FREQ) += sh-cpufreq.o +obj-$(CONFIG_SPARK_US2E_CPUFREQ) += spark-us2e-cpufreq.o +obj-$(CONFIG_SPARK_US3_CPUFREQ) += spark-us3-cpufreq.o obj-$(CONFIG_UNICORE32) += unicore2-cpufreq.o