From patchwork Mon Mar 25 16:54:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 2332411 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 986E8DF24C for ; Mon, 25 Mar 2013 16:57:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932522Ab3CYQzv (ORCPT ); Mon, 25 Mar 2013 12:55:51 -0400 Received: from mail-da0-f42.google.com ([209.85.210.42]:44031 "EHLO mail-da0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758749Ab3CYQzr (ORCPT ); Mon, 25 Mar 2013 12:55:47 -0400 Received: by mail-da0-f42.google.com with SMTP id n15so3292952dad.29 for ; Mon, 25 Mar 2013 09:55:47 -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=+gpr6QCq5S2/BnA61NmTXpFyMBRllOQ18StykcygIUk=; b=pgS4ndDSHwRoIygBKwaLtpvbdaiUpabXAbO67i9CLOcnMOkym0DHo6v7HarJV5PS8V hHHHIvm5oJNPPqJVjxUcX6clqHyoqhubFlrdn96PL7HPahWVbeCVQKI0ni0+R0cqQsXc YfPWn3P8Ps/ZOBtaowbwlK3gB1VgqB/FbFKbJElogOPJP+yi+yZtayHmUUo0pS3VE96Y Vr3tCFampYwp6uDsA/rXUFhspMzTtfnaxRC161x4n7ToAIiBXtaoPBPRIYOz/kx0FQxQ 1zmOSqdAy8dOv7tSw+EjkpJ5p5XKhmj6vKkRK2fjWluH4WIwOhq+J09CD4dczOCkXVx/ Gmnw== X-Received: by 10.68.189.163 with SMTP id gj3mr19070204pbc.4.1364230547016; Mon, 25 Mar 2013 09:55:47 -0700 (PDT) Received: from localhost ([122.167.78.240]) by mx.google.com with ESMTPS id xl10sm15498996pac.15.2013.03.25.09.55.41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 25 Mar 2013 09:55:46 -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 , Ralf Baechle , linux-mips@linux-mips.org Subject: [PATCH 5/9] mips: cpufreq: move cpufreq driver to drivers/cpufreq Date: Mon, 25 Mar 2013 22:24:41 +0530 Message-Id: <199e0d0a282290544ff562b904a0028a104aad45.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: ALoCoQnWGbC/Gd1W3esJxO1hrFtvG/sV4+Le4NxhoeBN6O+9PiSnIyAIc3Ao5TTN32VHny2/lI3F Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org This patch moves cpufreq driver of MIPS architecture to drivers/cpufreq. Cc: Ralf Baechle Cc: linux-mips@linux-mips.org Signed-off-by: Viresh Kumar --- arch/mips/Kconfig | 9 ++++- arch/mips/kernel/Makefile | 2 -- arch/mips/kernel/cpufreq/Kconfig | 41 ---------------------- arch/mips/kernel/cpufreq/Makefile | 5 --- drivers/cpufreq/Kconfig | 18 ++++++++++ drivers/cpufreq/Makefile | 1 + .../kernel => drivers}/cpufreq/loongson2_cpufreq.c | 0 7 files changed, 27 insertions(+), 49 deletions(-) delete mode 100644 arch/mips/kernel/cpufreq/Kconfig delete mode 100644 arch/mips/kernel/cpufreq/Makefile rename {arch/mips/kernel => drivers}/cpufreq/loongson2_cpufreq.c (100%) diff --git a/arch/mips/kernel/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c similarity index 100% rename from arch/mips/kernel/cpufreq/loongson2_cpufreq.c rename to drivers/cpufreq/loongson2_cpufreq.c diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index cd2e21f..22e8417 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -2539,7 +2539,14 @@ source "kernel/power/Kconfig" endmenu -source "arch/mips/kernel/cpufreq/Kconfig" +config MIPS_EXTERNAL_TIMER + bool + +if CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER +menu "CPU Power Management" +source "drivers/cpufreq/Kconfig" +endmenu +endif source "net/Kconfig" diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index f81d98f..c69ca65 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -92,8 +92,6 @@ CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/n obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT) += 8250-platform.o -obj-$(CONFIG_MIPS_CPUFREQ) += cpufreq/ - obj-$(CONFIG_PERF_EVENTS) += perf_event.o obj-$(CONFIG_HW_PERF_EVENTS) += perf_event_mipsxx.o diff --git a/arch/mips/kernel/cpufreq/Kconfig b/arch/mips/kernel/cpufreq/Kconfig deleted file mode 100644 index 58c601e..0000000 --- a/arch/mips/kernel/cpufreq/Kconfig +++ /dev/null @@ -1,41 +0,0 @@ -# -# CPU Frequency scaling -# - -config MIPS_EXTERNAL_TIMER - bool - -config MIPS_CPUFREQ - bool - default y - depends on CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER - -if MIPS_CPUFREQ - -menu "CPU Frequency scaling" - -source "drivers/cpufreq/Kconfig" - -if CPU_FREQ - -comment "CPUFreq processor drivers" - -config LOONGSON2_CPUFREQ - tristate "Loongson2 CPUFreq Driver" - select CPU_FREQ_TABLE - depends on MIPS_CPUFREQ - help - This option adds a CPUFreq driver for loongson processors which - support software configurable cpu frequency. - - Loongson2F and it's successors support this feature. - - For details, take a look at . - - If in doubt, say N. - -endif # CPU_FREQ - -endmenu - -endif # MIPS_CPUFREQ diff --git a/arch/mips/kernel/cpufreq/Makefile b/arch/mips/kernel/cpufreq/Makefile deleted file mode 100644 index 05a5715..0000000 --- a/arch/mips/kernel/cpufreq/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# -# Makefile for the Linux/MIPS cpufreq. -# - -obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index a2f1600..5030df5 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -235,6 +235,24 @@ config IA64_ACPI_CPUFREQ endmenu +menu "MIPS CPUFreq processor drivers" +depends on MIPS + +config LOONGSON2_CPUFREQ + tristate "Loongson2 CPUFreq Driver" + select CPU_FREQ_TABLE + help + This option adds a CPUFreq driver for loongson processors which + support software configurable cpu frequency. + + Loongson2F and it's successors support this feature. + + For details, take a look at . + + If in doubt, say N. + +endmenu + menu "PowerPC CPU frequency scaling drivers" depends on PPC32 || PPC64 source "drivers/cpufreq/Kconfig.powerpc" diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index 312141d..a245559 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -83,3 +83,4 @@ obj-$(CONFIG_BLACKFIN) += blackfin-cpufreq.o obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o +obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o