From patchwork Fri May 15 16:38:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Kuske X-Patchwork-Id: 6415531 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 0F561C0432 for ; Fri, 15 May 2015 16:43:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2C405204CF for ; Fri, 15 May 2015 16:43:19 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 51C41204B0 for ; Fri, 15 May 2015 16:43:18 +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 1YtIf7-00038a-MQ; Fri, 15 May 2015 16:40:37 +0000 Received: from mail-wg0-x235.google.com ([2a00:1450:400c:c00::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YtIe7-0001bf-FX for linux-arm-kernel@lists.infradead.org; Fri, 15 May 2015 16:39:37 +0000 Received: by wgbhc8 with SMTP id hc8so85546634wgb.3 for ; Fri, 15 May 2015 09:39:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=x+iFfWVmpyuFvzFCubvTTOBbZsOAXoMbpR+TCaoVsa0=; b=tlljHC8pMVU6uRoMHl8ThLapmQRnBWkldSGaVh1SLOkGh2jgo5Fk6JMWzMxKPWCK8P EeZg35ODZF/2uIpEDS5W0imsaGTBTThDe+ikxt8nU6gekfSx5SGtYmQGzeKJ+GlInOFu AjpntjUpupgxIYv6xzSWrxNfTg+czbHwDSkwT8LtehLktveglcJmvXrPfNi8wflRbOwv 83WosJELs7C1St2Vg5DtTgR7SWqF4n8pVrTxxio2xcTJs+h6BkArx3McZ4XlzvbKL5vs euEsZM2fqs18xZa2Vg/a5kPJJKjYhd42bLUvYc9q+euiFr26VJG3X3yyQA7urJnL8vQ2 VRTg== X-Received: by 10.194.63.226 with SMTP id j2mr20492953wjs.69.1431707953189; Fri, 15 May 2015 09:39:13 -0700 (PDT) Received: from pc-jens.localdomain (p5B2E8A8F.dip0.t-ipconnect.de. [91.46.138.143]) by mx.google.com with ESMTPSA id ek10sm3726040wid.1.2015.05.15.09.39.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 May 2015 09:39:12 -0700 (PDT) From: Jens Kuske To: Maxime Ripard , =?UTF-8?q?Emilio=20L=C3=B3pez?= , Mike Turquette , Linus Walleij , Rob Herring Subject: [PATCH v2 03/10] clk: sunxi: Let divs clocks read the base factor clock name from devicetree Date: Fri, 15 May 2015 18:38:53 +0200 Message-Id: <1431707940-19372-4-git-send-email-jenskuske@gmail.com> X-Mailer: git-send-email 2.4.0 In-Reply-To: <1431707940-19372-1-git-send-email-jenskuske@gmail.com> References: <1431707940-19372-1-git-send-email-jenskuske@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150515_093935_712660_F9F96899 X-CRM114-Status: GOOD ( 16.59 ) X-Spam-Score: -0.8 (/) Cc: devicetree@vger.kernel.org, Vishnu Patekar , linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, Hans de Goede , Chen-Yu Tsai , Jens Kuske , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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 Currently, the sunxi clock driver gets the name for the base factor clock of divs clocks from the name field in factors_data. This prevents reusing of the factor clock for clocks with same properties, but different name. This commit makes the divs setup function try to get a name from clock-output-names in the devicetree. It also removes the name field where possible and merges the sun4i PLL5 and PLL6 clocks. The sun4i PLL5 clock doesn't have a output for the base factor clock, so we still have to use the name field there. Signed-off-by: Jens Kuske --- drivers/clk/sunxi/clk-sunxi.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 17cba4d..afe560c 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -708,18 +708,10 @@ static const struct factors_data sun4i_pll5_data __initconst = { .name = "pll5", }; -static const struct factors_data sun4i_pll6_data __initconst = { - .enable = 31, - .table = &sun4i_pll5_config, - .getter = sun4i_get_pll5_factors, - .name = "pll6", -}; - static const struct factors_data sun6i_a31_pll6_data __initconst = { .enable = 31, .table = &sun6i_a31_pll6_config, .getter = sun6i_a31_get_pll6_factors, - .name = "pll6x2", }; static const struct factors_data sun5i_a13_ahb_data __initconst = { @@ -1099,7 +1091,7 @@ static const struct divs_data pll5_divs_data __initconst = { }; static const struct divs_data pll6_divs_data __initconst = { - .factors = &sun4i_pll6_data, + .factors = &sun4i_pll5_data, .ndivs = 4, .div = { { .shift = 0, .table = pll6_sata_tbl, .gate = 14 }, /* M, SATA */ @@ -1141,6 +1133,7 @@ static void __init sunxi_divs_clk_setup(struct device_node *node, struct clk_gate *gate = NULL; struct clk_fixed_factor *fix_factor; struct clk_divider *divider; + struct factors_data factors = *data->factors; void __iomem *reg; int ndivs = SUNXI_DIVS_MAX_QTY, i = 0; int flags, clkflags; @@ -1149,8 +1142,17 @@ static void __init sunxi_divs_clk_setup(struct device_node *node, if (data->ndivs) ndivs = data->ndivs; + /* Try to find a name for base factor clock */ + for (i = 0; i < ndivs; i++) { + if (data->div[i].self) { + of_property_read_string_index(node, "clock-output-names", + i, &factors.name); + break; + } + } + /* Set up factor clock that we will be dividing */ - pclk = sunxi_factors_clk_setup(node, data->factors); + pclk = sunxi_factors_clk_setup(node, &factors); parent = __clk_get_name(pclk); reg = of_iomap(node, 0);