From patchwork Thu Jul 31 21:28:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Emilio_L=C3=B3pez?= X-Patchwork-Id: 375449 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4A1D414013E for ; Fri, 1 Aug 2014 07:33:11 +1000 (EST) 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 1XCxw9-0001gf-1j; Thu, 31 Jul 2014 21:30:57 +0000 Received: from yotta.elopez.com.ar ([2a00:1768:1004:d00d:c0de:4:f00d:cafe]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XCxvI-0008Gt-GG for linux-arm-kernel@lists.infradead.org; Thu, 31 Jul 2014 21:30:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=elopez.com.ar; s=mail; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=NIEowSQc15Kff617JYPXvBCA83frR7JPdzVvold+Cxs=; b=QVpsn8SDkfxh2nMwH3yB1WTQfdusCwaKv8fTXiNyPyeKq5ejTvfhpskn8h8HPtsisdo7gyIZrs3nm29/SnfqmNX/FVSDenHrep5eWu1QhVodtpNQNPvO2pEQVNSc45lIGn9pMNo/kix5wHjR9pu2hDk4cXI7ZgrYvQHcvmcKoyO7HLXaczIZ7ciaAMiwLqsr9DEjUAxmXM+ARruqlG08AWC/b9ZVETgZNGDlx4Z+ChJS0Z+WWYWMRmBxkAdQ8/RPQ2z4nQQpUc65Y5bT6zK3N2llURd5eLOIa/9NS9grIkGsCYBL0rlTq0iBArlkAHny2slqWwX7xj2raPw0dgMd3w==; Received: from [181.164.71.8] (helo=desktop.lan) by yotta.elopez.com.ar with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.82_1-5b7a7c0-XX) id 1XCxuw-0003Cn-Tl; Thu, 31 Jul 2014 18:29:43 -0300 From: =?UTF-8?q?Emilio=20L=C3=B3pez?= To: Maxime Ripard , Mike Turquette Subject: [PATCH 4/9] clk: sunxi: PLL2 support for sun4i, sun5i and sun7i Date: Thu, 31 Jul 2014 18:28:07 -0300 Message-Id: <1406842092-25207-5-git-send-email-emilio@elopez.com.ar> X-Mailer: git-send-email 2.0.3 In-Reply-To: <1406842092-25207-1-git-send-email-emilio@elopez.com.ar> References: <1406842092-25207-1-git-send-email-emilio@elopez.com.ar> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140731_143005_232130_452951A2 X-CRM114-Status: GOOD ( 15.23 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Cc: Arnd Bergmann , =?UTF-8?q?Emilio=20L=C3=B3pez?= , codekipper@gmail.com, jonsmirl@gmail.com, Olof Johansson , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org This patch adds support for PLL2 and derivates on sun4i, sun5i and sun7i SoCs. As this PLL is only used for audio and requires good accuracy, we only support two known good rates. Signed-off-by: Emilio López --- Changes from RFC: * Add support for A10 rev. A * Document compatibles * Use fixed factors Documentation/devicetree/bindings/clock/sunxi.txt | 2 + drivers/clk/sunxi/Makefile | 1 + drivers/clk/sunxi/clk-a10-pll2.c | 243 ++++++++++++++++++++++ 3 files changed, 246 insertions(+) create mode 100644 drivers/clk/sunxi/clk-a10-pll2.c diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt index d3a5c3c..41ada31 100644 --- a/Documentation/devicetree/bindings/clock/sunxi.txt +++ b/Documentation/devicetree/bindings/clock/sunxi.txt @@ -10,6 +10,8 @@ Required properties: "allwinner,sun4i-a10-pll1-clk" - for the main PLL clock and PLL4 "allwinner,sun6i-a31-pll1-clk" - for the main PLL clock on A31 "allwinner,sun8i-a23-pll1-clk" - for the main PLL clock on A23 + "allwinner,sun4i-a10-a-pll2-clk" - for the PLL2 clock on A10 rev. A + "allwinner,sun4i-a10-b-pll2-clk" - for the PLL2 clock on A10 rev. B "allwinner,sun4i-a10-pll5-clk" - for the PLL5 clock "allwinner,sun4i-a10-pll6-clk" - for the PLL6 clock "allwinner,sun6i-a31-pll6-clk" - for the PLL6 clock on A31 diff --git a/drivers/clk/sunxi/Makefile b/drivers/clk/sunxi/Makefile index 6850cba..dcd5709 100644 --- a/drivers/clk/sunxi/Makefile +++ b/drivers/clk/sunxi/Makefile @@ -4,6 +4,7 @@ obj-y += clk-sunxi.o clk-factors.o obj-y += clk-a10-hosc.o +obj-y += clk-a10-pll2.o obj-y += clk-a20-gmac.o obj-$(CONFIG_MFD_SUN6I_PRCM) += \ diff --git a/drivers/clk/sunxi/clk-a10-pll2.c b/drivers/clk/sunxi/clk-a10-pll2.c new file mode 100644 index 0000000..bcf7d0b --- /dev/null +++ b/drivers/clk/sunxi/clk-a10-pll2.c @@ -0,0 +1,243 @@ +/* + * Copyright 2014 Emilio López + * + * Emilio López + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include + +#define SUN4I_PLL2_ENABLE 31 +#define SUN4I_PLL2_A_VCOBIAS 0 +#define SUN4I_PLL2_A_VCOBIAS_MASK 0x1F +#define SUN4I_PLL2_A_N 7 +#define SUN4I_PLL2_A_N_MASK 0x7F +#define SUN4I_PLL2_B_POST_DIV 26 +#define SUN4I_PLL2_B_POST_DIV_MASK 0xF +#define SUN4I_PLL2_B_N 8 +#define SUN4I_PLL2_B_N_MASK 0x7F +#define SUN4I_PLL2_B_PRE_DIV 0 +#define SUN4I_PLL2_B_PRE_DIV_MASK 0x1F + +#define SUN4I_PLL2_OUTPUTS 4 + +struct sun4i_pll2_clk { + struct clk_hw hw; + void __iomem *reg; +}; + +static inline struct sun4i_pll2_clk *to_sun4i_pll2_clk(struct clk_hw *hw) +{ + return container_of(hw, struct sun4i_pll2_clk, hw); +} + +static unsigned long sun4i_pll2_recalc_rate_a(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct sun4i_pll2_clk *clk = to_sun4i_pll2_clk(hw); + int vcobias, n; + u32 val; + + val = readl(clk->reg); + vcobias = (val >> SUN4I_PLL2_A_VCOBIAS) & SUN4I_PLL2_A_VCOBIAS_MASK; + n = (val >> SUN4I_PLL2_A_N) & SUN4I_PLL2_A_N_MASK; + + if (vcobias == 10 && n == 94) + return 22579200; + else if (vcobias == 9 && n == 83) + return 24576000; + + /* + * Unfortunately we don't really have much documentation on how + * these factors relate mathematically + */ + return 0; +} + +static unsigned long sun4i_pll2_recalc_rate_b(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct sun4i_pll2_clk *clk = to_sun4i_pll2_clk(hw); + int n, prediv, postdiv; + u32 val; + + val = readl(clk->reg); + n = (val >> SUN4I_PLL2_B_N) & SUN4I_PLL2_B_N_MASK; + prediv = (val >> SUN4I_PLL2_B_PRE_DIV) & SUN4I_PLL2_B_PRE_DIV_MASK; + postdiv = (val >> SUN4I_PLL2_B_POST_DIV) & SUN4I_PLL2_B_POST_DIV_MASK; + + /* 0 is a special case and means 1 */ + if (n == 0) + n = 1; + if (prediv == 0) + prediv = 1; + if (postdiv == 0) + postdiv = 1; + + return ((parent_rate * n) / prediv) / postdiv; +} + +static long sun4i_pll2_round_rate(struct clk_hw *hw, unsigned long rate, + unsigned long *parent_rate) +{ + /* + * There is only two interesting rates for the audio PLL, the + * rest isn't really usable due to accuracy concerns. Therefore, + * we specifically round to those rates here + */ + if (rate < 22579200) + return -EINVAL; + + if (rate >= 22579200 && rate < 24576000) + return 22579200; + + return 24576000; +} + +static int sun4i_pll2_set_rate_a(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate) +{ + struct sun4i_pll2_clk *clk = to_sun4i_pll2_clk(hw); + u32 val = readl(clk->reg); + + val &= ~(SUN4I_PLL2_A_VCOBIAS_MASK << SUN4I_PLL2_A_VCOBIAS); + val &= ~(SUN4I_PLL2_A_N_MASK << SUN4I_PLL2_A_N); + + if (rate == 22579200) + val |= (10 << SUN4I_PLL2_A_VCOBIAS) | (94 << SUN4I_PLL2_A_N); + else if (rate == 24576000) + val |= (9 << SUN4I_PLL2_A_VCOBIAS) | (83 << SUN4I_PLL2_A_N); + else + return -EINVAL; + + writel(val, clk->reg); + + return 0; +} + +static int sun4i_pll2_set_rate_b(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate) +{ + struct sun4i_pll2_clk *clk = to_sun4i_pll2_clk(hw); + u32 val = readl(clk->reg); + + val &= ~(SUN4I_PLL2_B_N_MASK << SUN4I_PLL2_B_N); + val &= ~(SUN4I_PLL2_B_PRE_DIV_MASK << SUN4I_PLL2_B_PRE_DIV); + val &= ~(SUN4I_PLL2_B_POST_DIV_MASK << SUN4I_PLL2_B_POST_DIV); + + val |= (21 << SUN4I_PLL2_B_PRE_DIV) | (4 << SUN4I_PLL2_B_POST_DIV); + + if (rate == 22579200) + val |= (79 << SUN4I_PLL2_B_N); + else if (rate == 24576000) + val |= (86 << SUN4I_PLL2_B_N); + else + return -EINVAL; + + writel(val, clk->reg); + + return 0; +} + +static const struct clk_ops sun4i_pll2_ops_a = { + .recalc_rate = sun4i_pll2_recalc_rate_a, + .round_rate = sun4i_pll2_round_rate, + .set_rate = sun4i_pll2_set_rate_a, +}; + + +static const struct clk_ops sun4i_pll2_ops_b = { + .recalc_rate = sun4i_pll2_recalc_rate_b, + .round_rate = sun4i_pll2_round_rate, + .set_rate = sun4i_pll2_set_rate_b, +}; + +static const struct of_device_id pll2_matches[] __initconst = { + { .compatible = "allwinner,sun4i-a10-a-pll2-clk", .data = &sun4i_pll2_ops_a }, + { .compatible = "allwinner,sun4i-a10-b-pll2-clk", .data = &sun4i_pll2_ops_b }, + { /* sentinel */ }, +}; + +static void __init sun4i_pll2_setup(struct device_node *np) +{ + const char *clk_name = np->name, *parent; + const struct of_device_id *match; + struct clk_onecell_data *clk_data; + const struct clk_ops *pll2_ops; + struct sun4i_pll2_clk *pll2; + struct clk_gate *gate; + struct clk **clks; + void __iomem *reg; + + /* Choose the correct ops for pll2 */ + match = of_match_node(pll2_matches, np); + pll2_ops = match->data; + + pll2 = kzalloc(sizeof(*pll2), GFP_KERNEL); + gate = kzalloc(sizeof(*gate), GFP_KERNEL); + clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL); + clks = kcalloc(SUN4I_PLL2_OUTPUTS, sizeof(*clks), GFP_KERNEL); + if (!pll2 || !gate || !clk_data || !clks) + goto free_mem; + + reg = of_iomap(np, 0); + parent = of_clk_get_parent_name(np, 0); + of_property_read_string_index(np, "clock-output-names", 0, &clk_name); + + pll2->reg = reg; + gate->reg = reg; + gate->bit_idx = SUN4I_PLL2_ENABLE; + + /* PLL2, also known as PLL2x1 */ + of_property_read_string_index(np, "clock-output-names", 0, &clk_name); + clks[0] = clk_register_composite(NULL, clk_name, &parent, 1, NULL, NULL, + &pll2->hw, pll2_ops, + &gate->hw, &clk_gate_ops, 0); + WARN_ON(IS_ERR(clks[0])); + clk_set_rate(clks[0], 22579200); + parent = clk_name; + + /* PLL2x2, 1/4 the rate of PLL2x8 */ + of_property_read_string_index(np, "clock-output-names", 1, &clk_name); + clks[1] = clk_register_fixed_factor(NULL, clk_name, parent, + CLK_SET_RATE_PARENT, 2, 1); + WARN_ON(IS_ERR(clks[1])); + + /* PLL2x4, 1/2 the rate of PLL2x8 */ + of_property_read_string_index(np, "clock-output-names", 2, &clk_name); + clks[2] = clk_register_fixed_factor(NULL, clk_name, parent, + CLK_SET_RATE_PARENT, 4, 1); + WARN_ON(IS_ERR(clks[2])); + + /* PLL2x8, double of PLL2 without the post divisor */ + of_property_read_string_index(np, "clock-output-names", 3, &clk_name); + clks[3] = clk_register_fixed_factor(NULL, clk_name, parent, + CLK_SET_RATE_PARENT, 2 * 4, 1); + WARN_ON(IS_ERR(clks[3])); + + clk_data->clks = clks; + clk_data->clk_num = SUN4I_PLL2_OUTPUTS; + of_clk_add_provider(np, of_clk_src_onecell_get, clk_data); + + return; + +free_mem: + kfree(pll2); + kfree(gate); + kfree(clk_data); + kfree(clks); +} +CLK_OF_DECLARE(sun4i_pll2_a, "allwinner,sun4i-a10-a-pll2-clk", sun4i_pll2_setup); +CLK_OF_DECLARE(sun4i_pll2_b, "allwinner,sun4i-a10-b-pll2-clk", sun4i_pll2_setup);