Merge branch 'clk-bcm2835' into clk-next

4 files changed, 134 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/clock/brcm,bcm2835-aux-clock.txt b/Documentation/devicetree/bindings/clock/brcm,bcm2835-aux-clock.txt
new file mode 100644
index 000000000000..7a837d2182ac
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/brcm,bcm2835-aux-clock.txt
@@ -0,0 +1,31 @@
+Broadcom BCM2835 auxiliary peripheral support
+
+This binding uses the common clock binding:
+    Documentation/devicetree/bindings/clock/clock-bindings.txt
+
+The auxiliary peripherals (UART, SPI1, and SPI2) have a small register
+area controlling clock gating to the peripherals, and providing an IRQ
+status register.
+
+Required properties:
+- compatible:   Should be "brcm,bcm2835-aux"
+- #clock-cells: Should be <1>. The permitted clock-specifier values can be
+                  found in include/dt-bindings/clock/bcm2835-aux.h
+- reg:          Specifies base physical address and size of the registers
+- clocks:       The parent clock phandle
+
+Example:
+
+        clocks: cprman@7e101000 {
+                compatible = "brcm,bcm2835-cprman";
+                #clock-cells = <1>;
+                reg = <0x7e101000 0x2000>;
+                clocks = <&clk_osc>;
+        };
+
+        aux: aux@0x7e215004 {
+                compatible = "brcm,bcm2835-aux";
+                #clock-cells = <1>;
+                reg = <0x7e215000 0x8>;
+                clocks = <&clocks BCM2835_CLOCK_VPU>;
+        };
diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile
index 247c26750d8b..1d79bd2c36f0 100644
--- a/drivers/clk/bcm/Makefile
+++ b/drivers/clk/bcm/Makefile
@@ -5,6 +5,7 @@ obj-$(CONFIG_CLK_BCM_KONA)	+= clk-bcm281xx.o
 obj-$(CONFIG_CLK_BCM_KONA)      += clk-bcm21664.o
 obj-$(CONFIG_COMMON_CLK_IPROC)  += clk-iproc-armpll.o clk-iproc-pll.o clk-iproc-asiu.o
 obj-$(CONFIG_ARCH_BCM2835)      += clk-bcm2835.o
+obj-$(CONFIG_ARCH_BCM2835)      += clk-bcm2835-aux.o
 obj-$(CONFIG_COMMON_CLK_IPROC)  += clk-ns2.o
 obj-$(CONFIG_ARCH_BCM_CYGNUS)   += clk-cygnus.o
 obj-$(CONFIG_ARCH_BCM_NSP)      += clk-nsp.o
diff --git a/drivers/clk/bcm/clk-bcm2835-aux.c b/drivers/clk/bcm/clk-bcm2835-aux.c
new file mode 100644
index 000000000000..e4f89e28b5ec
--- /dev/null
+++ b/drivers/clk/bcm/clk-bcm2835-aux.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2015 Broadcom
+ *
+ * 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 <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/clk/bcm2835.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <dt-bindings/clock/bcm2835-aux.h>
+
+#define BCM2835_AUXIRQ          0x00
+#define BCM2835_AUXENB          0x04
+
+static int bcm2835_aux_clk_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct clk_onecell_data *onecell;
+        const char *parent;
+        struct clk *parent_clk;
+        struct resource *res;
+        void __iomem *reg, *gate;
+
+        parent_clk = devm_clk_get(dev, NULL);
+        if (IS_ERR(parent_clk))
+                return PTR_ERR(parent_clk);
+        parent = __clk_get_name(parent_clk);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        reg = devm_ioremap_resource(dev, res);
+        if (!reg)
+                return -ENODEV;
+
+        onecell = devm_kmalloc(dev, sizeof(*onecell), GFP_KERNEL);
+        if (!onecell)
+                return -ENOMEM;
+        onecell->clk_num = BCM2835_AUX_CLOCK_COUNT;
+        onecell->clks = devm_kcalloc(dev, BCM2835_AUX_CLOCK_COUNT,
+                                     sizeof(*onecell->clks), GFP_KERNEL);
+        if (!onecell->clks)
+                return -ENOMEM;
+
+        gate = reg + BCM2835_AUXENB;
+        onecell->clks[BCM2835_AUX_CLOCK_UART] =
+                clk_register_gate(dev, "aux_uart", parent, 0, gate, 0, 0, NULL);
+
+        onecell->clks[BCM2835_AUX_CLOCK_SPI1] =
+                clk_register_gate(dev, "aux_spi1", parent, 0, gate, 1, 0, NULL);
+
+        onecell->clks[BCM2835_AUX_CLOCK_SPI2] =
+                clk_register_gate(dev, "aux_spi2", parent, 0, gate, 2, 0, NULL);
+
+        of_clk_add_provider(pdev->dev.of_node, of_clk_src_onecell_get, onecell);
+
+        return 0;
+}
+
+static const struct of_device_id bcm2835_aux_clk_of_match[] = {
+        { .compatible = "brcm,bcm2835-aux", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, bcm2835_aux_clk_of_match);
+
+static struct platform_driver bcm2835_aux_clk_driver = {
+        .driver = {
+                .name = "bcm2835-aux-clk",
+                .of_match_table = bcm2835_aux_clk_of_match,
+        },
+        .probe          = bcm2835_aux_clk_probe,
+};
+builtin_platform_driver(bcm2835_aux_clk_driver);
+
+MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
+MODULE_DESCRIPTION("BCM2835 auxiliary peripheral clock driver");
+MODULE_LICENSE("GPL v2");
diff --git a/include/dt-bindings/clock/bcm2835-aux.h b/include/dt-bindings/clock/bcm2835-aux.h
new file mode 100644
index 000000000000..d91156e2658d
--- /dev/null
+++ b/include/dt-bindings/clock/bcm2835-aux.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2015 Broadcom Corporation
+ *
+ * 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 version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#define BCM2835_AUX_CLOCK_UART          0
+#define BCM2835_AUX_CLOCK_SPI1          1
+#define BCM2835_AUX_CLOCK_SPI2          2
+#define BCM2835_AUX_CLOCK_COUNT         3