From patchwork Mon Mar 25 16:54:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 2332391 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 091C73FC54 for ; Mon, 25 Mar 2013 16:57:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932570Ab3CYQz6 (ORCPT ); Mon, 25 Mar 2013 12:55:58 -0400 Received: from mail-pb0-f42.google.com ([209.85.160.42]:47940 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932231Ab3CYQz4 (ORCPT ); Mon, 25 Mar 2013 12:55:56 -0400 Received: by mail-pb0-f42.google.com with SMTP id xb4so4261073pbc.15 for ; Mon, 25 Mar 2013 09:55:55 -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=faLiaX/gzbaYN4SLj5gKrUDwWxE40Vg+zv1XImjQAF4=; b=D/P2Z1zNKcRe4a9PNDN0AvlITjtJ2geVpNzjkeBTAXkPYwpfGLEDM1q+Q1zE51luf0 QS3KT5SZjpZQHvJuEZd2LS54B/OlEJaD3i4Mxbu84NmHoefd+3Zq55mm2Iv1gcXJubxY 5LlhleG72MqAaTFEMZbIj7jRXXevz3C/sIgI3UqeNdMFkEYzS9xdaFtbFcv1vyW/9jly ZRIPDnt2qOpgruz6vHng8uCjOmaaIezTT1dnUGzhGyFIDjik3ttBpNaBRbOp8axUGDQb etbtMGg37KMwcHS9R1TkFZDZdnIMbdoLTryJatbRScdax0cEcY0zVr7z2V+9WnRrze0W vDXw== X-Received: by 10.68.204.68 with SMTP id kw4mr18538412pbc.76.1364230555769; Mon, 25 Mar 2013 09:55:55 -0700 (PDT) Received: from localhost ([122.167.78.240]) by mx.google.com with ESMTPS id ky17sm15476672pab.23.2013.03.25.09.55.50 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 25 Mar 2013 09:55:55 -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 , Paul Mundt , linux-sh@vger.kernel.org Subject: [PATCH 6/9] sh: cpufreq: move cpufreq driver to drivers/cpufreq Date: Mon, 25 Mar 2013 22:24:42 +0530 Message-Id: X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQmhSkCCcHYrTqzpdCSU3XugRFXQgtGj7TCiYFOuOc3n4ZO/CMgc1lOnBEbzdLJA+GZ8fQjz 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 SUPERH architecture to drivers/cpufreq. Cc: Paul Mundt Cc: linux-sh@vger.kernel.org Signed-off-by: Viresh Kumar Acked-by: Paul Mundt --- arch/sh/Kconfig | 18 ------------------ arch/sh/kernel/Makefile | 1 - drivers/cpufreq/Kconfig | 18 ++++++++++++++++++ drivers/cpufreq/Makefile | 1 + .../kernel/cpufreq.c => drivers/cpufreq/sh-cpufreq.c | 2 -- 5 files changed, 19 insertions(+), 21 deletions(-) rename arch/sh/kernel/cpufreq.c => drivers/cpufreq/sh-cpufreq.c (99%) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 5e85963..06e3163 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -624,25 +624,7 @@ config SH_CLK_CPG_LEGACY endmenu menu "CPU Frequency scaling" - source "drivers/cpufreq/Kconfig" - -config SH_CPU_FREQ - tristate "SuperH CPU Frequency driver" - depends on CPU_FREQ - select CPU_FREQ_TABLE - help - This adds the cpufreq driver for SuperH. Any CPU that supports - clock rate rounding through the clock framework can use this - driver. While it will make the kernel slightly larger, this is - harmless for CPUs that don't support rate rounding. The driver - will also generate a notice in the boot log before disabling - itself if the CPU in question is not capable of rate rounding. - - For details, take a look at . - - If unsure, say N. - endmenu source "arch/sh/drivers/Kconfig" diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile index f259b37..261c8bf 100644 --- a/arch/sh/kernel/Makefile +++ b/arch/sh/kernel/Makefile @@ -31,7 +31,6 @@ obj-$(CONFIG_VSYSCALL) += vsyscall/ obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o obj-$(CONFIG_KGDB) += kgdb.o -obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o obj-$(CONFIG_MODULES) += sh_ksyms_$(BITS).o module.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index 5030df5..602d5db 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -258,5 +258,23 @@ depends on PPC32 || PPC64 source "drivers/cpufreq/Kconfig.powerpc" endmenu +menu "SH CPU Frequency scaling" +depends on SUPERH +config SH_CPU_FREQ + tristate "SuperH CPU Frequency driver" + select CPU_FREQ_TABLE + help + This adds the cpufreq driver for SuperH. Any CPU that supports + clock rate rounding through the clock framework can use this + driver. While it will make the kernel slightly larger, this is + harmless for CPUs that don't support rate rounding. The driver + will also generate a notice in the boot log before disabling + itself if the CPU in question is not capable of rate rounding. + + For details, take a look at . + + If unsure, say N. +endmenu + endif endmenu diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index a245559..e572211 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -84,3 +84,4 @@ 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 +obj-$(CONFIG_SH_CPU_FREQ) += sh-cpufreq.o diff --git a/arch/sh/kernel/cpufreq.c b/drivers/cpufreq/sh-cpufreq.c similarity index 99% rename from arch/sh/kernel/cpufreq.c rename to drivers/cpufreq/sh-cpufreq.c index 88c8fee..73adb64 100644 --- a/arch/sh/kernel/cpufreq.c +++ b/drivers/cpufreq/sh-cpufreq.c @@ -1,6 +1,4 @@ /* - * arch/sh/kernel/cpufreq.c - * * cpufreq driver for the SuperH processors. * * Copyright (C) 2002 - 2012 Paul Mundt