From: Chunyan Zhang <chunyan.zhang@spreadtrum.com>
To: Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Cc: <linux-clk@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Arnd Bergmann <arnd@arndb.de>, Mark Brown <broonie@kernel.org>,
Xiaolong Zhang <xiaolong.zhang@spreadtrum.com>,
Orson Zhai <orson.zhai@spreadtrum.com>,
Geng Ren <geng.ren@spreadtrum.com>,
Chunyan Zhang <zhang.lyra@gmail.com>,
Chunyan Zhang <chunyan.zhang@spreadtrum.com>
Subject: [PATCH V1 6/9] clk: sprd: add composite clock support
Date: Sun, 18 Jun 2017 09:58:52 +0800 [thread overview]
Message-ID: <20170618015855.27738-7-chunyan.zhang@spreadtrum.com> (raw)
In-Reply-To: <20170618015855.27738-1-chunyan.zhang@spreadtrum.com>
This patch introduced composite driver whose functions are simply
consisted of divider and mux clocks.
Original-by: Xiaolong Zhang <xiaolong.zhang@spreadtrum.com>
Signed-off-by: Chunyan Zhang <chunyan.zhang@spreadtrum.com>
---
drivers/clk/sprd/Makefile | 2 +-
drivers/clk/sprd/ccu_composite.c | 62 ++++++++++++++++++++++++++++++++++++++++
drivers/clk/sprd/ccu_composite.h | 47 ++++++++++++++++++++++++++++++
3 files changed, 110 insertions(+), 1 deletion(-)
create mode 100644 drivers/clk/sprd/ccu_composite.c
create mode 100644 drivers/clk/sprd/ccu_composite.h
diff --git a/drivers/clk/sprd/Makefile b/drivers/clk/sprd/Makefile
index d129c0a8..83232e5 100644
--- a/drivers/clk/sprd/Makefile
+++ b/drivers/clk/sprd/Makefile
@@ -1,3 +1,3 @@
ifneq ($(CONFIG_OF),)
-obj-y += ccu_common.o ccu_gate.o ccu_mux.o ccu_div.o
+obj-y += ccu_common.o ccu_gate.o ccu_mux.o ccu_div.o ccu_composite.o
endif
diff --git a/drivers/clk/sprd/ccu_composite.c b/drivers/clk/sprd/ccu_composite.c
new file mode 100644
index 0000000..6a64fb1
--- /dev/null
+++ b/drivers/clk/sprd/ccu_composite.c
@@ -0,0 +1,62 @@
+/*
+ * Spreadtrum composite clock driver
+ *
+ * Copyright (C) 2017 Spreadtrum, Inc.
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ */
+
+#include <linux/clk-provider.h>
+
+#include "ccu_composite.h"
+
+DEFINE_SPINLOCK(comp_lock);
+
+static long ccu_comp_round_rate(struct clk_hw *hw, unsigned long rate,
+ unsigned long *parent_rate)
+{
+ struct ccu_comp *cc = hw_to_ccu_comp(hw);
+
+ return ccu_div_helper_round_rate(&cc->common, &cc->div,
+ rate, parent_rate);
+}
+
+static unsigned long ccu_comp_recalc_rate(struct clk_hw *hw,
+ unsigned long parent_rate)
+{
+ struct ccu_comp *cc = hw_to_ccu_comp(hw);
+
+ return ccu_div_helper_recalc_rate(&cc->common, &cc->div, parent_rate);
+}
+
+static int ccu_comp_set_rate(struct clk_hw *hw, unsigned long rate,
+ unsigned long parent_rate)
+{
+ struct ccu_comp *cc = hw_to_ccu_comp(hw);
+
+ return ccu_div_helper_set_rate(&cc->common, &cc->div,
+ rate, parent_rate);
+}
+
+static u8 ccu_comp_get_parent(struct clk_hw *hw)
+{
+ struct ccu_comp *cc = hw_to_ccu_comp(hw);
+
+ return ccu_mux_helper_get_parent(&cc->common, &cc->mux);
+}
+
+static int ccu_comp_set_parent(struct clk_hw *hw, u8 index)
+{
+ struct ccu_comp *cc = hw_to_ccu_comp(hw);
+
+ return ccu_mux_helper_set_parent(&cc->common, &cc->mux, index);
+}
+
+const struct clk_ops ccu_comp_ops = {
+ .get_parent = ccu_comp_get_parent,
+ .set_parent = ccu_comp_set_parent,
+
+ .round_rate = ccu_comp_round_rate,
+ .recalc_rate = ccu_comp_recalc_rate,
+ .set_rate = ccu_comp_set_rate,
+};
diff --git a/drivers/clk/sprd/ccu_composite.h b/drivers/clk/sprd/ccu_composite.h
new file mode 100644
index 0000000..c99c919
--- /dev/null
+++ b/drivers/clk/sprd/ccu_composite.h
@@ -0,0 +1,47 @@
+/*
+ * Spreadtrum composite clock driver
+ *
+ * Copyright (C) 2017 Spreadtrum, Inc.
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ */
+
+#ifndef _CCU_COMPOSITE_H_
+#define _CCU_COMPOSITE_H_
+
+#include "ccu_common.h"
+#include "ccu_mux.h"
+#include "ccu_div.h"
+
+struct ccu_comp {
+ struct ccu_mux_internal mux;
+ struct ccu_div_internal div;
+ struct ccu_common common;
+};
+
+#define SPRD_CCU_COMP(_struct, _name, _parent, _reg, _table, \
+ _mshift, _mwidth, _dshift, _dwidth, _flags) \
+ struct ccu_comp _struct = { \
+ .mux = _SPRD_CCU_MUX(_mshift, _mwidth, _table), \
+ .div = _SPRD_CCU_DIV(_dshift, _dwidth), \
+ .common = { \
+ .reg = _reg, \
+ .lock = &comp_lock, \
+ .hw.init = CLK_HW_INIT_PARENTS(_name, \
+ _parent, \
+ &ccu_comp_ops, \
+ _flags), \
+ } \
+ }
+
+static inline struct ccu_comp *hw_to_ccu_comp(struct clk_hw *hw)
+{
+ struct ccu_common *common = hw_to_ccu_common(hw);
+
+ return container_of(common, struct ccu_comp, common);
+}
+
+extern const struct clk_ops ccu_comp_ops;
+extern spinlock_t comp_lock;
+
+#endif /* _CCU_COMPOSITE_H_ */
--
2.7.4
next prev parent reply other threads:[~2017-06-18 2:02 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-18 1:58 [PATCH V1 0/9] add clock driver for Spreadtrum platforms Chunyan Zhang
2017-06-18 1:58 ` [PATCH V1 1/9] dt-bindings: Add Spreadtrum CCU binding documentation Chunyan Zhang
2017-06-23 20:05 ` Rob Herring
2017-06-18 1:58 ` [PATCH V1 2/9] clk: sprd: Add common infrastructure Chunyan Zhang
2017-06-20 1:29 ` Stephen Boyd
2017-06-22 10:12 ` Chunyan Zhang
2017-06-18 1:58 ` [PATCH V1 3/9] clk: sprd: add gate clock support Chunyan Zhang
2017-06-20 1:31 ` Stephen Boyd
2017-06-22 10:16 ` Chunyan Zhang
2017-06-30 1:43 ` Stephen Boyd
2017-06-18 1:58 ` [PATCH V1 4/9] clk: sprd: add mux " Chunyan Zhang
2017-06-18 1:58 ` [PATCH V1 5/9] clk: sprd: add divider " Chunyan Zhang
2017-06-18 1:58 ` Chunyan Zhang [this message]
2017-06-19 0:13 ` [PATCH V1 6/9] clk: sprd: add composite " kbuild test robot
2017-06-18 1:58 ` [PATCH V1 7/9] clk: sprd: add adjustable pll support Chunyan Zhang
2017-06-20 1:37 ` Stephen Boyd
2017-06-22 10:17 ` Chunyan Zhang
2017-06-22 11:15 ` Arnd Bergmann
2017-06-22 12:06 ` Chunyan Zhang
2017-06-30 1:44 ` Stephen Boyd
2017-06-30 7:55 ` Chunyan Zhang
2017-06-30 19:22 ` Stephen Boyd
2017-07-03 7:41 ` Chunyan Zhang
2017-06-18 1:58 ` [PATCH V1 8/9] clk: sprd: add clocks support for SC9860 Chunyan Zhang
2017-06-20 1:41 ` Stephen Boyd
2017-06-22 10:21 ` Chunyan Zhang
2017-06-30 1:41 ` Stephen Boyd
2017-06-18 1:58 ` [PATCH V1 9/9] arm64: dts: add ccu " Chunyan Zhang
2017-06-20 1:24 ` Stephen Boyd
2017-06-22 10:24 ` Chunyan Zhang
2017-06-30 0:57 ` Stephen Boyd
2017-06-30 7:37 ` Chunyan Zhang
2017-06-20 1:25 ` [PATCH V1 0/9] add clock driver for Spreadtrum platforms Stephen Boyd
2017-06-22 10:07 ` Chunyan Zhang
2017-06-30 0:45 ` Stephen Boyd
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=20170618015855.27738-7-chunyan.zhang@spreadtrum.com \
--to=chunyan.zhang@spreadtrum.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=geng.ren@spreadtrum.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mturquette@baylibre.com \
--cc=orson.zhai@spreadtrum.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@codeaurora.org \
--cc=xiaolong.zhang@spreadtrum.com \
--cc=zhang.lyra@gmail.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).