From patchwork Wed Mar 2 01:43:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 8475541 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2BC7EC0553 for ; Wed, 2 Mar 2016 01:43:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 571D22037C for ; Wed, 2 Mar 2016 01:43:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 75E37201C7 for ; Wed, 2 Mar 2016 01:43:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755171AbcCBBnQ (ORCPT ); Tue, 1 Mar 2016 20:43:16 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:53643 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753360AbcCBBnP (ORCPT ); Tue, 1 Mar 2016 20:43:15 -0500 Received: from reginn.isobedori.kobe.vergenet.net (p5023-ipbfp803kobeminato.hyogo.ocn.ne.jp [123.221.39.23]) by kirsty.vergenet.net (Postfix) with ESMTPA id B009825B81A; Wed, 2 Mar 2016 12:43:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1456882992; bh=VEv2wXYTZ2s/7etur9rh9TiQjeKJD2/frKPPOGaUVA8=; h=From:To:Cc:Subject:Date:From; b=QSucgGxtTgOH/XyxDiXqH2XO4JzL1l6x7jebDt5bwwYOIvzt//LT4ztTnKkKXWsdJ XBFVlq6XRsXxHc7Qzt+QL8uK2oBy6vab9sj2fu/u/F0uT4aR64DEUy7ItJVYIcDEm0 2l01ydyCspOKqM2evaPENAtdUmDBF/f4jTm2Iffk= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 8A0B89404FB; Wed, 2 Mar 2016 10:43:10 +0900 (JST) From: Simon Horman To: Geert Uytterhoeven , linux-sh@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: Magnus Damm , Simon Horman Subject: [PATCH] drivers: sh: Use ARCH_RENESAS Date: Wed, 2 Mar 2016 10:43:07 +0900 Message-Id: <1456882987-4502-1-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make use of ARCH_RENESAS in place of ARCH_SHMOBILE. This is part of an ongoing process to migrate from ARCH_SHMOBILE to ARCH_RENESAS the motivation for which being that RENESAS seems to be a more appropriate name than SHMOBILE for the majority of Renesas ARM based SoCs. ARCH_RENESAS should cover all cases where both CONFIG_OF and ARCH_SHMOBILE are enabled. Signed-off-by: Simon Horman Acked-by: Geert Uytterhoeven --- drivers/sh/pm_runtime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Based on v4.5-rc6 diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c index a9bac3bf20de..aa2ce227e3eb 100644 --- a/drivers/sh/pm_runtime.c +++ b/drivers/sh/pm_runtime.c @@ -34,7 +34,7 @@ static struct pm_clk_notifier_block platform_bus_notifier = { static int __init sh_pm_runtime_init(void) { - if (IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_ARCH_SHMOBILE)) { + if (IS_ENABLED(CONFIG_ARCH_RENESAS)) { if (!of_find_compatible_node(NULL, NULL, "renesas,cpg-mstp-clocks")) return 0;