From patchwork Fri Apr 22 11:28:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 66438 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp663643qge; Fri, 22 Apr 2016 04:29:45 -0700 (PDT) X-Received: by 10.66.153.174 with SMTP id vh14mr27991464pab.131.1461324579998; Fri, 22 Apr 2016 04:29:39 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p20si6527570pfa.90.2016.04.22.04.29.39; Fri, 22 Apr 2016 04:29:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753806AbcDVL3e (ORCPT + 29 others); Fri, 22 Apr 2016 07:29:34 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:33961 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751971AbcDVL3a (ORCPT ); Fri, 22 Apr 2016 07:29:30 -0400 Received: by mail-pf0-f169.google.com with SMTP id y69so22437517pfb.1 for ; Fri, 22 Apr 2016 04:29:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Y7fFjQHPaViukIZNfXi2QFXvufynAGHDaDvN5OaJtLg=; b=HkEPP2u/Y5SQ4YGDNL1JS/ZFx6eElzsiCF27rHIjZ9oKrhbENuoDz2FepbC2OB/qew SLqpErPDURzBLDOXN0dcwLbZGT6uUtZLgp7S0taH6VRaAzp+OSumOmjY9FSxRrVNVlBC 0j2TPmLZCDX9WCn1pEuoDQcBDgET+25PVDFmA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=Y7fFjQHPaViukIZNfXi2QFXvufynAGHDaDvN5OaJtLg=; b=PJgGzwRAM4OzBmFuXH494AR3qynBWBDzNwojwuf0Qrvazhk0cj/P6U1gMUIexXizVX DnzvHwSHkK8KHS2SYlxoYDnfQ31JO2+Gi1pP8xYyuJb9pl7GgzxAk54HgIP0ETTULiom RlJG806Y8rrBThdSRnGJjsE8r7ApsDhRp6CRx8xm9F/FwBvDJnGkFwWDxe6Uv58+r6x9 SnSvUtNYuJHIMKLS8UHGfjilOzsZh6jOwNWAD6uVcTiBOztYCwQ9y+vu0OIB/08tRR6w /8Gv2zngMNdiOdU+pLLkJuVD60SglFlrWCXnNFt6vdF9EOPHiyMlUp9mDye0G3a8wDqn Lkdw== X-Gm-Message-State: AOPr4FWFGqNnUKXhWLA7ecGoay6vE/3RFCDfkHghDCI/A3rGbapr8Z0taHSOAhcjYj5mcBWB X-Received: by 10.98.76.22 with SMTP id z22mr27454584pfa.78.1461324570031; Fri, 22 Apr 2016 04:29:30 -0700 (PDT) Received: from localhost ([122.167.26.250]) by smtp.gmail.com with ESMTPSA id h85sm7798686pfj.52.2016.04.22.04.29.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2016 04:29:29 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , Simon Horman , Magnus Damm , Viresh Kumar Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, geert@linux-m68k.org, Arnd Bergmann , linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 6/9] cpufreq: shmobile: Use generic platdev driver Date: Fri, 22 Apr 2016 16:58:44 +0530 Message-Id: <79f9216705870417483bad374e6ff5ee7b4d267c.1461324267.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.7.1.410.g6faf27b In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The cpufreq-dt-platdev driver supports creation of cpufreq-dt platform device now, reuse that and remove similar code from platform code. Cc: Simon Horman Cc: Magnus Damm Signed-off-by: Viresh Kumar Acked-by: Arnd Bergmann --- arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/common.h | 7 ------- arch/arm/mach-shmobile/cpufreq.c | 19 ------------------- drivers/cpufreq/cpufreq-dt-platdev.c | 12 ++++++++++++ 4 files changed, 12 insertions(+), 27 deletions(-) delete mode 100644 arch/arm/mach-shmobile/cpufreq.c -- 2.7.1.410.g6faf27b diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index a65c80ac9009..c9ea0e6ff4f9 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -38,7 +38,6 @@ smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o # PM objects obj-$(CONFIG_SUSPEND) += suspend.o -obj-$(CONFIG_CPU_FREQ) += cpufreq.o obj-$(CONFIG_PM_RCAR) += pm-rcar.o obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o obj-$(CONFIG_ARCH_RCAR_GEN2) += pm-rcar-gen2.o diff --git a/arch/arm/mach-shmobile/common.h b/arch/arm/mach-shmobile/common.h index 5464b7a75e30..3b562d87826d 100644 --- a/arch/arm/mach-shmobile/common.h +++ b/arch/arm/mach-shmobile/common.h @@ -25,16 +25,9 @@ static inline int shmobile_suspend_init(void) { return 0; } static inline void shmobile_smp_apmu_suspend_init(void) { } #endif -#ifdef CONFIG_CPU_FREQ -int shmobile_cpufreq_init(void); -#else -static inline int shmobile_cpufreq_init(void) { return 0; } -#endif - static inline void __init shmobile_init_late(void) { shmobile_suspend_init(); - shmobile_cpufreq_init(); } #endif /* __ARCH_MACH_COMMON_H */ diff --git a/arch/arm/mach-shmobile/cpufreq.c b/arch/arm/mach-shmobile/cpufreq.c deleted file mode 100644 index 634d701c56a7..000000000000 --- a/arch/arm/mach-shmobile/cpufreq.c +++ /dev/null @@ -1,19 +0,0 @@ -/* - * CPUFreq support code for SH-Mobile ARM - * - * Copyright (C) 2014 Gaku Inami - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ - -#include - -#include "common.h" - -int __init shmobile_cpufreq_init(void) -{ - platform_device_register_simple("cpufreq-dt", -1, NULL, 0); - return 0; -} diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c index 75fa921d8540..4b94fe3427f9 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c @@ -29,6 +29,18 @@ static const struct of_device_id machines[] __initconst = { { .compatible = "samsung,exynos5800", }, #endif + { .compatible = "renesas,emev2", }, + { .compatible = "renesas,r7s72100", }, + { .compatible = "renesas,r8a73a4", }, + { .compatible = "renesas,r8a7740", }, + { .compatible = "renesas,r8a7778", }, + { .compatible = "renesas,r8a7779", }, + { .compatible = "renesas,r8a7790", }, + { .compatible = "renesas,r8a7791", }, + { .compatible = "renesas,r8a7793", }, + { .compatible = "renesas,r8a7794", }, + { .compatible = "renesas,sh73a0", }, + { .compatible = "rockchip,rk2928", }, { .compatible = "rockchip,rk3036", }, { .compatible = "rockchip,rk3066a", },