6be2305da8
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46598
103 lines
3.1 KiB
Diff
103 lines
3.1 KiB
Diff
From 7fbbca069587b7f467e76f583ad640977de1a4ff Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio@elopez.com.ar>
|
|
Date: Fri, 18 Jul 2014 15:28:02 -0300
|
|
Subject: [PATCH] clk: sunxi: mod1 clock support
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The module 1 type of clocks consist of a gate and a mux and are used on
|
|
the audio blocks to mux and gate the PLL2 outputs for AC97, IIS or
|
|
SPDIF. This commit adds support for them on the sunxi clock driver.
|
|
|
|
Signed-off-by: Emilio López <emilio@elopez.com.ar>
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
drivers/clk/sunxi/Makefile | 1 +
|
|
drivers/clk/sunxi/clk-a10-mod1.c | 69 ++++++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 70 insertions(+)
|
|
create mode 100644 drivers/clk/sunxi/clk-a10-mod1.c
|
|
|
|
--- a/drivers/clk/sunxi/Makefile
|
|
+++ b/drivers/clk/sunxi/Makefile
|
|
@@ -5,6 +5,7 @@
|
|
obj-y += clk-sunxi.o clk-factors.o
|
|
obj-y += clk-a10-codec.o
|
|
obj-y += clk-a10-hosc.o
|
|
+obj-y += clk-a10-mod1.o
|
|
obj-y += clk-a10-pll2.o
|
|
obj-y += clk-a20-gmac.o
|
|
obj-y += clk-mod0.o
|
|
--- /dev/null
|
|
+++ b/drivers/clk/sunxi/clk-a10-mod1.c
|
|
@@ -0,0 +1,69 @@
|
|
+/*
|
|
+ * Copyright 2013 Emilio López
|
|
+ *
|
|
+ * Emilio López <emilio@elopez.com.ar>
|
|
+ *
|
|
+ * 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-provider.h>
|
|
+#include <linux/clkdev.h>
|
|
+#include <linux/of.h>
|
|
+#include <linux/of_address.h>
|
|
+
|
|
+static DEFINE_SPINLOCK(mod1_lock);
|
|
+
|
|
+#define SUN4I_MOD1_ENABLE 31
|
|
+#define SUN4I_MOD1_MUX 16
|
|
+#define SUN4I_MOD1_MUX_WIDTH 2
|
|
+#define SUN4I_MOD1_MAX_PARENTS 4
|
|
+
|
|
+static void __init sun4i_mod1_clk_setup(struct device_node *node)
|
|
+{
|
|
+ struct clk *clk;
|
|
+ struct clk_mux *mux;
|
|
+ struct clk_gate *gate;
|
|
+ const char *parents[4];
|
|
+ const char *clk_name = node->name;
|
|
+ void __iomem *reg;
|
|
+ int i = 0;
|
|
+
|
|
+ mux = kzalloc(sizeof(*mux), GFP_KERNEL);
|
|
+ gate = kzalloc(sizeof(*gate), GFP_KERNEL);
|
|
+ if (!mux || !gate) {
|
|
+ kfree(mux);
|
|
+ kfree(gate);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ of_property_read_string(node, "clock-output-names", &clk_name);
|
|
+ reg = of_iomap(node, 0);
|
|
+
|
|
+ while (i < SUN4I_MOD1_MAX_PARENTS &&
|
|
+ (parents[i] = of_clk_get_parent_name(node, i)) != NULL)
|
|
+ i++;
|
|
+
|
|
+ gate->reg = reg;
|
|
+ gate->bit_idx = SUN4I_MOD1_ENABLE;
|
|
+ gate->lock = &mod1_lock;
|
|
+ mux->reg = reg;
|
|
+ mux->shift = SUN4I_MOD1_MUX;
|
|
+ mux->mask = BIT(SUN4I_MOD1_MUX_WIDTH) - 1;
|
|
+ mux->lock = &mod1_lock;
|
|
+
|
|
+ clk = clk_register_composite(NULL, clk_name, parents, i,
|
|
+ &mux->hw, &clk_mux_ops,
|
|
+ NULL, NULL,
|
|
+ &gate->hw, &clk_gate_ops, 0);
|
|
+ if (!IS_ERR(clk))
|
|
+ of_clk_add_provider(node, of_clk_src_simple_get, clk);
|
|
+}
|
|
+CLK_OF_DECLARE(sun4i_mod1, "allwinner,sun4i-a10-mod1-clk", sun4i_mod1_clk_setup);
|