From patchwork Wed Mar 18 19:46:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 6043881 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 082E6BF910 for ; Wed, 18 Mar 2015 19:47:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 334E020172 for ; Wed, 18 Mar 2015 19:47:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F805203B1 for ; Wed, 18 Mar 2015 19:47:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756428AbbCRTrW (ORCPT ); Wed, 18 Mar 2015 15:47:22 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:43641 "EHLO xavier.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756469AbbCRTrD (ORCPT ); Wed, 18 Mar 2015 15:47:03 -0400 Received: from ayla.of.borg ([84.193.93.87]) by xavier.telenet-ops.be with bizsmtp id 57mz1q00s1t5w8s017mzkK; Wed, 18 Mar 2015 20:47:01 +0100 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1YYJvf-00085J-FM; Wed, 18 Mar 2015 20:46:59 +0100 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1YYJvh-0007Wy-3X; Wed, 18 Mar 2015 20:47:01 +0100 From: Geert Uytterhoeven To: Mike Turquette , Stephen Boyd , Simon Horman , Magnus Damm , "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson Cc: linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH/RFC 5/5] drivers: sh: Disable PM runtime for multi-platform R-Car Gen2 with genpd Date: Wed, 18 Mar 2015 20:46:57 +0100 Message-Id: <1426708017-28885-6-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426708017-28885-1-git-send-email-geert+renesas@glider.be> References: <1426708017-28885-1-git-send-email-geert+renesas@glider.be> 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, 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 Now we have an R-Car Gen2 CPG Clock Domain driver using the generic PM domain to take care of PM runtime management of the module clocks, we no longer need the legacy default PM domain hack, which also prevents registering the real PM domain. Hence do not enable it when running a multi-platform kernel with genpd support on an R-Car Gen2 SoC. The default PM domain is still needed: - for platforms without genpd support, - for the legacy (non-DT) case, where genpd may take over later, - if genpd is not enabled. Signed-off-by: Geert Uytterhoeven --- drivers/sh/pm_runtime.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c index fe8875f0d7be1155..97d5738f21ae8f04 100644 --- a/drivers/sh/pm_runtime.c +++ b/drivers/sh/pm_runtime.c @@ -83,15 +83,15 @@ static int __init sh_pm_runtime_init(void) #ifndef CONFIG_PM_GENERIC_DOMAINS_OF !of_machine_is_compatible("renesas,r8a73a4") && !of_machine_is_compatible("renesas,r8a7740") && - !of_machine_is_compatible("renesas,sh73a0") && -#endif - !of_machine_is_compatible("renesas,r8a7778") && - !of_machine_is_compatible("renesas,r8a7779") && !of_machine_is_compatible("renesas,r8a7790") && !of_machine_is_compatible("renesas,r8a7791") && !of_machine_is_compatible("renesas,r8a7792") && !of_machine_is_compatible("renesas,r8a7793") && - !of_machine_is_compatible("renesas,r8a7794")) + !of_machine_is_compatible("renesas,r8a7794") && + !of_machine_is_compatible("renesas,sh73a0") && +#endif + !of_machine_is_compatible("renesas,r8a7778") && + !of_machine_is_compatible("renesas,r8a7779")) return 0; }