From: "Rafał Miłecki" <zajec5@gmail.com> To: Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@codeaurora.org> Cc: linux-clk@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, "Rafał Miłecki" <rafal@milecki.pl>, "Rob Herring" <robh+dt@kernel.org>, "Pawel Moll" <pawel.moll@arm.com>, "Mark Rutland" <mark.rutland@arm.com>, "Ian Campbell" <ijc+devicetree@hellion.org.uk>, "Kumar Gala" <galak@codeaurora.org>, "Florian Fainelli" <f.fainelli@gmail.com>, "Jon Mason" <jonmason@broadcom.com>, "Eric Anholt" <eric@anholt.net>, "Stephen Warren" <swarren@wwwdotorg.org>, devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2] clk: bcm: Add driver for Northstar ILP clock Date: Sat, 30 Jul 2016 00:45:40 +0200 [thread overview] Message-ID: <1469832362-13947-1-git-send-email-zajec5@gmail.com> (raw) In-Reply-To: <1469797120-29298-1-git-send-email-zajec5@gmail.com> From: Rafał Miłecki <rafal@milecki.pl> This clock is present on cheaper Northstar devices like BCM53573 or BCM47189 using Corex-A7. This driver uses PMU (Power Management Unit) to calculate clock rate and allows using it in a generic (clk_*) way. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> --- V2: Rebase on top of clk-next Use ALP as parent clock Improve comments Switch from ioremap_nocache to ioremap Check of_clk_add_provide result for error --- .../devicetree/bindings/clock/brcm,ns-ilp.txt | 26 ++++ drivers/clk/bcm/Makefile | 1 + drivers/clk/bcm/clk-ns-ilp.c | 147 +++++++++++++++++++++ 3 files changed, 174 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/brcm,ns-ilp.txt create mode 100644 drivers/clk/bcm/clk-ns-ilp.c diff --git a/Documentation/devicetree/bindings/clock/brcm,ns-ilp.txt b/Documentation/devicetree/bindings/clock/brcm,ns-ilp.txt new file mode 100644 index 0000000..2c862a0 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/brcm,ns-ilp.txt @@ -0,0 +1,26 @@ +Broadcom Northstar ILP clock +============================ + +This binding uses the common clock binding: + Documentation/devicetree/bindings/clock/clock-bindings.txt + +This binding is used for ILP clock on Broadcom Northstar devices using +Corex-A7 CPU. ILP clock depends on ALP one and has to be calculated on +runtime. + +Required properties: +- compatible: "brcm,ns-ilp" +- reg: iomem address range of PMU (Power Management Unit) +- reg-names: "pmu", the only needed & supported reg right now +- clocks: has to reference an ALP clock +- #clock-cells: should be <0> + +Example: + +ilp: ilp { + compatible = "brcm,ns-ilp"; + reg = <0x18012000 0x1000>; + reg-names = "pmu"; + clocks = <&alp>; + #clock-cells = <0>; +}; diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile index 1d79bd2..1389379 100644 --- a/drivers/clk/bcm/Makefile +++ b/drivers/clk/bcm/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_COMMON_CLK_IPROC) += clk-ns2.o obj-$(CONFIG_ARCH_BCM_CYGNUS) += clk-cygnus.o obj-$(CONFIG_ARCH_BCM_NSP) += clk-nsp.o obj-$(CONFIG_ARCH_BCM_5301X) += clk-nsp.o +obj-$(CONFIG_ARCH_BCM_5301X) += clk-ns-ilp.o diff --git a/drivers/clk/bcm/clk-ns-ilp.c b/drivers/clk/bcm/clk-ns-ilp.c new file mode 100644 index 0000000..0337313 --- /dev/null +++ b/drivers/clk/bcm/clk-ns-ilp.c @@ -0,0 +1,147 @@ +/* + * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/clk.h> +#include <linux/clk-provider.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/slab.h> + +#define PMU_XTAL_FREQ_RATIO 0x66c +#define XTAL_ALP_PER_4ILP 0x00001fff +#define XTAL_CTL_EN 0x80000000 +#define PMU_SLOW_CLK_PERIOD 0x6dc + +struct ns_ilp { + struct clk *clk; + struct clk_hw hw; + void __iomem *pmu; +}; + +static int ns_ilp_enable(struct clk_hw *hw) +{ + struct ns_ilp *ilp = container_of(hw, struct ns_ilp, hw); + + writel(0x10199, ilp->pmu + PMU_SLOW_CLK_PERIOD); + writel(0x10000, ilp->pmu + 0x674); + + return 0; +} + +static unsigned long ns_ilp_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct ns_ilp *ilp = container_of(hw, struct ns_ilp, hw); + void __iomem *pmu = ilp->pmu; + u32 last_val, cur_val; + u32 sum = 0, num = 0, loop_num = 0; + u32 avg; + + /* Enable measurement */ + writel(XTAL_CTL_EN, pmu + PMU_XTAL_FREQ_RATIO); + + /* Read initial value */ + last_val = readl(pmu + PMU_XTAL_FREQ_RATIO) & XTAL_ALP_PER_4ILP; + + /* + * At minimum we should loop for a bit to let hardware do the + * measurement. This isn't very accurate however, so for a better + * precision lets try getting 20 different values for and use average. + */ + while (num < 20) { + cur_val = readl(pmu + PMU_XTAL_FREQ_RATIO) & XTAL_ALP_PER_4ILP; + + if (cur_val != last_val) { + /* Got different value, use it */ + sum += cur_val; + num++; + loop_num = 0; + last_val = cur_val; + } else if (++loop_num > 5000) { + /* Same value over and over, give up */ + sum += cur_val; + num++; + break; + } + } + + /* Disable measurement to save power */ + writel(0x0, pmu + PMU_XTAL_FREQ_RATIO); + + avg = sum / num; + + return parent_rate * 4 / avg; +} + +static const struct clk_ops ns_ilp_clk_ops = { + .enable = ns_ilp_enable, + .recalc_rate = ns_ilp_recalc_rate, +}; + +static void ns_ilp_init(struct device_node *np) +{ + struct ns_ilp *ilp; + struct resource res; + struct clk_init_data init = { 0 }; + const char *parent_name; + int index; + int err; + + ilp = kzalloc(sizeof(*ilp), GFP_KERNEL); + if (!ilp) + return; + + parent_name = of_clk_get_parent_name(np, 0); + if (!parent_name) { + err = -ENOENT; + goto err_free_ilp; + } + + /* TODO: This looks generic, try making it OF helper. */ + index = of_property_match_string(np, "reg-names", "pmu"); + if (index < 0) { + err = index; + goto err_free_ilp; + } + err = of_address_to_resource(np, index, &res); + if (err) + goto err_free_ilp; + ilp->pmu = ioremap(res.start, resource_size(&res)); + if (IS_ERR(ilp->pmu)) { + err = PTR_ERR(ilp->pmu); + goto err_free_ilp; + } + + init.name = np->name; + init.ops = &ns_ilp_clk_ops; + init.parent_names = &parent_name; + init.num_parents = 1; + + ilp->hw.init = &init; + ilp->clk = clk_register(NULL, &ilp->hw); + if (WARN_ON(IS_ERR(ilp->clk))) + goto err_unmap_pmu; + + err = of_clk_add_provider(np, of_clk_src_simple_get, ilp->clk); + if (err) + goto err_clk_unregister; + + return; + +err_clk_unregister: + clk_unregister(ilp->clk); +err_unmap_pmu: + iounmap(ilp->pmu); +err_free_ilp: + kfree(ilp); + pr_err("Failed to init ILP clock: %d\n", err); +} +CLK_OF_DECLARE(ns_ilp_clk, "brcm,ns-ilp", ns_ilp_init); -- 1.8.4.5
WARNING: multiple messages have this Message-ID (diff)
From: "Rafał Miłecki" <zajec5@gmail.com> To: Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@codeaurora.org> Cc: linux-clk@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, "Rafał Miłecki" <rafal@milecki.pl>, "Rob Herring" <robh+dt@kernel.org>, "Pawel Moll" <pawel.moll@arm.com>, "Mark Rutland" <mark.rutland@arm.com>, "Ian Campbell" <ijc+devicetree@hellion.org.uk>, "Kumar Gala" <galak@codeaurora.org>, "Florian Fainelli" <f.fainelli@gmail.com>, "Jon Mason" <jonmason@broadcom.com>, "Eric Anholt" <eric@anholt.net>, "Stephen Warren" <swarren@wwwdotorg.org>, "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" <devicetree@vger.kernel.org>, "open list" <linux-kernel@vger.kernel.org> Subject: [PATCH V2] clk: bcm: Add driver for Northstar ILP clock Date: Sat, 30 Jul 2016 00:45:40 +0200 [thread overview] Message-ID: <1469832362-13947-1-git-send-email-zajec5@gmail.com> (raw) In-Reply-To: <1469797120-29298-1-git-send-email-zajec5@gmail.com> From: Rafał Miłecki <rafal@milecki.pl> This clock is present on cheaper Northstar devices like BCM53573 or BCM47189 using Corex-A7. This driver uses PMU (Power Management Unit) to calculate clock rate and allows using it in a generic (clk_*) way. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> --- V2: Rebase on top of clk-next Use ALP as parent clock Improve comments Switch from ioremap_nocache to ioremap Check of_clk_add_provide result for error --- .../devicetree/bindings/clock/brcm,ns-ilp.txt | 26 ++++ drivers/clk/bcm/Makefile | 1 + drivers/clk/bcm/clk-ns-ilp.c | 147 +++++++++++++++++++++ 3 files changed, 174 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/brcm,ns-ilp.txt create mode 100644 drivers/clk/bcm/clk-ns-ilp.c diff --git a/Documentation/devicetree/bindings/clock/brcm,ns-ilp.txt b/Documentation/devicetree/bindings/clock/brcm,ns-ilp.txt new file mode 100644 index 0000000..2c862a0 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/brcm,ns-ilp.txt @@ -0,0 +1,26 @@ +Broadcom Northstar ILP clock +============================ + +This binding uses the common clock binding: + Documentation/devicetree/bindings/clock/clock-bindings.txt + +This binding is used for ILP clock on Broadcom Northstar devices using +Corex-A7 CPU. ILP clock depends on ALP one and has to be calculated on +runtime. + +Required properties: +- compatible: "brcm,ns-ilp" +- reg: iomem address range of PMU (Power Management Unit) +- reg-names: "pmu", the only needed & supported reg right now +- clocks: has to reference an ALP clock +- #clock-cells: should be <0> + +Example: + +ilp: ilp { + compatible = "brcm,ns-ilp"; + reg = <0x18012000 0x1000>; + reg-names = "pmu"; + clocks = <&alp>; + #clock-cells = <0>; +}; diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile index 1d79bd2..1389379 100644 --- a/drivers/clk/bcm/Makefile +++ b/drivers/clk/bcm/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_COMMON_CLK_IPROC) += clk-ns2.o obj-$(CONFIG_ARCH_BCM_CYGNUS) += clk-cygnus.o obj-$(CONFIG_ARCH_BCM_NSP) += clk-nsp.o obj-$(CONFIG_ARCH_BCM_5301X) += clk-nsp.o +obj-$(CONFIG_ARCH_BCM_5301X) += clk-ns-ilp.o diff --git a/drivers/clk/bcm/clk-ns-ilp.c b/drivers/clk/bcm/clk-ns-ilp.c new file mode 100644 index 0000000..0337313 --- /dev/null +++ b/drivers/clk/bcm/clk-ns-ilp.c @@ -0,0 +1,147 @@ +/* + * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/clk.h> +#include <linux/clk-provider.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/slab.h> + +#define PMU_XTAL_FREQ_RATIO 0x66c +#define XTAL_ALP_PER_4ILP 0x00001fff +#define XTAL_CTL_EN 0x80000000 +#define PMU_SLOW_CLK_PERIOD 0x6dc + +struct ns_ilp { + struct clk *clk; + struct clk_hw hw; + void __iomem *pmu; +}; + +static int ns_ilp_enable(struct clk_hw *hw) +{ + struct ns_ilp *ilp = container_of(hw, struct ns_ilp, hw); + + writel(0x10199, ilp->pmu + PMU_SLOW_CLK_PERIOD); + writel(0x10000, ilp->pmu + 0x674); + + return 0; +} + +static unsigned long ns_ilp_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct ns_ilp *ilp = container_of(hw, struct ns_ilp, hw); + void __iomem *pmu = ilp->pmu; + u32 last_val, cur_val; + u32 sum = 0, num = 0, loop_num = 0; + u32 avg; + + /* Enable measurement */ + writel(XTAL_CTL_EN, pmu + PMU_XTAL_FREQ_RATIO); + + /* Read initial value */ + last_val = readl(pmu + PMU_XTAL_FREQ_RATIO) & XTAL_ALP_PER_4ILP; + + /* + * At minimum we should loop for a bit to let hardware do the + * measurement. This isn't very accurate however, so for a better + * precision lets try getting 20 different values for and use average. + */ + while (num < 20) { + cur_val = readl(pmu + PMU_XTAL_FREQ_RATIO) & XTAL_ALP_PER_4ILP; + + if (cur_val != last_val) { + /* Got different value, use it */ + sum += cur_val; + num++; + loop_num = 0; + last_val = cur_val; + } else if (++loop_num > 5000) { + /* Same value over and over, give up */ + sum += cur_val; + num++; + break; + } + } + + /* Disable measurement to save power */ + writel(0x0, pmu + PMU_XTAL_FREQ_RATIO); + + avg = sum / num; + + return parent_rate * 4 / avg; +} + +static const struct clk_ops ns_ilp_clk_ops = { + .enable = ns_ilp_enable, + .recalc_rate = ns_ilp_recalc_rate, +}; + +static void ns_ilp_init(struct device_node *np) +{ + struct ns_ilp *ilp; + struct resource res; + struct clk_init_data init = { 0 }; + const char *parent_name; + int index; + int err; + + ilp = kzalloc(sizeof(*ilp), GFP_KERNEL); + if (!ilp) + return; + + parent_name = of_clk_get_parent_name(np, 0); + if (!parent_name) { + err = -ENOENT; + goto err_free_ilp; + } + + /* TODO: This looks generic, try making it OF helper. */ + index = of_property_match_string(np, "reg-names", "pmu"); + if (index < 0) { + err = index; + goto err_free_ilp; + } + err = of_address_to_resource(np, index, &res); + if (err) + goto err_free_ilp; + ilp->pmu = ioremap(res.start, resource_size(&res)); + if (IS_ERR(ilp->pmu)) { + err = PTR_ERR(ilp->pmu); + goto err_free_ilp; + } + + init.name = np->name; + init.ops = &ns_ilp_clk_ops; + init.parent_names = &parent_name; + init.num_parents = 1; + + ilp->hw.init = &init; + ilp->clk = clk_register(NULL, &ilp->hw); + if (WARN_ON(IS_ERR(ilp->clk))) + goto err_unmap_pmu; + + err = of_clk_add_provider(np, of_clk_src_simple_get, ilp->clk); + if (err) + goto err_clk_unregister; + + return; + +err_clk_unregister: + clk_unregister(ilp->clk); +err_unmap_pmu: + iounmap(ilp->pmu); +err_free_ilp: + kfree(ilp); + pr_err("Failed to init ILP clock: %d\n", err); +} +CLK_OF_DECLARE(ns_ilp_clk, "brcm,ns-ilp", ns_ilp_init); -- 1.8.4.5
next prev parent reply other threads:[~2016-07-29 22:46 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-07-29 12:58 [PATCH] clk: bcm: Add driver for Northstar ILP clock Rafał Miłecki 2016-07-29 12:58 ` Rafał Miłecki 2016-07-29 13:15 ` Mark Rutland 2016-07-29 13:15 ` Mark Rutland 2016-07-29 21:24 ` Rafał Miłecki 2016-07-29 21:24 ` Rafał Miłecki 2016-07-29 21:24 ` Rafał Miłecki 2016-08-01 12:36 ` Mark Rutland 2016-07-29 17:02 ` kbuild test robot 2016-07-29 20:44 ` Ray Jui 2016-07-29 20:46 ` Rafał Miłecki 2016-07-29 20:46 ` Rafał Miłecki 2016-07-29 20:49 ` Ray Jui 2016-07-29 20:52 ` Rafał Miłecki 2016-07-29 20:52 ` Rafał Miłecki 2016-07-29 20:55 ` Florian Fainelli 2016-07-29 20:59 ` Ray Jui 2016-07-29 20:59 ` Rafał Miłecki 2016-07-29 20:59 ` Rafał Miłecki 2016-07-29 22:45 ` Rafał Miłecki [this message] 2016-07-29 22:45 ` [PATCH V2] " Rafał Miłecki 2016-07-31 19:38 ` Paul Gortmaker 2016-07-31 19:38 ` Paul Gortmaker 2016-07-31 19:38 ` Paul Gortmaker 2016-08-01 16:33 ` Rob Herring
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1469832362-13947-1-git-send-email-zajec5@gmail.com \ --to=zajec5@gmail.com \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=devicetree@vger.kernel.org \ --cc=eric@anholt.net \ --cc=f.fainelli@gmail.com \ --cc=galak@codeaurora.org \ --cc=ijc+devicetree@hellion.org.uk \ --cc=jonmason@broadcom.com \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mturquette@baylibre.com \ --cc=pawel.moll@arm.com \ --cc=rafal@milecki.pl \ --cc=robh+dt@kernel.org \ --cc=sboyd@codeaurora.org \ --cc=swarren@wwwdotorg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.