From patchwork Thu Oct 1 14:38:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 7309251 X-Patchwork-Delegate: geert@linux-m68k.org 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 1048CBEEA4 for ; Thu, 1 Oct 2015 14:37:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3041820697 for ; Thu, 1 Oct 2015 14:37:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 544C320620 for ; Thu, 1 Oct 2015 14:37:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753136AbbJAOhx (ORCPT ); Thu, 1 Oct 2015 10:37:53 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:36687 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750899AbbJAOhw (ORCPT ); Thu, 1 Oct 2015 10:37:52 -0400 Received: by pablk4 with SMTP id lk4so75913656pab.3; Thu, 01 Oct 2015 07:37:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=TgRfpp1un6ElDxzGtYVJCuWrjw0HqKgXtFlQo39d1bw=; b=d1NAQR10M4Fq10tbRtYw+80elbRLoC3NcWegf0+nt20GbJPstqSuxI4sY4u1unWn2S 71lflNqiL2+dqGHui4R1qdOzpdD0V42ef3sGY2H910tGBWvWL4Qg76lT0tPNFMlUpgor 4qJJ8+Prc+k11whT2gZcMvmQW8mQkqGkE53nBSc9Z3yapGPzx/vYQmV/DczUoonoD3NX JbxSuL5W8K5nym66AjJEyYIc+gAOlfzjh2DXK9TvbL7W7lH4gtMgPQ18Apq/lmlUbC+t TQAzss93tATbQjz5t2sJjlyW2qm3MMHSbQFFWBJoSTW++m8nJgcmNu56zhlf5W7misZ1 jVUw== X-Received: by 10.69.0.132 with SMTP id ay4mr12490543pbd.87.1443710271976; Thu, 01 Oct 2015 07:37:51 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id xg2sm7149895pbb.2.2015.10.01.07.37.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Oct 2015 07:37:51 -0700 (PDT) From: Magnus Damm To: linux-clk@vger.kernel.org Cc: kuninori.morimoto.gx@renesas.com, linux-sh@vger.kernel.org, mturquette@baylibre.com, gaku.inami.xw@bp.renesas.com, sboyd@codeaurora.org, horms@verge.net.au, geert@linux-m68k.org, laurent.pinchart@ideasonboard.com, Magnus Damm Date: Thu, 01 Oct 2015 23:38:07 +0900 Message-Id: <20151001143807.20618.67920.sendpatchset@little-apple> In-Reply-To: <20151001143717.20618.26365.sendpatchset@little-apple> References: <20151001143717.20618.26365.sendpatchset@little-apple> Subject: [PATCH v8 05/05] drivers: sh: Handle PM_GENERIC_DOMAINS_OF=n with r8a7795 MSSR 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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 From: Geert Uytterhoeven If the new CPG/MSSR device node is present, but CONFIG_PM_GENERIC_DOMAINS_OF=n, the legacy clock domain should be enabled. Else the module clocks are not properly enabled when needed. Signed-off-by: Geert Uytterhoeven Signed-off-by: Magnus Damm --- Changes since V7: (Magnus Damm ) - New patch, based on local r8a7791 patch from Geert "drivers: sh: Handle CONFIG_PM_GENERIC_DOMAINS_OF=n with new CPG/MSSR" - Modified to match on r8a7795 drivers/sh/pm_runtime.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/drivers/sh/pm_runtime.c +++ work/drivers/sh/pm_runtime.c 2015-10-01 18:51:47.280513000 +0900 @@ -36,7 +36,10 @@ static int __init sh_pm_runtime_init(voi { if (IS_ENABLED(CONFIG_ARCH_SHMOBILE)) { if (!of_find_compatible_node(NULL, NULL, - "renesas,cpg-mstp-clocks")) + "renesas,cpg-mstp-clocks") && + (IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS_OF) || + !of_find_compatible_node(NULL, NULL, + "renesas,r8a7795-cpg-mssr"))) return 0; if (IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS_OF) && of_find_node_with_property(NULL, "#power-domain-cells"))