From patchwork Sun Feb 28 15:37:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Sperl X-Patchwork-Id: 8447351 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 7150DC0553 for ; Sun, 28 Feb 2016 15:45:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 89CB82035E for ; Sun, 28 Feb 2016 15:45:05 +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 9D1BB20340 for ; Sun, 28 Feb 2016 15:45:04 +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 1aa3VS-0002XU-W8; Sun, 28 Feb 2016 15:43:39 +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 1aa3QZ-0005Pu-UC; Sun, 28 Feb 2016 15:38:39 +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 6394914; Sun, 28 Feb 2016 15:37:23 +0000 From: kernel@martin.sperl.org To: Michael Turquette , Stephen Boyd , Stephen Warren , Lee Jones , Eric Anholt , linux-clk@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 16/20] clk: bcm2835: add the camera related clocks cam0, cam1 and ccp2 Date: Sun, 28 Feb 2016 15:37:07 +0000 Message-Id: <1456673831-2408-17-git-send-email-kernel@martin.sperl.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1456673831-2408-1-git-send-email-kernel@martin.sperl.org> References: <1456673831-2408-1-git-send-email-kernel@martin.sperl.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160228_073836_605016_9E67736B X-CRM114-Status: UNSURE ( 9.42 ) 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 the camera related clocks: cam0, cam1 and ccp2 and the corresponding ccp2 clock mux definition. Note that the mux definition is incomplete and essentially is identical to the osc mux right now. But it should contain at least plla_ccp2 in one location. Signed-off-by: Martin Sperl --- drivers/clk/bcm/clk-bcm2835.c | 53 +++++++++++++++++++++++++++++++++++ include/dt-bindings/clock/bcm2835.h | 3 ++ 2 files changed, 56 insertions(+) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index 5c62672..5364f10 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -1428,6 +1428,34 @@ static const char *const bcm2835_clock_vpu_parents[] = { .parents = bcm2835_clock_vpu_parents, \ __VA_ARGS__) +/* ccp2 (camera) parent mux */ +static const char * const bcm2835_clock_ccp2_parents[] = { + "gnd", + "xosc", + "testdebug0", + "testdebug1", + /* + * more parent clocks, but unknown at this time + * the current definition follows the "common" pattern + * that already applies to all the other parent mux + * in so far as all the known mux contain gnd, xosc, testdebug0/1 + * as the first 3 entries. + * The mux should contain "plla_ccp2" at one position. + * here some possible candidates for the next parents in the list. + * plla_ccp2 or ppla_core/per + * pllb_core/per + * pllc_core/per + * plld_core/per + * pllh_aux/pix + * up to 16 different parents + */ +}; + +#define REGISTER_CCP2_CLK(...) REGISTER_CLK( \ + .num_mux_parents = ARRAY_SIZE(bcm2835_clock_ccp2_parents), \ + .parents = bcm2835_clock_ccp2_parents, \ + __VA_ARGS__) + /* * the real definition of all the pll, pll_dividers and clocks * these make use of the above REGISTER_* macros @@ -1777,6 +1805,18 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .div_reg = CM_AVEODIV, .int_bits = 4, .frac_bits = 0), + [BCM2835_CLOCK_CAM0] = REGISTER_PER_CLK( + .name = "cam0", + .ctl_reg = CM_CAM0CTL, + .div_reg = CM_CAM0DIV, + .int_bits = 4, + .frac_bits = 8), + [BCM2835_CLOCK_CAM1] = REGISTER_PER_CLK( + .name = "cam1", + .ctl_reg = CM_CAM1CTL, + .div_reg = CM_CAM1DIV, + .int_bits = 4, + .frac_bits = 8), [BCM2835_CLOCK_DFT] = REGISTER_PER_CLK( .name = "dft", .ctl_reg = CM_DFTCTL, @@ -1870,6 +1910,19 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .int_bits = 4, .frac_bits = 0), + /* clocks with ccp2 parent mux */ + [BCM2835_CLOCK_CCP2] = REGISTER_CCP2_CLK( + /* + * this is possibly a gate of the plla_ccp2 divider + * but as CTL contains 4 bits for mux selection + * it must be a mux + */ + .name = "ccp2", + .ctl_reg = CM_CCP2CTL, + .div_reg = CM_CCP2DIV, + .int_bits = 1, + .frac_bits = 0), + /* the gates */ /* diff --git a/include/dt-bindings/clock/bcm2835.h b/include/dt-bindings/clock/bcm2835.h index f2e72e7..1d70088 100644 --- a/include/dt-bindings/clock/bcm2835.h +++ b/include/dt-bindings/clock/bcm2835.h @@ -63,3 +63,6 @@ #define BCM2835_CLOCK_SLIM 45 #define BCM2835_CLOCK_SMI 46 #define BCM2835_CLOCK_TEC 47 +#define BCM2835_CLOCK_CAM0 48 +#define BCM2835_CLOCK_CAM1 49 +#define BCM2835_CLOCK_CCP2 50