From patchwork Wed Oct 9 14:54:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Jensen X-Patchwork-Id: 3009311 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 86C85BF924 for ; Wed, 9 Oct 2013 14:57:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2050E20240 for ; Wed, 9 Oct 2013 14:57:41 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3303120250 for ; Wed, 9 Oct 2013 14:57:36 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VTvBP-0002mG-C7; Wed, 09 Oct 2013 14:56:17 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VTvAv-0005ud-Kz; Wed, 09 Oct 2013 14:55:45 +0000 Received: from mail-la0-x22e.google.com ([2a00:1450:4010:c03::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VTvAr-0005sR-Mv for linux-arm-kernel@lists.infradead.org; Wed, 09 Oct 2013 14:55:42 +0000 Received: by mail-la0-f46.google.com with SMTP id eh20so780531lab.5 for ; Wed, 09 Oct 2013 07:55:19 -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=34eSryPicK/fzk+k109RQACV9ysBnk/cDaqqucAjhgI=; b=UGjIalael80LFFNQ08wh8puhtwT4Pmbiu0poKOnp7KKCUGCQubyDntbs0KxfDrKmw8 7pbpfaoZR92ZnVwcZbC3TV21nO7B8mfNn8/aV1IMVjJtM6uFyht+H3xliyq7h4Vs3/0j rgq3HkmlSjJxLUi2eVLW1VvMnl3tVDU8RjCYK1w7WJSj5Gpw+TxSi8b4J8yp9l0Jsvxz dXyICXIyZipW7h5W5Unt/1q0TK08KwjSEoujp4K67gwu+hXDbt1SmzKY2MV9Rz31bFBq UVizYCelLPSRwg0nf+QzUCk1hBp7epqJNtlksSx3XLU3Smr6NN0xQIOFHRJyt1CB5SPr dABg== X-Received: by 10.152.115.242 with SMTP id jr18mr1861182lab.40.1381330519482; Wed, 09 Oct 2013 07:55:19 -0700 (PDT) Received: from Ildjarn.ath.cx (static-213-115-41-10.sme.bredbandsbolaget.se. [213.115.41.10]) by mx.google.com with ESMTPSA id w10sm26463986lbv.6.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 09 Oct 2013 07:55:18 -0700 (PDT) From: Jonas Jensen To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v7] clk: add MOXA ART SoCs clock driver Date: Wed, 9 Oct 2013 16:54:42 +0200 Message-Id: <1381330482-13846-1-git-send-email-jonas.jensen@gmail.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1375091062-3773-1-git-send-email-jonas.jensen@gmail.com> References: <1375091062-3773-1-git-send-email-jonas.jensen@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131009_105542_044196_7F0D5351 X-CRM114-Status: GOOD ( 16.52 ) X-Spam-Score: -2.0 (--) Cc: mark.rutland@arm.com, adam.jaremko@gmail.com, mturquette@linaro.org, linux-kernel@vger.kernel.org, tomasz.figa@gmail.com, arm@kernel.org, Jonas Jensen X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 This patch adds MOXA ART SoCs clock driver support. Signed-off-by: Jonas Jensen --- Notes: Since last version, Adam Jaremko has been helping providing info on the clock registers and the SoC in general. He's been looking at bootloader sources in particular, which seem to do the same things with slight variations. Two separate clocks are now registered: clk_pll and clk_apb clk_apb provides the same 48MHz frequency as before but the value is calculated from clk_pll (192MHz) which in turn is calculated from a fixed rate reference (12MHz). Device drivers (watchdog, clocksource, MMC) should generally be interested in reading apb_clk, not clk_pll. clk_pll is obtained by multiplying the content of 0x98100030 (16) with the reference. The reference represent the PCB oscillator crystal, on UC-7112-LX this has part number "12.000 KCC 20GT". apb_clk is obtained by getting the rate of clk_pll and dividing it. I don't think the parent clock can change rate, not without modifying the hardware. Changes since v6: 1. all rates calculated from a fixed rate reference clock 2. register two separate clocks, clk_pll and clk_apb Applies to next-20130927 .../bindings/clock/moxa,moxart-clock.txt | 43 ++++++++ drivers/clk/Makefile | 1 + drivers/clk/clk-moxart.c | 109 +++++++++++++++++++++ 3 files changed, 153 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/moxa,moxart-clock.txt create mode 100644 drivers/clk/clk-moxart.c diff --git a/Documentation/devicetree/bindings/clock/moxa,moxart-clock.txt b/Documentation/devicetree/bindings/clock/moxa,moxart-clock.txt new file mode 100644 index 0000000..61fd327 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/moxa,moxart-clock.txt @@ -0,0 +1,43 @@ +Device Tree Clock bindings for arch-moxart + +This binding uses the common clock binding[1]. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt + +MOXA ART SoCs allow to determine PLL output and APB frequencies +by reading registers holding multiplier and divisor information. + +Required properties: +- compatible : Must be "moxa,moxart-pll-clock" or "moxa,moxart-apb-clock" +- #clock-cells : Should be 0 +- reg : Should contain registers location and length +- clocks : Should contain phandle to parent clock + +Optional properties for "moxa,moxart-pll-clock": +- multiplier-reg : Should contain register offset +- multiplier-mask : Should contain register mask +- multiplier-shift : Should contain number of places the register is shifted to the right +- clock-output-names : Should contain clock name + +Optional properties for "moxa,moxart-apb-clock": +- divisor-reg : Should contain register offset +- divisor-mask : Should contain register mask +- divisor-shift : Should contain number of places the register is shifted to the right +- clock-output-names : Should contain clock name + + +For example: + + clk_pll: clk_pll0@98100000 { + compatible = "moxa,moxart-pll-clock"; + #clock-cells = <0>; + reg = <0x98100000 0x34>; + clocks = <&ref12>; + }; + + clk_apb: clk_apb@98100000 { + compatible = "moxa,moxart-apb-clock"; + #clock-cells = <0>; + reg = <0x98100000 0x34>; + clocks = <&pll0>; + }; diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 7b11106..4c8d857 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_COMMON_CLK) += clk-composite.o # SoCs specific obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835.o +obj-$(CONFIG_ARCH_MOXART) += clk-moxart.o obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o diff --git a/drivers/clk/clk-moxart.c b/drivers/clk/clk-moxart.c new file mode 100644 index 0000000..18b337a --- /dev/null +++ b/drivers/clk/clk-moxart.c @@ -0,0 +1,109 @@ +/* + * MOXA ART SoCs clock driver. + * + * Copyright (C) 2013 Jonas Jensen + * + * Jonas Jensen + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#include +#include +#include +#include + +void __init moxart_of_pll_clk_init(struct device_node *node) +{ + static void __iomem *base; + struct clk *clk, *ref_clk; + unsigned long rate; + unsigned int mul, reg_offset = 0x30, reg_mask = 0x3f, reg_shift = 3; + const char *name = node->name; + + of_property_read_u32(node, "multiplier-reg", ®_offset); + of_property_read_u32(node, "multiplier-mask", ®_mask); + of_property_read_u32(node, "multiplier-shift", ®_shift); + of_property_read_string(node, "clock-output-names", &name); + + base = of_iomap(node, 0); + if (!base) { + pr_err("%s: of_iomap failed\n", node->full_name); + return; + } + + mul = (readl(base + reg_offset) >> reg_shift) & reg_mask; + iounmap(base); + + ref_clk = of_clk_get(node, 0); + if (IS_ERR(ref_clk)) { + pr_err("%s: of_clk_get failed\n", node->full_name); + return; + } + + rate = (mul * clk_get_rate(ref_clk)); + + clk = clk_register_fixed_rate(NULL, name, NULL, CLK_IS_ROOT, rate); + clk_register_clkdev(clk, NULL, name); + of_clk_add_provider(node, of_clk_src_simple_get, clk); +} +CLK_OF_DECLARE(moxart_pll_clock, "moxa,moxart-pll-clock", + moxart_of_pll_clk_init); + +void __init moxart_of_apb_clk_init(struct device_node *node) +{ + static void __iomem *base; + struct clk *clk, *pll_clk; + unsigned long rate; + unsigned int div, val, reg_offset = 0xc, reg_mask = 0x7, reg_shift = 4; + const char *name = node->name; + + of_property_read_u32(node, "divisor-reg", ®_offset); + of_property_read_u32(node, "divisor-mask", ®_mask); + of_property_read_u32(node, "divisor-shift", ®_shift); + of_property_read_string(node, "clock-output-names", &name); + + base = of_iomap(node, 0); + if (!base) { + pr_err("%s: of_iomap failed\n", node->full_name); + return; + } + + val = (readl(base + reg_offset) >> reg_shift) & reg_mask; + iounmap(base); + + switch (val) { + case 1: + div = 3; + break; + case 2: + div = 4; + break; + case 3: + div = 6; + break; + case 4: + div = 8; + break; + default: + div = 2; + break; + } + + pll_clk = of_clk_get(node, 0); + if (IS_ERR(pll_clk)) { + pr_err("%s: of_clk_get failed\n", node->full_name); + return; + } + + rate = clk_get_rate(pll_clk) / (div * 2); + + clk = clk_register_fixed_rate(NULL, name, NULL, CLK_IS_ROOT, rate); + clk_register_clkdev(clk, NULL, name); + of_clk_add_provider(node, of_clk_src_simple_get, clk); +} +CLK_OF_DECLARE(moxart_apb_clock, "moxa,moxart-apb-clock", + moxart_of_apb_clk_init); +