From patchwork Mon Feb 29 15:44:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Sperl X-Patchwork-Id: 8455291 Return-Path: X-Original-To: patchwork-linux-arm@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 404D0C0553 for ; Mon, 29 Feb 2016 15:49:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 64F5C201FE for ; Mon, 29 Feb 2016 15:49:34 +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 8F3D3201ED for ; Mon, 29 Feb 2016 15:49:33 +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 1aaQ2z-0004R7-2J; Mon, 29 Feb 2016 15:47:45 +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 1aaQ0I-0000SL-4c; Mon, 29 Feb 2016 15:45:00 +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 6395009; 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 8/8] clk: bcm2835: add the testdebug clock generators Date: Mon, 29 Feb 2016 15:44:02 +0000 Message-Id: <1456760642-2412-9-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_074458_581979_77A1804B X-CRM114-Status: UNSURE ( 7.44 ) 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=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: Martin Sperl Add the testdebug0/1 clock generators using the osc parent mux. These may also require PM_DEBUG to work propperly. Also the parents are - for now - unclear, so we assume osc parents. Signed-off-by: Martin Sperl --- drivers/clk/bcm/clk-bcm2835.c | 19 +++++++++++++++++++ include/dt-bindings/clock/bcm2835.h | 2 ++ 2 files changed, 21 insertions(+) -- 1.7.10.4 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index 2ddff8f..926fdf5 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -1865,6 +1865,25 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .div_reg = CM_TECDIV, .int_bits = 6, .frac_bits = 0), + /* + * testdebug clocks + * these may possibly require PM_DEBUG to be set as well + * for now we assume these are using the osc parent mux + * (note that testdebugX is in this mux as well, + * so it may produce issues) + */ + [BCM2835_CLOCK_TESTDEBUG0] = REGISTER_OSC_CLK( + .name = "testdebug0", + .ctl_reg = CM_TD0CTL, + .div_reg = CM_TD0DIV, + .int_bits = 12, + .frac_bits = 12), + [BCM2835_CLOCK_TESTDEBUG0] = REGISTER_OSC_CLK( + .name = "testdebug1", + .ctl_reg = CM_TD1CTL, + .div_reg = CM_TD1DIV, + .int_bits = 12, + .frac_bits = 12), /* clocks with vpu parent mux */ [BCM2835_CLOCK_H264] = REGISTER_VPU_CLK( diff --git a/include/dt-bindings/clock/bcm2835.h b/include/dt-bindings/clock/bcm2835.h index 7bc03cd..c752392 100644 --- a/include/dt-bindings/clock/bcm2835.h +++ b/include/dt-bindings/clock/bcm2835.h @@ -73,3 +73,5 @@ #define BCM2835_CLOCK_ARM 55 #define BCM2835_CLOCK_PERA 56 #define BCM2835_CLOCK_SYS 57 +#define BCM2835_CLOCK_TESTDEBUG0 58 +#define BCM2835_CLOCK_TESTDEBUG1 59