]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'clk/clk-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:40 +0000 (15:02 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:40 +0000 (15:02 +0200)
Conflicts:
drivers/clk/Makefile

14 files changed:
Documentation/devicetree/bindings/clock/keystone-gate.txt [new file with mode: 0644]
Documentation/devicetree/bindings/clock/keystone-pll.txt [new file with mode: 0644]
Documentation/devicetree/bindings/clock/xgene.txt [new file with mode: 0644]
arch/arm64/boot/dts/apm-storm.dtsi
drivers/clk/Kconfig
drivers/clk/Makefile
drivers/clk/clk-wm831x.c
drivers/clk/clk-xgene.c [new file with mode: 0644]
drivers/clk/clk.c
drivers/clk/keystone/Makefile [new file with mode: 0644]
drivers/clk/keystone/gate.c [new file with mode: 0644]
drivers/clk/keystone/pll.c [new file with mode: 0644]
drivers/clk/zynq/clkc.c
include/linux/clk-provider.h

diff --git a/Documentation/devicetree/bindings/clock/keystone-gate.txt b/Documentation/devicetree/bindings/clock/keystone-gate.txt
new file mode 100644 (file)
index 0000000..c5aa187
--- /dev/null
@@ -0,0 +1,29 @@
+Status: Unstable - ABI compatibility may be broken in the future
+
+Binding for Keystone gate control driver which uses PSC controller IP.
+
+This binding uses the common clock binding[1].
+
+[1] Documentation/devicetree/bindings/clock/clock-bindings.txt
+
+Required properties:
+- compatible : shall be "ti,keystone,psc-clock".
+- #clock-cells : from common clock binding; shall be set to 0.
+- clocks : parent clock phandle
+- reg :        psc control and domain address address space
+- reg-names : psc control and domain registers
+- domain-id : psc domain id needed to check the transition state register
+
+Optional properties:
+- clock-output-names : From common clock binding to override the
+                       default output clock name
+Example:
+       clkusb: clkusb {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,psc-clock";
+               clocks = <&chipclk16>;
+               clock-output-names = "usb";
+               reg = <0x02350008 0xb00>, <0x02350000 0x400>;
+               reg-names = "control", "domain";
+               domain-id = <0>;
+       };
diff --git a/Documentation/devicetree/bindings/clock/keystone-pll.txt b/Documentation/devicetree/bindings/clock/keystone-pll.txt
new file mode 100644 (file)
index 0000000..12bd726
--- /dev/null
@@ -0,0 +1,84 @@
+Status: Unstable - ABI compatibility may be broken in the future
+
+Binding for keystone PLLs. The main PLL IP typically has a multiplier,
+a divider and a post divider. The additional PLL IPs like ARMPLL, DDRPLL
+and PAPLL are controlled by the memory mapped register where as the Main
+PLL is controlled by a PLL controller registers along with memory mapped
+registers.
+
+This binding uses the common clock binding[1].
+
+[1] Documentation/devicetree/bindings/clock/clock-bindings.txt
+
+Required properties:
+- #clock-cells : from common clock binding; shall be set to 0.
+- compatible : shall be "ti,keystone,main-pll-clock" or "ti,keystone,pll-clock"
+- clocks : parent clock phandle
+- reg - pll control0 and pll multipler registers
+- reg-names : control and multiplier. The multiplier is applicable only for
+               main pll clock
+- fixed-postdiv : fixed post divider value
+
+Example:
+       mainpllclk: mainpllclk@2310110 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,main-pll-clock";
+               clocks = <&refclkmain>;
+               reg = <0x02620350 4>, <0x02310110 4>;
+               reg-names = "control", "multiplier";
+               fixed-postdiv = <2>;
+       };
+
+       papllclk: papllclk@2620358 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,pll-clock";
+               clocks = <&refclkmain>;
+               clock-output-names = "pa-pll-clk";
+               reg = <0x02620358 4>;
+               reg-names = "control";
+               fixed-postdiv = <6>;
+       };
+
+Required properties:
+- #clock-cells : from common clock binding; shall be set to 0.
+- compatible : shall be "ti,keystone,pll-mux-clock"
+- clocks : link phandles of parent clocks
+- reg - pll mux register
+- bit-shift : number of bits to shift the bit-mask
+- bit-mask : arbitrary bitmask for programming the mux
+
+Optional properties:
+- clock-output-names : From common clock binding.
+
+Example:
+       mainmuxclk: mainmuxclk@2310108 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,pll-mux-clock";
+               clocks = <&mainpllclk>, <&refclkmain>;
+               reg = <0x02310108 4>;
+               bit-shift = <23>;
+               bit-mask = <1>;
+               clock-output-names = "mainmuxclk";
+       };
+
+Required properties:
+- #clock-cells : from common clock binding; shall be set to 0.
+- compatible : shall be "ti,keystone,pll-divider-clock"
+- clocks : parent clock phandle
+- reg - pll mux register
+- bit-shift : number of bits to shift the bit-mask
+- bit-mask : arbitrary bitmask for programming the divider
+
+Optional properties:
+- clock-output-names : From common clock binding.
+
+Example:
+       gemtraceclk: gemtraceclk@2310120 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,pll-divider-clock";
+               clocks = <&mainmuxclk>;
+               reg = <0x02310120 4>;
+               bit-shift = <0>;
+               bit-mask = <8>;
+               clock-output-names = "gemtraceclk";
+       };
diff --git a/Documentation/devicetree/bindings/clock/xgene.txt b/Documentation/devicetree/bindings/clock/xgene.txt
new file mode 100644 (file)
index 0000000..1c4ef77
--- /dev/null
@@ -0,0 +1,111 @@
+Device Tree Clock bindings for APM X-Gene
+
+This binding uses the common clock binding[1].
+
+[1] Documentation/devicetree/bindings/clock/clock-bindings.txt
+
+Required properties:
+- compatible : shall be one of the following:
+       "apm,xgene-socpll-clock" - for a X-Gene SoC PLL clock
+       "apm,xgene-pcppll-clock" - for a X-Gene PCP PLL clock
+       "apm,xgene-device-clock" - for a X-Gene device clock
+
+Required properties for SoC or PCP PLL clocks:
+- reg : shall be the physical PLL register address for the pll clock.
+- clocks : shall be the input parent clock phandle for the clock. This should
+       be the reference clock.
+- #clock-cells : shall be set to 1.
+- clock-output-names : shall be the name of the PLL referenced by derive
+  clock.
+Optional properties for PLL clocks:
+- clock-names : shall be the name of the PLL. If missing, use the device name.
+
+Required properties for device clocks:
+- reg : shall be a list of address and length pairs describing the CSR
+         reset and/or the divider. Either may be omitted, but at least
+         one must be present.
+ - reg-names : shall be a string list describing the reg resource. This
+               may include "csr-reg" and/or "div-reg". If this property
+               is not present, the reg property is assumed to describe
+               only "csr-reg".
+- clocks : shall be the input parent clock phandle for the clock.
+- #clock-cells : shall be set to 1.
+- clock-output-names : shall be the name of the device referenced.
+Optional properties for device clocks:
+- clock-names : shall be the name of the device clock. If missing, use the
+                device name.
+- csr-offset : Offset to the CSR reset register from the reset address base.
+               Default is 0.
+- csr-mask : CSR reset mask bit. Default is 0xF.
+- enable-offset : Offset to the enable register from the reset address base.
+                  Default is 0x8.
+- enable-mask : CSR enable mask bit. Default is 0xF.
+- divider-offset : Offset to the divider CSR register from the divider base.
+                   Default is 0x0.
+- divider-width : Width of the divider register. Default is 0.
+- divider-shift : Bit shift of the divider register. Default is 0.
+
+For example:
+
+       pcppll: pcppll@17000100 {
+               compatible = "apm,xgene-pcppll-clock";
+               #clock-cells = <1>;
+               clocks = <&refclk 0>;
+               clock-names = "pcppll";
+               reg = <0x0 0x17000100 0x0 0x1000>;
+               clock-output-names = "pcppll";
+               type = <0>;
+       };
+
+       socpll: socpll@17000120 {
+               compatible = "apm,xgene-socpll-clock";
+               #clock-cells = <1>;
+               clocks = <&refclk 0>;
+               clock-names = "socpll";
+               reg = <0x0 0x17000120 0x0 0x1000>;
+               clock-output-names = "socpll";
+               type = <1>;
+       };
+
+       qmlclk: qmlclk {
+               compatible = "apm,xgene-device-clock";
+               #clock-cells = <1>;
+               clocks = <&socplldiv2 0>;
+               clock-names = "qmlclk";
+               reg = <0x0 0x1703C000 0x0 0x1000>;
+               reg-name = "csr-reg";
+               clock-output-names = "qmlclk";
+       };
+
+       ethclk: ethclk {
+               compatible = "apm,xgene-device-clock";
+               #clock-cells = <1>;
+               clocks = <&socplldiv2 0>;
+               clock-names = "ethclk";
+               reg = <0x0 0x17000000 0x0 0x1000>;
+               reg-names = "div-reg";
+               divider-offset = <0x238>;
+               divider-width = <0x9>;
+               divider-shift = <0x0>;
+               clock-output-names = "ethclk";
+       };
+
+       apbclk: apbclk {
+               compatible = "apm,xgene-device-clock";
+               #clock-cells = <1>;
+               clocks = <&ahbclk 0>;
+               clock-names = "apbclk";
+               reg = <0x0 0x1F2AC000 0x0 0x1000
+                       0x0 0x1F2AC000 0x0 0x1000>;
+               reg-names = "csr-reg", "div-reg";
+               csr-offset = <0x0>;
+               csr-mask = <0x200>;
+               enable-offset = <0x8>;
+               enable-mask = <0x200>;
+               divider-offset = <0x10>;
+               divider-width = <0x2>;
+               divider-shift = <0x0>;
+               flags = <0x8>;
+               clock-output-names = "apbclk";
+       };
+
index bfdc57834929258e4c8920533f4e57b142cc215f..d37d7369e260f3f7d2564711217f6d6ac19a859a 100644 (file)
                #size-cells = <2>;
                ranges;
 
+               clocks {
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+                       refclk: refclk {
+                               compatible = "fixed-clock";
+                               #clock-cells = <1>;
+                               clock-frequency = <100000000>;
+                               clock-output-names = "refclk";
+                       };
+
+                       pcppll: pcppll@17000100 {
+                               compatible = "apm,xgene-pcppll-clock";
+                               #clock-cells = <1>;
+                               clocks = <&refclk 0>;
+                               clock-names = "pcppll";
+                               reg = <0x0 0x17000100 0x0 0x1000>;
+                               clock-output-names = "pcppll";
+                               type = <0>;
+                       };
+
+                       socpll: socpll@17000120 {
+                               compatible = "apm,xgene-socpll-clock";
+                               #clock-cells = <1>;
+                               clocks = <&refclk 0>;
+                               clock-names = "socpll";
+                               reg = <0x0 0x17000120 0x0 0x1000>;
+                               clock-output-names = "socpll";
+                               type = <1>;
+                       };
+
+                       socplldiv2: socplldiv2  {
+                               compatible = "fixed-factor-clock";
+                               #clock-cells = <1>;
+                               clocks = <&socpll 0>;
+                               clock-names = "socplldiv2";
+                               clock-mult = <1>;
+                               clock-div = <2>;
+                               clock-output-names = "socplldiv2";
+                       };
+
+                       qmlclk: qmlclk {
+                               compatible = "apm,xgene-device-clock";
+                               #clock-cells = <1>;
+                               clocks = <&socplldiv2 0>;
+                               clock-names = "qmlclk";
+                               reg = <0x0 0x1703C000 0x0 0x1000>;
+                               reg-names = "csr-reg";
+                               clock-output-names = "qmlclk";
+                       };
+
+                       ethclk: ethclk {
+                               compatible = "apm,xgene-device-clock";
+                               #clock-cells = <1>;
+                               clocks = <&socplldiv2 0>;
+                               clock-names = "ethclk";
+                               reg = <0x0 0x17000000 0x0 0x1000>;
+                               reg-names = "div-reg";
+                               divider-offset = <0x238>;
+                               divider-width = <0x9>;
+                               divider-shift = <0x0>;
+                               clock-output-names = "ethclk";
+                       };
+
+                       eth8clk: eth8clk {
+                               compatible = "apm,xgene-device-clock";
+                               #clock-cells = <1>;
+                               clocks = <&ethclk 0>;
+                               clock-names = "eth8clk";
+                               reg = <0x0 0x1702C000 0x0 0x1000>;
+                               reg-names = "csr-reg";
+                               clock-output-names = "eth8clk";
+                       };
+               };
+
                serial0: serial@1c020000 {
                        device_type = "serial";
                        compatible = "ns16550";
index 279407a36391eccc6194c5086b1d0e26e3deb1d6..5c51115081b3618e61c6a78df58aabec5af77853 100644 (file)
@@ -93,6 +93,20 @@ config CLK_PPC_CORENET
          This adds the clock driver support for Freescale PowerPC corenet
          platforms using common clock framework.
 
+config COMMON_CLK_XGENE
+       bool "Clock driver for APM XGene SoC"
+       default y
+       depends on ARM64
+       ---help---
+         Sypport for the APM X-Gene SoC reference, PLL, and device clocks.
+
+config COMMON_CLK_KEYSTONE
+       tristate "Clock drivers for Keystone based SOCs"
+       depends on ARCH_KEYSTONE && OF
+       ---help---
+          Supports clock drivers for Keystone based SOCs. These SOCs have local
+         a power sleep control module that gate the clock to the IPs and PLLs.
+
 endmenu
 
 source "drivers/clk/mvebu/Kconfig"
index d25da26ad11382110537763e8c017ade78f79f00..fe3121b341c028ef19c27e3f791558c948f219d6 100644 (file)
@@ -33,6 +33,8 @@ obj-$(CONFIG_ARCH_ZYNQ)               += zynq/
 obj-$(CONFIG_ARCH_TEGRA)       += tegra/
 obj-$(CONFIG_PLAT_SAMSUNG)     += samsung/
 obj-$(CONFIG_ARCH_SHMOBILE_MULTI)      += shmobile/
+obj-$(CONFIG_COMMON_CLK_XGENE)  += clk-xgene.o
+obj-$(CONFIG_COMMON_CLK_KEYSTONE)      += keystone/
 
 obj-$(CONFIG_X86)              += x86/
 
index 805b4c3440064ad5509e7a749adc5092e2230583..b131041c8f488f29f4a9f9d5161da119f274245e 100644 (file)
@@ -391,14 +391,8 @@ static int wm831x_clk_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int wm831x_clk_remove(struct platform_device *pdev)
-{
-       return 0;
-}
-
 static struct platform_driver wm831x_clk_driver = {
        .probe = wm831x_clk_probe,
-       .remove = wm831x_clk_remove,
        .driver         = {
                .name   = "wm831x-clk",
                .owner  = THIS_MODULE,
diff --git a/drivers/clk/clk-xgene.c b/drivers/clk/clk-xgene.c
new file mode 100644 (file)
index 0000000..dd8a62d
--- /dev/null
@@ -0,0 +1,521 @@
+/*
+ * clk-xgene.c - AppliedMicro X-Gene Clock Interface
+ *
+ * Copyright (c) 2013, Applied Micro Circuits Corporation
+ * Author: Loc Ho <lho@apm.com>
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+#include <linux/module.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/clkdev.h>
+#include <linux/clk-provider.h>
+#include <linux/of_address.h>
+#include <asm/setup.h>
+
+/* Register SCU_PCPPLL bit fields */
+#define N_DIV_RD(src)                  (((src) & 0x000001ff))
+
+/* Register SCU_SOCPLL bit fields */
+#define CLKR_RD(src)                   (((src) & 0x07000000)>>24)
+#define CLKOD_RD(src)                  (((src) & 0x00300000)>>20)
+#define REGSPEC_RESET_F1_MASK          0x00010000
+#define CLKF_RD(src)                   (((src) & 0x000001ff))
+
+#define XGENE_CLK_DRIVER_VER           "0.1"
+
+static DEFINE_SPINLOCK(clk_lock);
+
+static inline u32 xgene_clk_read(void *csr)
+{
+       return readl_relaxed(csr);
+}
+
+static inline void xgene_clk_write(u32 data, void *csr)
+{
+       return writel_relaxed(data, csr);
+}
+
+/* PLL Clock */
+enum xgene_pll_type {
+       PLL_TYPE_PCP = 0,
+       PLL_TYPE_SOC = 1,
+};
+
+struct xgene_clk_pll {
+       struct clk_hw   hw;
+       const char      *name;
+       void __iomem    *reg;
+       spinlock_t      *lock;
+       u32             pll_offset;
+       enum xgene_pll_type     type;
+};
+
+#define to_xgene_clk_pll(_hw) container_of(_hw, struct xgene_clk_pll, hw)
+
+static int xgene_clk_pll_is_enabled(struct clk_hw *hw)
+{
+       struct xgene_clk_pll *pllclk = to_xgene_clk_pll(hw);
+       u32 data;
+
+       data = xgene_clk_read(pllclk->reg + pllclk->pll_offset);
+       pr_debug("%s pll %s\n", pllclk->name,
+               data & REGSPEC_RESET_F1_MASK ? "disabled" : "enabled");
+
+       return data & REGSPEC_RESET_F1_MASK ? 0 : 1;
+}
+
+static unsigned long xgene_clk_pll_recalc_rate(struct clk_hw *hw,
+                               unsigned long parent_rate)
+{
+       struct xgene_clk_pll *pllclk = to_xgene_clk_pll(hw);
+       unsigned long fref;
+       unsigned long fvco;
+       u32 pll;
+       u32 nref;
+       u32 nout;
+       u32 nfb;
+
+       pll = xgene_clk_read(pllclk->reg + pllclk->pll_offset);
+
+       if (pllclk->type == PLL_TYPE_PCP) {
+               /*
+                * PLL VCO = Reference clock * NF
+                * PCP PLL = PLL_VCO / 2
+                */
+               nout = 2;
+               fvco = parent_rate * (N_DIV_RD(pll) + 4);
+       } else {
+               /*
+                * Fref = Reference Clock / NREF;
+                * Fvco = Fref * NFB;
+                * Fout = Fvco / NOUT;
+                */
+               nref = CLKR_RD(pll) + 1;
+               nout = CLKOD_RD(pll) + 1;
+               nfb = CLKF_RD(pll);
+               fref = parent_rate / nref;
+               fvco = fref * nfb;
+       }
+       pr_debug("%s pll recalc rate %ld parent %ld\n", pllclk->name,
+               fvco / nout, parent_rate);
+
+       return fvco / nout;
+}
+
+const struct clk_ops xgene_clk_pll_ops = {
+       .is_enabled = xgene_clk_pll_is_enabled,
+       .recalc_rate = xgene_clk_pll_recalc_rate,
+};
+
+static struct clk *xgene_register_clk_pll(struct device *dev,
+       const char *name, const char *parent_name,
+       unsigned long flags, void __iomem *reg, u32 pll_offset,
+       u32 type, spinlock_t *lock)
+{
+       struct xgene_clk_pll *apmclk;
+       struct clk *clk;
+       struct clk_init_data init;
+
+       /* allocate the APM clock structure */
+       apmclk = kzalloc(sizeof(*apmclk), GFP_KERNEL);
+       if (!apmclk) {
+               pr_err("%s: could not allocate APM clk\n", __func__);
+               return ERR_PTR(-ENOMEM);
+       }
+
+       init.name = name;
+       init.ops = &xgene_clk_pll_ops;
+       init.flags = flags;
+       init.parent_names = parent_name ? &parent_name : NULL;
+       init.num_parents = parent_name ? 1 : 0;
+
+       apmclk->name = name;
+       apmclk->reg = reg;
+       apmclk->lock = lock;
+       apmclk->pll_offset = pll_offset;
+       apmclk->type = type;
+       apmclk->hw.init = &init;
+
+       /* Register the clock */
+       clk = clk_register(dev, &apmclk->hw);
+       if (IS_ERR(clk)) {
+               pr_err("%s: could not register clk %s\n", __func__, name);
+               kfree(apmclk);
+               return NULL;
+       }
+       return clk;
+}
+
+static void xgene_pllclk_init(struct device_node *np, enum xgene_pll_type pll_type)
+{
+        const char *clk_name = np->full_name;
+        struct clk *clk;
+        void *reg;
+
+        reg = of_iomap(np, 0);
+        if (reg == NULL) {
+                pr_err("Unable to map CSR register for %s\n", np->full_name);
+                return;
+        }
+        of_property_read_string(np, "clock-output-names", &clk_name);
+        clk = xgene_register_clk_pll(NULL,
+                        clk_name, of_clk_get_parent_name(np, 0),
+                        CLK_IS_ROOT, reg, 0, pll_type, &clk_lock);
+        if (!IS_ERR(clk)) {
+                of_clk_add_provider(np, of_clk_src_simple_get, clk);
+                clk_register_clkdev(clk, clk_name, NULL);
+                pr_debug("Add %s clock PLL\n", clk_name);
+        }
+}
+
+static void xgene_socpllclk_init(struct device_node *np)
+{
+       xgene_pllclk_init(np, PLL_TYPE_SOC);
+}
+
+static void xgene_pcppllclk_init(struct device_node *np)
+{
+       xgene_pllclk_init(np, PLL_TYPE_PCP);
+}
+
+/* IP Clock */
+struct xgene_dev_parameters {
+       void __iomem *csr_reg;          /* CSR for IP clock */
+       u32 reg_clk_offset;             /* Offset to clock enable CSR */
+       u32 reg_clk_mask;               /* Mask bit for clock enable */
+       u32 reg_csr_offset;             /* Offset to CSR reset */
+       u32 reg_csr_mask;               /* Mask bit for disable CSR reset */
+       void __iomem *divider_reg;      /* CSR for divider */
+       u32 reg_divider_offset;         /* Offset to divider register */
+       u32 reg_divider_shift;          /* Bit shift to divider field */
+       u32 reg_divider_width;          /* Width of the bit to divider field */
+};
+
+struct xgene_clk {
+       struct clk_hw   hw;
+       const char      *name;
+       spinlock_t      *lock;
+       struct xgene_dev_parameters     param;
+};
+
+#define to_xgene_clk(_hw) container_of(_hw, struct xgene_clk, hw)
+
+static int xgene_clk_enable(struct clk_hw *hw)
+{
+       struct xgene_clk *pclk = to_xgene_clk(hw);
+       unsigned long flags = 0;
+       u32 data;
+
+       if (pclk->lock)
+               spin_lock_irqsave(pclk->lock, flags);
+
+       if (pclk->param.csr_reg != NULL) {
+               pr_debug("%s clock enabled\n", pclk->name);
+               /* First enable the clock */
+               data = xgene_clk_read(pclk->param.csr_reg +
+                                       pclk->param.reg_clk_offset);
+               data |= pclk->param.reg_clk_mask;
+               xgene_clk_write(data, pclk->param.csr_reg +
+                                       pclk->param.reg_clk_offset);
+               pr_debug("%s clock PADDR base 0x%016LX clk offset 0x%08X mask 0x%08X value 0x%08X\n",
+                       pclk->name, __pa(pclk->param.csr_reg),
+                       pclk->param.reg_clk_offset, pclk->param.reg_clk_mask,
+                       data);
+
+               /* Second enable the CSR */
+               data = xgene_clk_read(pclk->param.csr_reg +
+                                       pclk->param.reg_csr_offset);
+               data &= ~pclk->param.reg_csr_mask;
+               xgene_clk_write(data, pclk->param.csr_reg +
+                                       pclk->param.reg_csr_offset);
+               pr_debug("%s CSR RESET PADDR base 0x%016LX csr offset 0x%08X mask 0x%08X value 0x%08X\n",
+                       pclk->name, __pa(pclk->param.csr_reg),
+                       pclk->param.reg_csr_offset, pclk->param.reg_csr_mask,
+                       data);
+       }
+
+       if (pclk->lock)
+               spin_unlock_irqrestore(pclk->lock, flags);
+
+       return 0;
+}
+
+static void xgene_clk_disable(struct clk_hw *hw)
+{
+       struct xgene_clk *pclk = to_xgene_clk(hw);
+       unsigned long flags = 0;
+       u32 data;
+
+       if (pclk->lock)
+               spin_lock_irqsave(pclk->lock, flags);
+
+       if (pclk->param.csr_reg != NULL) {
+               pr_debug("%s clock disabled\n", pclk->name);
+               /* First put the CSR in reset */
+               data = xgene_clk_read(pclk->param.csr_reg +
+                                       pclk->param.reg_csr_offset);
+               data |= pclk->param.reg_csr_mask;
+               xgene_clk_write(data, pclk->param.csr_reg +
+                                       pclk->param.reg_csr_offset);
+
+               /* Second disable the clock */
+               data = xgene_clk_read(pclk->param.csr_reg +
+                                       pclk->param.reg_clk_offset);
+               data &= ~pclk->param.reg_clk_mask;
+               xgene_clk_write(data, pclk->param.csr_reg +
+                                       pclk->param.reg_clk_offset);
+       }
+
+       if (pclk->lock)
+               spin_unlock_irqrestore(pclk->lock, flags);
+}
+
+static int xgene_clk_is_enabled(struct clk_hw *hw)
+{
+       struct xgene_clk *pclk = to_xgene_clk(hw);
+       u32 data = 0;
+
+       if (pclk->param.csr_reg != NULL) {
+               pr_debug("%s clock checking\n", pclk->name);
+               data = xgene_clk_read(pclk->param.csr_reg +
+                                       pclk->param.reg_clk_offset);
+               pr_debug("%s clock is %s\n", pclk->name,
+                       data & pclk->param.reg_clk_mask ? "enabled" :
+                                                       "disabled");
+       }
+
+       if (pclk->param.csr_reg == NULL)
+               return 1;
+       return data & pclk->param.reg_clk_mask ? 1 : 0;
+}
+
+static unsigned long xgene_clk_recalc_rate(struct clk_hw *hw,
+                               unsigned long parent_rate)
+{
+       struct xgene_clk *pclk = to_xgene_clk(hw);
+       u32 data;
+
+       if (pclk->param.divider_reg) {
+               data = xgene_clk_read(pclk->param.divider_reg +
+                                       pclk->param.reg_divider_offset);
+               data >>= pclk->param.reg_divider_shift;
+               data &= (1 << pclk->param.reg_divider_width) - 1;
+
+               pr_debug("%s clock recalc rate %ld parent %ld\n",
+                       pclk->name, parent_rate / data, parent_rate);
+               return parent_rate / data;
+       } else {
+               pr_debug("%s clock recalc rate %ld parent %ld\n",
+                       pclk->name, parent_rate, parent_rate);
+               return parent_rate;
+       }
+}
+
+static int xgene_clk_set_rate(struct clk_hw *hw, unsigned long rate,
+                               unsigned long parent_rate)
+{
+       struct xgene_clk *pclk = to_xgene_clk(hw);
+       unsigned long flags = 0;
+       u32 data;
+       u32 divider;
+       u32 divider_save;
+
+       if (pclk->lock)
+               spin_lock_irqsave(pclk->lock, flags);
+
+       if (pclk->param.divider_reg) {
+               /* Let's compute the divider */
+               if (rate > parent_rate)
+                       rate = parent_rate;
+               divider_save = divider = parent_rate / rate; /* Rounded down */
+               divider &= (1 << pclk->param.reg_divider_width) - 1;
+               divider <<= pclk->param.reg_divider_shift;
+
+               /* Set new divider */
+               data = xgene_clk_read(pclk->param.divider_reg +
+                               pclk->param.reg_divider_offset);
+               data &= ~((1 << pclk->param.reg_divider_width) - 1);
+               data |= divider;
+               xgene_clk_write(data, pclk->param.divider_reg +
+                                       pclk->param.reg_divider_offset);
+               pr_debug("%s clock set rate %ld\n", pclk->name,
+                       parent_rate / divider_save);
+       } else {
+               divider_save = 1;
+       }
+
+       if (pclk->lock)
+               spin_unlock_irqrestore(pclk->lock, flags);
+
+       return parent_rate / divider_save;
+}
+
+static long xgene_clk_round_rate(struct clk_hw *hw, unsigned long rate,
+                               unsigned long *prate)
+{
+       struct xgene_clk *pclk = to_xgene_clk(hw);
+       unsigned long parent_rate = *prate;
+       u32 divider;
+
+       if (pclk->param.divider_reg) {
+               /* Let's compute the divider */
+               if (rate > parent_rate)
+                       rate = parent_rate;
+               divider = parent_rate / rate;   /* Rounded down */
+       } else {
+               divider = 1;
+       }
+
+       return parent_rate / divider;
+}
+
+const struct clk_ops xgene_clk_ops = {
+       .enable = xgene_clk_enable,
+       .disable = xgene_clk_disable,
+       .is_enabled = xgene_clk_is_enabled,
+       .recalc_rate = xgene_clk_recalc_rate,
+       .set_rate = xgene_clk_set_rate,
+       .round_rate = xgene_clk_round_rate,
+};
+
+static struct clk *xgene_register_clk(struct device *dev,
+               const char *name, const char *parent_name,
+               struct xgene_dev_parameters *parameters, spinlock_t *lock)
+{
+       struct xgene_clk *apmclk;
+       struct clk *clk;
+       struct clk_init_data init;
+       int rc;
+
+       /* allocate the APM clock structure */
+       apmclk = kzalloc(sizeof(*apmclk), GFP_KERNEL);
+       if (!apmclk) {
+               pr_err("%s: could not allocate APM clk\n", __func__);
+               return ERR_PTR(-ENOMEM);
+       }
+
+       init.name = name;
+       init.ops = &xgene_clk_ops;
+       init.flags = 0;
+       init.parent_names = parent_name ? &parent_name : NULL;
+       init.num_parents = parent_name ? 1 : 0;
+
+       apmclk->name = name;
+       apmclk->lock = lock;
+       apmclk->hw.init = &init;
+       apmclk->param = *parameters;
+
+       /* Register the clock */
+       clk = clk_register(dev, &apmclk->hw);
+       if (IS_ERR(clk)) {
+               pr_err("%s: could not register clk %s\n", __func__, name);
+               kfree(apmclk);
+               return clk;
+       }
+
+       /* Register the clock for lookup */
+       rc = clk_register_clkdev(clk, name, NULL);
+       if (rc != 0) {
+               pr_err("%s: could not register lookup clk %s\n",
+                       __func__, name);
+       }
+       return clk;
+}
+
+static void __init xgene_devclk_init(struct device_node *np)
+{
+       const char *clk_name = np->full_name;
+       struct clk *clk;
+       struct resource res;
+       int rc;
+       struct xgene_dev_parameters parameters;
+       int i;
+
+       /* Check if the entry is disabled */
+        if (!of_device_is_available(np))
+                return;
+
+       /* Parse the DTS register for resource */
+       parameters.csr_reg = NULL;
+       parameters.divider_reg = NULL;
+       for (i = 0; i < 2; i++) {
+               void *map_res;
+               rc = of_address_to_resource(np, i, &res);
+               if (rc != 0) {
+                       if (i == 0) {
+                               pr_err("no DTS register for %s\n", 
+                                       np->full_name);
+                               return;
+                       }
+                       break;
+               }
+               map_res = of_iomap(np, i);
+               if (map_res == NULL) {
+                       pr_err("Unable to map resource %d for %s\n",
+                               i, np->full_name);
+                       goto err;
+               }
+               if (strcmp(res.name, "div-reg") == 0)
+                       parameters.divider_reg = map_res;
+               else /* if (strcmp(res->name, "csr-reg") == 0) */
+                       parameters.csr_reg = map_res;
+       }
+       if (of_property_read_u32(np, "csr-offset", &parameters.reg_csr_offset))
+               parameters.reg_csr_offset = 0;
+       if (of_property_read_u32(np, "csr-mask", &parameters.reg_csr_mask))
+               parameters.reg_csr_mask = 0xF;
+       if (of_property_read_u32(np, "enable-offset",
+                               &parameters.reg_clk_offset))
+               parameters.reg_clk_offset = 0x8;
+       if (of_property_read_u32(np, "enable-mask", &parameters.reg_clk_mask))
+               parameters.reg_clk_mask = 0xF;
+       if (of_property_read_u32(np, "divider-offset",
+                               &parameters.reg_divider_offset))
+               parameters.reg_divider_offset = 0;
+       if (of_property_read_u32(np, "divider-width",
+                               &parameters.reg_divider_width))
+               parameters.reg_divider_width = 0;
+       if (of_property_read_u32(np, "divider-shift",
+                               &parameters.reg_divider_shift))
+               parameters.reg_divider_shift = 0;
+       of_property_read_string(np, "clock-output-names", &clk_name);
+
+       clk = xgene_register_clk(NULL, clk_name,
+               of_clk_get_parent_name(np, 0), &parameters, &clk_lock);
+       if (IS_ERR(clk))
+               goto err;
+       pr_debug("Add %s clock\n", clk_name);
+       rc = of_clk_add_provider(np, of_clk_src_simple_get, clk);
+       if (rc != 0)
+               pr_err("%s: could register provider clk %s\n", __func__,
+                       np->full_name);
+
+       return;
+
+err:
+       if (parameters.csr_reg)
+               iounmap(parameters.csr_reg);
+       if (parameters.divider_reg)
+               iounmap(parameters.divider_reg);
+}
+
+CLK_OF_DECLARE(xgene_socpll_clock, "apm,xgene-socpll-clock", xgene_socpllclk_init);
+CLK_OF_DECLARE(xgene_pcppll_clock, "apm,xgene-pcppll-clock", xgene_pcppllclk_init);
+CLK_OF_DECLARE(xgene_dev_clock, "apm,xgene-device-clock", xgene_devclk_init);
index a004769528e68a815293d1832f49e04eec7ca08a..2cf2ea6b77a1ac307c22d35aed28b12d7a0da75f 100644 (file)
@@ -1080,13 +1080,16 @@ unsigned long clk_get_rate(struct clk *clk)
 }
 EXPORT_SYMBOL_GPL(clk_get_rate);
 
-static u8 clk_fetch_parent_index(struct clk *clk, struct clk *parent)
+static int clk_fetch_parent_index(struct clk *clk, struct clk *parent)
 {
-       u8 i;
+       int i;
 
-       if (!clk->parents)
-               clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents),
-                                                               GFP_KERNEL);
+       if (!clk->parents) {
+               clk->parents = kcalloc(clk->num_parents,
+                                       sizeof(struct clk *), GFP_KERNEL);
+               if (!clk->parents)
+                       return -ENOMEM;
+       }
 
        /*
         * find index of new parent clock using cached parent ptrs,
@@ -1094,16 +1097,19 @@ static u8 clk_fetch_parent_index(struct clk *clk, struct clk *parent)
         * them now to avoid future calls to __clk_lookup.
         */
        for (i = 0; i < clk->num_parents; i++) {
-               if (clk->parents && clk->parents[i] == parent)
-                       break;
-               else if (!strcmp(clk->parent_names[i], parent->name)) {
-                       if (clk->parents)
-                               clk->parents[i] = __clk_lookup(parent->name);
-                       break;
+               if (clk->parents[i] == parent)
+                       return i;
+
+               if (clk->parents[i])
+                       continue;
+
+               if (!strcmp(clk->parent_names[i], parent->name)) {
+                       clk->parents[i] = __clk_lookup(parent->name);
+                       return i;
                }
        }
 
-       return i;
+       return -EINVAL;
 }
 
 static void clk_reparent(struct clk *clk, struct clk *new_parent)
@@ -1265,7 +1271,7 @@ static struct clk *clk_calc_new_rates(struct clk *clk, unsigned long rate)
        struct clk *old_parent, *parent;
        unsigned long best_parent_rate = 0;
        unsigned long new_rate;
-       u8 p_index = 0;
+       int p_index = 0;
 
        /* sanity */
        if (IS_ERR_OR_NULL(clk))
@@ -1306,7 +1312,7 @@ static struct clk *clk_calc_new_rates(struct clk *clk, unsigned long rate)
        /* try finding the new parent index */
        if (parent) {
                p_index = clk_fetch_parent_index(clk, parent);
-               if (p_index == clk->num_parents) {
+               if (p_index < 0) {
                        pr_debug("%s: clk %s can not be parent of clk %s\n",
                                 __func__, parent->name, clk->name);
                        return NULL;
@@ -1532,7 +1538,7 @@ static struct clk *__clk_init_parent(struct clk *clk)
 
        if (!clk->parents)
                clk->parents =
-                       kzalloc((sizeof(struct clk*) * clk->num_parents),
+                       kcalloc(clk->num_parents, sizeof(struct clk *),
                                        GFP_KERNEL);
 
        ret = clk_get_parent_by_index(clk, index);
@@ -1568,7 +1574,7 @@ void __clk_reparent(struct clk *clk, struct clk *new_parent)
 int clk_set_parent(struct clk *clk, struct clk *parent)
 {
        int ret = 0;
-       u8 p_index = 0;
+       int p_index = 0;
        unsigned long p_rate = 0;
 
        if (!clk)
@@ -1597,10 +1603,10 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
        if (parent) {
                p_index = clk_fetch_parent_index(clk, parent);
                p_rate = parent->rate;
-               if (p_index == clk->num_parents) {
+               if (p_index < 0) {
                        pr_debug("%s: clk %s can not be parent of clk %s\n",
                                        __func__, parent->name, clk->name);
-                       ret = -EINVAL;
+                       ret = p_index;
                        goto out;
                }
        }
@@ -1689,8 +1695,8 @@ int __clk_init(struct device *dev, struct clk *clk)
         * for clock drivers to statically initialize clk->parents.
         */
        if (clk->num_parents > 1 && !clk->parents) {
-               clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents),
-                               GFP_KERNEL);
+               clk->parents = kcalloc(clk->num_parents, sizeof(struct clk *),
+                                       GFP_KERNEL);
                /*
                 * __clk_lookup returns NULL for parents that have not been
                 * clk_init'd; thus any access to clk->parents[] must check
@@ -1830,8 +1836,8 @@ static int _clk_register(struct device *dev, struct clk_hw *hw, struct clk *clk)
        hw->clk = clk;
 
        /* allocate local copy in case parent_names is __initdata */
-       clk->parent_names = kzalloc((sizeof(char*) * clk->num_parents),
-                       GFP_KERNEL);
+       clk->parent_names = kcalloc(clk->num_parents, sizeof(char *),
+                                       GFP_KERNEL);
 
        if (!clk->parent_names) {
                pr_err("%s: could not allocate clk->parent_names\n", __func__);
@@ -2196,6 +2202,12 @@ struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec)
        return clk;
 }
 
+int of_clk_get_parent_count(struct device_node *np)
+{
+       return of_count_phandle_with_args(np, "clocks", "#clock-cells");
+}
+EXPORT_SYMBOL_GPL(of_clk_get_parent_count);
+
 const char *of_clk_get_parent_name(struct device_node *np, int index)
 {
        struct of_phandle_args clkspec;
diff --git a/drivers/clk/keystone/Makefile b/drivers/clk/keystone/Makefile
new file mode 100644 (file)
index 0000000..0477cf6
--- /dev/null
@@ -0,0 +1 @@
+obj-y                  += pll.o gate.o
diff --git a/drivers/clk/keystone/gate.c b/drivers/clk/keystone/gate.c
new file mode 100644 (file)
index 0000000..1f333bc
--- /dev/null
@@ -0,0 +1,264 @@
+/*
+ * Clock driver for Keystone 2 based devices
+ *
+ * Copyright (C) 2013 Texas Instruments.
+ *     Murali Karicheri <m-karicheri2@ti.com>
+ *     Santosh Shilimkar <santosh.shilimkar@ti.com>
+ *
+ * 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.
+ */
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/of_address.h>
+#include <linux/of.h>
+#include <linux/module.h>
+
+/* PSC register offsets */
+#define PTCMD                  0x120
+#define PTSTAT                 0x128
+#define PDSTAT                 0x200
+#define PDCTL                  0x300
+#define MDSTAT                 0x800
+#define MDCTL                  0xa00
+
+/* PSC module states */
+#define PSC_STATE_SWRSTDISABLE 0
+#define PSC_STATE_SYNCRST      1
+#define PSC_STATE_DISABLE      2
+#define PSC_STATE_ENABLE       3
+
+#define MDSTAT_STATE_MASK      0x3f
+#define MDSTAT_MCKOUT          BIT(12)
+#define PDSTAT_STATE_MASK      0x1f
+#define MDCTL_FORCE            BIT(31)
+#define MDCTL_LRESET           BIT(8)
+#define PDCTL_NEXT             BIT(0)
+
+/* Maximum timeout to bail out state transition for module */
+#define STATE_TRANS_MAX_COUNT  0xffff
+
+static void __iomem *domain_transition_base;
+
+/**
+ * struct clk_psc_data - PSC data
+ * @control_base: Base address for a PSC control
+ * @domain_base: Base address for a PSC domain
+ * @domain_id: PSC domain id number
+ */
+struct clk_psc_data {
+       void __iomem *control_base;
+       void __iomem *domain_base;
+       u32 domain_id;
+};
+
+/**
+ * struct clk_psc - PSC clock structure
+ * @hw: clk_hw for the psc
+ * @psc_data: PSC driver specific data
+ * @lock: Spinlock used by the driver
+ */
+struct clk_psc {
+       struct clk_hw hw;
+       struct clk_psc_data *psc_data;
+       spinlock_t *lock;
+};
+
+static DEFINE_SPINLOCK(psc_lock);
+
+#define to_clk_psc(_hw) container_of(_hw, struct clk_psc, hw)
+
+static void psc_config(void __iomem *control_base, void __iomem *domain_base,
+                                               u32 next_state, u32 domain_id)
+{
+       u32 ptcmd, pdstat, pdctl, mdstat, mdctl, ptstat;
+       u32 count = STATE_TRANS_MAX_COUNT;
+
+       mdctl = readl(control_base + MDCTL);
+       mdctl &= ~MDSTAT_STATE_MASK;
+       mdctl |= next_state;
+       /* For disable, we always put the module in local reset */
+       if (next_state == PSC_STATE_DISABLE)
+               mdctl &= ~MDCTL_LRESET;
+       writel(mdctl, control_base + MDCTL);
+
+       pdstat = readl(domain_base + PDSTAT);
+       if (!(pdstat & PDSTAT_STATE_MASK)) {
+               pdctl = readl(domain_base + PDCTL);
+               pdctl |= PDCTL_NEXT;
+               writel(pdctl, domain_base + PDCTL);
+       }
+
+       ptcmd = 1 << domain_id;
+       writel(ptcmd, domain_transition_base + PTCMD);
+       do {
+               ptstat = readl(domain_transition_base + PTSTAT);
+       } while (((ptstat >> domain_id) & 1) && count--);
+
+       count = STATE_TRANS_MAX_COUNT;
+       do {
+               mdstat = readl(control_base + MDSTAT);
+       } while (!((mdstat & MDSTAT_STATE_MASK) == next_state) && count--);
+}
+
+static int keystone_clk_is_enabled(struct clk_hw *hw)
+{
+       struct clk_psc *psc = to_clk_psc(hw);
+       struct clk_psc_data *data = psc->psc_data;
+       u32 mdstat = readl(data->control_base + MDSTAT);
+
+       return (mdstat & MDSTAT_MCKOUT) ? 1 : 0;
+}
+
+static int keystone_clk_enable(struct clk_hw *hw)
+{
+       struct clk_psc *psc = to_clk_psc(hw);
+       struct clk_psc_data *data = psc->psc_data;
+       unsigned long flags = 0;
+
+       if (psc->lock)
+               spin_lock_irqsave(psc->lock, flags);
+
+       psc_config(data->control_base, data->domain_base,
+                               PSC_STATE_ENABLE, data->domain_id);
+
+       if (psc->lock)
+               spin_unlock_irqrestore(psc->lock, flags);
+
+       return 0;
+}
+
+static void keystone_clk_disable(struct clk_hw *hw)
+{
+       struct clk_psc *psc = to_clk_psc(hw);
+       struct clk_psc_data *data = psc->psc_data;
+       unsigned long flags = 0;
+
+       if (psc->lock)
+               spin_lock_irqsave(psc->lock, flags);
+
+       psc_config(data->control_base, data->domain_base,
+                               PSC_STATE_DISABLE, data->domain_id);
+
+       if (psc->lock)
+               spin_unlock_irqrestore(psc->lock, flags);
+}
+
+static const struct clk_ops clk_psc_ops = {
+       .enable = keystone_clk_enable,
+       .disable = keystone_clk_disable,
+       .is_enabled = keystone_clk_is_enabled,
+};
+
+/**
+ * clk_register_psc - register psc clock
+ * @dev: device that is registering this clock
+ * @name: name of this clock
+ * @parent_name: name of clock's parent
+ * @psc_data: platform data to configure this clock
+ * @lock: spinlock used by this clock
+ */
+static struct clk *clk_register_psc(struct device *dev,
+                       const char *name,
+                       const char *parent_name,
+                       struct clk_psc_data *psc_data,
+                       spinlock_t *lock)
+{
+       struct clk_init_data init;
+       struct clk_psc *psc;
+       struct clk *clk;
+
+       psc = kzalloc(sizeof(*psc), GFP_KERNEL);
+       if (!psc)
+               return ERR_PTR(-ENOMEM);
+
+       init.name = name;
+       init.ops = &clk_psc_ops;
+       init.parent_names = (parent_name ? &parent_name : NULL);
+       init.num_parents = (parent_name ? 1 : 0);
+
+       psc->psc_data = psc_data;
+       psc->lock = lock;
+       psc->hw.init = &init;
+
+       clk = clk_register(NULL, &psc->hw);
+       if (IS_ERR(clk))
+               kfree(psc);
+
+       return clk;
+}
+
+/**
+ * of_psc_clk_init - initialize psc clock through DT
+ * @node: device tree node for this clock
+ * @lock: spinlock used by this clock
+ */
+static void __init of_psc_clk_init(struct device_node *node, spinlock_t *lock)
+{
+       const char *clk_name = node->name;
+       const char *parent_name;
+       struct clk_psc_data *data;
+       struct clk *clk;
+       int i;
+
+       data = kzalloc(sizeof(*data), GFP_KERNEL);
+       if (!data) {
+               pr_err("%s: Out of memory\n", __func__);
+               return;
+       }
+
+       i = of_property_match_string(node, "reg-names", "control");
+       data->control_base = of_iomap(node, i);
+       if (!data->control_base) {
+               pr_err("%s: control ioremap failed\n", __func__);
+               goto out;
+       }
+
+       i = of_property_match_string(node, "reg-names", "domain");
+       data->domain_base = of_iomap(node, i);
+       if (!data->domain_base) {
+               pr_err("%s: domain ioremap failed\n", __func__);
+               iounmap(data->control_base);
+               goto out;
+       }
+
+       of_property_read_u32(node, "domain-id", &data->domain_id);
+
+       /* Domain transition registers at fixed address space of domain_id 0 */
+       if (!domain_transition_base && !data->domain_id)
+               domain_transition_base = data->domain_base;
+
+       of_property_read_string(node, "clock-output-names", &clk_name);
+       parent_name = of_clk_get_parent_name(node, 0);
+       if (!parent_name) {
+               pr_err("%s: Parent clock not found\n", __func__);
+               goto out;
+       }
+
+       clk = clk_register_psc(NULL, clk_name, parent_name, data, lock);
+       if (clk) {
+               of_clk_add_provider(node, of_clk_src_simple_get, clk);
+               return;
+       }
+
+       pr_err("%s: error registering clk %s\n", __func__, node->name);
+out:
+       kfree(data);
+       return;
+}
+
+/**
+ * of_keystone_psc_clk_init - initialize psc clock through DT
+ * @node: device tree node for this clock
+ */
+static void __init of_keystone_psc_clk_init(struct device_node *node)
+{
+       of_psc_clk_init(node, &psc_lock);
+}
+CLK_OF_DECLARE(keystone_gate_clk, "ti,keystone,psc-clock",
+                                       of_keystone_psc_clk_init);
diff --git a/drivers/clk/keystone/pll.c b/drivers/clk/keystone/pll.c
new file mode 100644 (file)
index 0000000..47a1bd9
--- /dev/null
@@ -0,0 +1,305 @@
+/*
+ * PLL clock driver for Keystone devices
+ *
+ * Copyright (C) 2013 Texas Instruments Inc.
+ *     Murali Karicheri <m-karicheri2@ti.com>
+ *     Santosh Shilimkar <santosh.shilimkar@ti.com>
+ *
+ * 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.
+ */
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/of_address.h>
+#include <linux/of.h>
+#include <linux/module.h>
+
+#define PLLM_LOW_MASK          0x3f
+#define PLLM_HIGH_MASK         0x7ffc0
+#define MAIN_PLLM_HIGH_MASK    0x7f000
+#define PLLM_HIGH_SHIFT                6
+#define PLLD_MASK              0x3f
+
+/**
+ * struct clk_pll_data - pll data structure
+ * @has_pllctrl: If set to non zero, lower 6 bits of multiplier is in pllm
+ *     register of pll controller, else it is in the pll_ctrl0((bit 11-6)
+ * @phy_pllm: Physical address of PLLM in pll controller. Used when
+ *     has_pllctrl is non zero.
+ * @phy_pll_ctl0: Physical address of PLL ctrl0. This could be that of
+ *     Main PLL or any other PLLs in the device such as ARM PLL, DDR PLL
+ *     or PA PLL available on keystone2. These PLLs are controlled by
+ *     this register. Main PLL is controlled by a PLL controller.
+ * @pllm: PLL register map address
+ * @pll_ctl0: PLL controller map address
+ * @pllm_lower_mask: multiplier lower mask
+ * @pllm_upper_mask: multiplier upper mask
+ * @pllm_upper_shift: multiplier upper shift
+ * @plld_mask: divider mask
+ * @postdiv: Post divider
+ */
+struct clk_pll_data {
+       bool has_pllctrl;
+       u32 phy_pllm;
+       u32 phy_pll_ctl0;
+       void __iomem *pllm;
+       void __iomem *pll_ctl0;
+       u32 pllm_lower_mask;
+       u32 pllm_upper_mask;
+       u32 pllm_upper_shift;
+       u32 plld_mask;
+       u32 postdiv;
+};
+
+/**
+ * struct clk_pll - Main pll clock
+ * @hw: clk_hw for the pll
+ * @pll_data: PLL driver specific data
+ */
+struct clk_pll {
+       struct clk_hw hw;
+       struct clk_pll_data *pll_data;
+};
+
+#define to_clk_pll(_hw) container_of(_hw, struct clk_pll, hw)
+
+static unsigned long clk_pllclk_recalc(struct clk_hw *hw,
+                                       unsigned long parent_rate)
+{
+       struct clk_pll *pll = to_clk_pll(hw);
+       struct clk_pll_data *pll_data = pll->pll_data;
+       unsigned long rate = parent_rate;
+       u32  mult = 0, prediv, postdiv, val;
+
+       /*
+        * get bits 0-5 of multiplier from pllctrl PLLM register
+        * if has_pllctrl is non zero
+        */
+       if (pll_data->has_pllctrl) {
+               val = readl(pll_data->pllm);
+               mult = (val & pll_data->pllm_lower_mask);
+       }
+
+       /* bit6-12 of PLLM is in Main PLL control register */
+       val = readl(pll_data->pll_ctl0);
+       mult |= ((val & pll_data->pllm_upper_mask)
+                       >> pll_data->pllm_upper_shift);
+       prediv = (val & pll_data->plld_mask);
+       postdiv = pll_data->postdiv;
+
+       rate /= (prediv + 1);
+       rate = (rate * (mult + 1));
+       rate /= postdiv;
+
+       return rate;
+}
+
+static const struct clk_ops clk_pll_ops = {
+       .recalc_rate = clk_pllclk_recalc,
+};
+
+static struct clk *clk_register_pll(struct device *dev,
+                       const char *name,
+                       const char *parent_name,
+                       struct clk_pll_data *pll_data)
+{
+       struct clk_init_data init;
+       struct clk_pll *pll;
+       struct clk *clk;
+
+       pll = kzalloc(sizeof(*pll), GFP_KERNEL);
+       if (!pll)
+               return ERR_PTR(-ENOMEM);
+
+       init.name = name;
+       init.ops = &clk_pll_ops;
+       init.flags = 0;
+       init.parent_names = (parent_name ? &parent_name : NULL);
+       init.num_parents = (parent_name ? 1 : 0);
+
+       pll->pll_data   = pll_data;
+       pll->hw.init = &init;
+
+       clk = clk_register(NULL, &pll->hw);
+       if (IS_ERR(clk))
+               goto out;
+
+       return clk;
+out:
+       kfree(pll);
+       return NULL;
+}
+
+/**
+ * _of_clk_init - PLL initialisation via DT
+ * @node: device tree node for this clock
+ * @pllctrl: If true, lower 6 bits of multiplier is in pllm register of
+ *             pll controller, else it is in the control regsiter0(bit 11-6)
+ */
+static void __init _of_pll_clk_init(struct device_node *node, bool pllctrl)
+{
+       struct clk_pll_data *pll_data;
+       const char *parent_name;
+       struct clk *clk;
+       int i;
+
+       pll_data = kzalloc(sizeof(*pll_data), GFP_KERNEL);
+       if (!pll_data) {
+               pr_err("%s: Out of memory\n", __func__);
+               return;
+       }
+
+       parent_name = of_clk_get_parent_name(node, 0);
+       if (of_property_read_u32(node, "fixed-postdiv", &pll_data->postdiv))
+               goto out;
+
+       i = of_property_match_string(node, "reg-names", "control");
+       pll_data->pll_ctl0 = of_iomap(node, i);
+       if (!pll_data->pll_ctl0) {
+               pr_err("%s: ioremap failed\n", __func__);
+               goto out;
+       }
+
+       pll_data->pllm_lower_mask = PLLM_LOW_MASK;
+       pll_data->pllm_upper_shift = PLLM_HIGH_SHIFT;
+       pll_data->plld_mask = PLLD_MASK;
+       pll_data->has_pllctrl = pllctrl;
+       if (!pll_data->has_pllctrl) {
+               pll_data->pllm_upper_mask = PLLM_HIGH_MASK;
+       } else {
+               pll_data->pllm_upper_mask = MAIN_PLLM_HIGH_MASK;
+               i = of_property_match_string(node, "reg-names", "multiplier");
+               pll_data->pllm = of_iomap(node, i);
+               if (!pll_data->pllm) {
+                       iounmap(pll_data->pll_ctl0);
+                       goto out;
+               }
+       }
+
+       clk = clk_register_pll(NULL, node->name, parent_name, pll_data);
+       if (clk) {
+               of_clk_add_provider(node, of_clk_src_simple_get, clk);
+               return;
+       }
+
+out:
+       pr_err("%s: error initializing pll %s\n", __func__, node->name);
+       kfree(pll_data);
+}
+
+/**
+ * of_keystone_pll_clk_init - PLL initialisation DT wrapper
+ * @node: device tree node for this clock
+ */
+static void __init of_keystone_pll_clk_init(struct device_node *node)
+{
+       _of_pll_clk_init(node, false);
+}
+CLK_OF_DECLARE(keystone_pll_clock, "ti,keystone,pll-clock",
+                                       of_keystone_pll_clk_init);
+
+/**
+ * of_keystone_pll_main_clk_init - Main PLL initialisation DT wrapper
+ * @node: device tree node for this clock
+ */
+static void __init of_keystone_main_pll_clk_init(struct device_node *node)
+{
+       _of_pll_clk_init(node, true);
+}
+CLK_OF_DECLARE(keystone_main_pll_clock, "ti,keystone,main-pll-clock",
+                                               of_keystone_main_pll_clk_init);
+
+/**
+ * of_pll_div_clk_init - PLL divider setup function
+ * @node: device tree node for this clock
+ */
+static void __init of_pll_div_clk_init(struct device_node *node)
+{
+       const char *parent_name;
+       void __iomem *reg;
+       u32 shift, mask;
+       struct clk *clk;
+       const char *clk_name = node->name;
+
+       of_property_read_string(node, "clock-output-names", &clk_name);
+       reg = of_iomap(node, 0);
+       if (!reg) {
+               pr_err("%s: ioremap failed\n", __func__);
+               return;
+       }
+
+       parent_name = of_clk_get_parent_name(node, 0);
+       if (!parent_name) {
+               pr_err("%s: missing parent clock\n", __func__);
+               return;
+       }
+
+       if (of_property_read_u32(node, "bit-shift", &shift)) {
+               pr_err("%s: missing 'shift' property\n", __func__);
+               return;
+       }
+
+       if (of_property_read_u32(node, "bit-mask", &mask)) {
+               pr_err("%s: missing 'bit-mask' property\n", __func__);
+               return;
+       }
+
+       clk = clk_register_divider(NULL, clk_name, parent_name, 0, reg, shift,
+                                mask, 0, NULL);
+       if (clk)
+               of_clk_add_provider(node, of_clk_src_simple_get, clk);
+       else
+               pr_err("%s: error registering divider %s\n", __func__, clk_name);
+}
+CLK_OF_DECLARE(pll_divider_clock, "ti,keystone,pll-divider-clock", of_pll_div_clk_init);
+
+/**
+ * of_pll_mux_clk_init - PLL mux setup function
+ * @node: device tree node for this clock
+ */
+static void __init of_pll_mux_clk_init(struct device_node *node)
+{
+       void __iomem *reg;
+       u32 shift, mask;
+       struct clk *clk;
+       const char *parents[2];
+       const char *clk_name = node->name;
+
+       of_property_read_string(node, "clock-output-names", &clk_name);
+       reg = of_iomap(node, 0);
+       if (!reg) {
+               pr_err("%s: ioremap failed\n", __func__);
+               return;
+       }
+
+       parents[0] = of_clk_get_parent_name(node, 0);
+       parents[1] = of_clk_get_parent_name(node, 1);
+       if (!parents[0] || !parents[1]) {
+               pr_err("%s: missing parent clocks\n", __func__);
+               return;
+       }
+
+       if (of_property_read_u32(node, "bit-shift", &shift)) {
+               pr_err("%s: missing 'shift' property\n", __func__);
+               return;
+       }
+
+       if (of_property_read_u32(node, "bit-mask", &mask)) {
+               pr_err("%s: missing 'bit-mask' property\n", __func__);
+               return;
+       }
+
+       clk = clk_register_mux(NULL, clk_name, (const char **)&parents,
+                               ARRAY_SIZE(parents) , 0, reg, shift, mask,
+                               0, NULL);
+       if (clk)
+               of_clk_add_provider(node, of_clk_src_simple_get, clk);
+       else
+               pr_err("%s: error registering mux %s\n", __func__, clk_name);
+}
+CLK_OF_DECLARE(pll_mux_clock, "ti,keystone,pll-mux-clock", of_pll_mux_clk_init);
index cc40fe64f2dc681c44205151537a71222e8d4990..10772aa72e4e662e678688cac3225a85f41bb4e4 100644 (file)
@@ -117,13 +117,19 @@ static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
                goto err;
        fclk_gate_lock = kmalloc(sizeof(*fclk_gate_lock), GFP_KERNEL);
        if (!fclk_gate_lock)
-               goto err;
+               goto err_fclk_gate_lock;
        spin_lock_init(fclk_lock);
        spin_lock_init(fclk_gate_lock);
 
        mux_name = kasprintf(GFP_KERNEL, "%s_mux", clk_name);
+       if (!mux_name)
+               goto err_mux_name;
        div0_name = kasprintf(GFP_KERNEL, "%s_div0", clk_name);
+       if (!div0_name)
+               goto err_div0_name;
        div1_name = kasprintf(GFP_KERNEL, "%s_div1", clk_name);
+       if (!div1_name)
+               goto err_div1_name;
 
        clk = clk_register_mux(NULL, mux_name, parents, 4,
                        CLK_SET_RATE_NO_REPARENT, fclk_ctrl_reg, 4, 2, 0,
@@ -147,6 +153,14 @@ static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
 
        return;
 
+err_div1_name:
+       kfree(div0_name);
+err_div0_name:
+       kfree(mux_name);
+err_mux_name:
+       kfree(fclk_gate_lock);
+err_fclk_gate_lock:
+       kfree(fclk_lock);
 err:
        clks[fclk] = ERR_PTR(-ENOMEM);
 }
index 73bdb69f0c08150a64ac2cd4cd5bf1cca3c3ac6a..7e59253b86036b5d897a7b8e741c0ea3f5e4fdf4 100644 (file)
@@ -472,6 +472,7 @@ void of_clk_del_provider(struct device_node *np);
 struct clk *of_clk_src_simple_get(struct of_phandle_args *clkspec,
                                  void *data);
 struct clk *of_clk_src_onecell_get(struct of_phandle_args *clkspec, void *data);
+int of_clk_get_parent_count(struct device_node *np);
 const char *of_clk_get_parent_name(struct device_node *np, int index);
 
 void of_clk_init(const struct of_device_id *matches);