From patchwork Mon Feb 29 15:44:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Sperl X-Patchwork-Id: 8455281 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 819339F38C for ; Mon, 29 Feb 2016 15:48:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AC026201FE for ; Mon, 29 Feb 2016 15:48:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D34DE201ED for ; Mon, 29 Feb 2016 15:48:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aaQ2L-0003m2-Py; Mon, 29 Feb 2016 15:47:05 +0000 Received: from 212-186-180-163.dynamic.surfer.at ([212.186.180.163] helo=cgate.sperl.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aaQ0F-0000SL-UH; Mon, 29 Feb 2016 15:44:57 +0000 Received: from raspcm.intern.sperl.org (account martin@sperl.org [10.10.10.41] verified) by sperl.org (CommuniGate Pro SMTP 6.1.2) with ESMTPSA id 6395008; Mon, 29 Feb 2016 15:44:11 +0000 From: kernel@martin.sperl.org To: Jonathan Corbet , Stephen Warren , Lee Jones , Eric Anholt , Michael Turquette , Stephen Boyd , Rob Herring , linux-doc@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 7/8] clk: bcm2835: add gates that require PM_DEBUG to be set Date: Mon, 29 Feb 2016 15:44:01 +0000 Message-Id: <1456760642-2412-8-git-send-email-kernel@martin.sperl.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1456760642-2412-1-git-send-email-kernel@martin.sperl.org> References: <1456760642-2412-1-git-send-email-kernel@martin.sperl.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160229_074456_234835_DC8801C9 X-CRM114-Status: UNSURE ( 7.60 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.9 (/) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Sperl MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 From: Martin Sperl Add clocks that require PM_DEBUG to be set and mark this fact in the gate_data structure, so that this fact can get referred to if needed. Signed-off-by: Martin Sperl --- drivers/clk/bcm/clk-bcm2835.c | 16 +++++++++++++++- include/dt-bindings/clock/bcm2835.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index 12ce209..2ddff8f 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -463,6 +463,8 @@ struct bcm2835_gate_data { const char *parent; u32 ctl_reg; + + bool requires_pm_debug; }; struct bcm2835_pll { @@ -2078,10 +2080,22 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { * don't bother exposing) are individual gates off of the * non-stop vpu clock. */ + [BCM2835_CLOCK_PERA] = REGISTER_GATE( + .name = "pera", + .parent = "vpu", + .ctl_reg = CM_PERIACTL, + .requires_pm_debug = true), [BCM2835_CLOCK_PERI_IMAGE] = REGISTER_GATE( .name = "peri_image", .parent = "vpu", - .ctl_reg = CM_PERIICTL), + .ctl_reg = CM_PERIICTL, + .requires_pm_debug = true), + [BCM2835_CLOCK_SYS] = REGISTER_GATE( + .name = "sys", + .parent = "vpu", + .ctl_reg = CM_SYSCTL, + .requires_pm_debug = true), + }; static int bcm2835_clk_probe(struct platform_device *pdev) diff --git a/include/dt-bindings/clock/bcm2835.h b/include/dt-bindings/clock/bcm2835.h index 109086e..7bc03cd 100644 --- a/include/dt-bindings/clock/bcm2835.h +++ b/include/dt-bindings/clock/bcm2835.h @@ -71,3 +71,5 @@ #define BCM2835_CLOCK_DSI1E 53 #define BCM2835_CLOCK_DSI1_IMAGE 54 #define BCM2835_CLOCK_ARM 55 +#define BCM2835_CLOCK_PERA 56 +#define BCM2835_CLOCK_SYS 57