From patchwork Mon Jul 25 02:29:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 9245129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4ACBB60487 for ; Mon, 25 Jul 2016 02:30:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D72E20951 for ; Mon, 25 Jul 2016 02:30:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32158262FF; Mon, 25 Jul 2016 02:30:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 011CE212BE for ; Mon, 25 Jul 2016 02:30:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752710AbcGYCaX (ORCPT ); Sun, 24 Jul 2016 22:30:23 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:56131 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752687AbcGYCaD (ORCPT ); Sun, 24 Jul 2016 22:30:03 -0400 Received: from penelope.kanocho.kobe.vergenet.net (p6047-ipbfp602kobeminato.hyogo.ocn.ne.jp [118.10.78.47]) by kirsty.vergenet.net (Postfix) with ESMTPSA id 81F7425BEBB; Mon, 25 Jul 2016 12:29:54 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1469413794; bh=nKVE98z1Sj5StmETir8AxECrpWTuKKFqrc745Twpm6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=P6qYToqE7F6Tdmw2/Sl4OmmNCrDg4/+7Wk479dxe0nmGIpN6yPPZz1SIkSIex9Bn9 wobPmutmd5WrSqCoqlyvjJzC0u+/HEWKxXNjaMVgKTx+g3oDoGADWqSA2bwrW6sIP9 M1b30zOldrzfgw2A2RKmgx9nzCYcys/2bUKTKA+4= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id 3761A60EC3; Mon, 25 Jul 2016 11:29:53 +0900 (JST) From: Simon Horman To: Linus Torvalds Cc: linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Magnus Damm , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org, Geert Uytterhoeven , Simon Horman Subject: [PATCH 1/2] drivers: sh: Stop using the legacy clock domain on ARM Date: Mon, 25 Jul 2016 11:29:38 +0900 Message-Id: <4c6d7e228968bdc238ae7213d919f34b7838fe59.1469413328.git.horms+renesas@verge.net.au> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: References: In-Reply-To: References: Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Geert Uytterhoeven Since commits 71d076ceb245f0d9 ("ARM: shmobile: Enable PM and PM_GENERIC_DOMAINS for SoCs with PM Domains") and 2ee98234b88174f2 ("arm64: renesas: Enable PM and PM_GENERIC_DOMAINS for SoCs with PM Domains"), CONFIG_PM and CONFIG_PM_GENERIC_DOMAINS are enabled unconditionally for Renesas ARM-based SoCs. Hence the legacy clock domain is no longer used on these SoCs. Remove the related support code, and stop entering drivers/sh/ on ARM. Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- drivers/Makefile | 1 - drivers/sh/pm_runtime.c | 9 --------- 2 files changed, 10 deletions(-) diff --git a/drivers/Makefile b/drivers/Makefile index 0b6f3d60193d..a7187b999c5e 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -128,7 +128,6 @@ obj-$(CONFIG_SGI_SN) += sn/ obj-y += firmware/ obj-$(CONFIG_CRYPTO) += crypto/ obj-$(CONFIG_SUPERH) += sh/ -obj-$(CONFIG_ARCH_SHMOBILE) += sh/ ifndef CONFIG_ARCH_USES_GETTIMEOFFSET obj-y += clocksource/ endif diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c index a9bac3bf20de..c887ecdaf19b 100644 --- a/drivers/sh/pm_runtime.c +++ b/drivers/sh/pm_runtime.c @@ -34,15 +34,6 @@ 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 (!of_find_compatible_node(NULL, NULL, - "renesas,cpg-mstp-clocks")) - return 0; - if (IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS_OF) && - of_find_node_with_property(NULL, "#power-domain-cells")) - return 0; - } - pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier); return 0; }