linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/40] clk: add a fixed factor clock
Date: Tue, 10 Apr 2012 15:45:15 +0200	[thread overview]
Message-ID: <1334065553-7565-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1334065553-7565-1-git-send-email-s.hauer@pengutronix.de>

Having fixed factors/dividers in hardware is a common pattern, so
add a basic clock type doing this. It basically describes a fixed
factor clock using a nominator and a denominator.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/clk/Makefile           |    2 +-
 drivers/clk/clk-fixed-factor.c |   97 ++++++++++++++++++++++++++++++++++++++++
 include/linux/clk-provider.h   |    4 ++
 3 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 drivers/clk/clk-fixed-factor.c

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 1f736bc..24aa714 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -1,4 +1,4 @@
 
 obj-$(CONFIG_CLKDEV_LOOKUP)	+= clkdev.o
 obj-$(CONFIG_COMMON_CLK)	+= clk.o clk-fixed-rate.o clk-gate.o \
-				   clk-mux.o clk-divider.o
+				   clk-mux.o clk-divider.o clk-fixed-factor.o
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
new file mode 100644
index 0000000..7c5e1fc
--- /dev/null
+++ b/drivers/clk/clk-fixed-factor.c
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2011 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>
+ *
+ * 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.
+ *
+ * Standard functionality for the common clock API.
+ */
+#include <linux/module.h>
+#include <linux/clk-provider.h>
+#include <linux/slab.h>
+#include <linux/err.h>
+
+struct clk_fixed_factor {
+	struct clk_hw	hw;
+	unsigned int	mult;
+	unsigned int	div;
+	char		*parent[1];
+};
+
+#define to_clk_fixed_factor(_hw) container_of(_hw, struct clk_fixed_factor, hw)
+
+static unsigned long clk_factor_recalc_rate(struct clk_hw *hw,
+		unsigned long parent_rate)
+{
+	struct clk_fixed_factor *fix = to_clk_fixed_factor(hw);
+
+	return (parent_rate / fix->div) * fix->mult;
+}
+
+static long clk_factor_round_rate(struct clk_hw *hw, unsigned long rate,
+				unsigned long *prate)
+{
+	struct clk_fixed_factor *fix = to_clk_fixed_factor(hw);
+
+	if (prate) {
+		unsigned long best_parent;
+		best_parent = (rate / fix->mult) * fix->div;
+		*prate = __clk_round_rate(__clk_get_parent(hw->clk),
+				best_parent);
+		return (*prate / fix->div) * fix->mult;
+	} else {
+		return (__clk_get_rate(__clk_get_parent(hw->clk)) / fix->div) * fix->mult;
+	}
+}
+
+static int clk_factor_set_rate(struct clk_hw *hw, unsigned long rate)
+{
+	return 0;
+}
+
+struct clk_ops clk_fixed_factor_ops = {
+	.round_rate = clk_factor_round_rate,
+	.set_rate = clk_factor_set_rate,
+	.recalc_rate = clk_factor_recalc_rate,
+};
+EXPORT_SYMBOL_GPL(clk_fixed_factor_ops);
+
+struct clk *clk_register_fixed_factor(struct device *dev, const char *name,
+		const char *parent_name, unsigned long flags,
+		unsigned int mult, unsigned int div)
+{
+	struct clk_fixed_factor *fix;
+	struct clk *clk;
+
+	fix = kmalloc(sizeof(struct clk_gate), GFP_KERNEL);
+
+	if (!fix) {
+		pr_err("%s: could not allocate gated clk\n", __func__);
+		return ERR_PTR(-ENOMEM);
+	}
+
+	/* struct clk_gate assignments */
+	fix->mult = mult;
+	fix->div = div;
+
+	if (parent_name) {
+		fix->parent[0] = kstrdup(parent_name, GFP_KERNEL);
+		if (!fix->parent[0])
+			goto out;
+	}
+
+	clk = clk_register(dev, name,
+			&clk_fixed_factor_ops, &fix->hw,
+			fix->parent,
+			(parent_name ? 1 : 0),
+			flags);
+	if (clk)
+		return clk;
+
+out:
+	kfree(fix->parent[0]);
+	kfree(fix);
+
+	return NULL;
+}
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 5508897..21ca2f8 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -257,6 +257,10 @@ struct clk *clk_register_mux(struct device *dev, const char *name,
 		void __iomem *reg, u8 shift, u8 width,
 		u8 clk_mux_flags, spinlock_t *lock);
 
+struct clk *clk_register_fixed_factor(struct device *dev, const char *name,
+		const char *parent_name, unsigned long flags,
+		unsigned int mult, unsigned int div);
+
 /**
  * clk_register - allocate a new clock, register it and return an opaque cookie
  * @dev: device that is registering this clock
-- 
1.7.9.5

  parent reply	other threads:[~2012-04-10 13:45 UTC|newest]

Thread overview: 101+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-10 13:45 Convert i.MX architecture to generic clock framework Sascha Hauer
2012-04-10 13:45 ` [PATCH 01/40] clkdev: add clkname to struct clk_lookup Sascha Hauer
2012-04-10 14:30   ` Russell King - ARM Linux
2012-04-10 16:11     ` Sascha Hauer
2012-04-11  1:11       ` Richard Zhao
2012-04-11  8:24         ` Mark Brown
2012-04-11  8:45           ` Richard Zhao
2012-04-11  9:15             ` Mark Brown
2012-04-11  9:21               ` Russell King - ARM Linux
2012-04-11  9:32                 ` Mark Brown
2012-04-11  9:41                   ` Russell King - ARM Linux
2012-04-11 10:31                     ` Mark Brown
2012-04-11 11:43                       ` Russell King - ARM Linux
2012-04-12 16:33                         ` Mark Brown
2012-04-11  9:20             ` Russell King - ARM Linux
2012-04-11  9:42               ` Sascha Hauer
2012-04-11  9:47                 ` Russell King - ARM Linux
2012-04-13  3:33                   ` Viresh Kumar
2012-04-13  4:17                     ` Shawn Guo
2012-04-13  5:06                       ` Viresh Kumar
2012-04-13  5:22                         ` Shawn Guo
2012-04-13  8:59                           ` Mark Brown
2012-04-13  9:10                             ` Viresh Kumar
2012-04-13  9:17                               ` Richard Zhao
2012-04-13  9:26                                 ` Russell King - ARM Linux
2012-04-13  9:27                                   ` Viresh Kumar
2012-04-13  9:36                                     ` Russell King - ARM Linux
2012-04-13 10:02                                       ` Viresh Kumar
2012-04-13 10:08                                         ` Mark Brown
2012-04-13 10:20                                         ` Russell King - ARM Linux
2012-04-13 10:43                                           ` Viresh Kumar
2012-04-13 23:19                                           ` Turquette, Mike
2012-04-24  2:17               ` Richard Zhao
2012-04-10 13:45 ` Sascha Hauer [this message]
2012-04-17 10:15   ` [PATCH 02/40] clk: add a fixed factor clock Viresh Kumar
2012-04-19  3:48   ` Viresh Kumar
2012-04-19  6:16     ` Domenico Andreoli
2012-04-19  6:19       ` Viresh Kumar
2012-04-19  6:45     ` Sascha Hauer
2012-04-10 13:45 ` [PATCH 03/40] clk: declare clk_ops of basic clks in clk-provider.h Sascha Hauer
2012-04-10 13:45 ` [PATCH 04/40] dmaengine i.MX SDMA: do not depend on grouped clocks Sascha Hauer
2012-04-10 13:45 ` [PATCH 05/40] spi i.MX: " Sascha Hauer
2012-04-10 13:45 ` [PATCH 06/40] video imxfb: " Sascha Hauer
2012-04-10 13:45 ` [PATCH 07/40] net fec: " Sascha Hauer
2012-04-10 13:45 ` [PATCH 08/40] mmc mxcmmc: " Sascha Hauer
2012-04-10 13:45 ` [PATCH 09/40] mmc sdhc i.MX: " Sascha Hauer
2012-04-20  2:06   ` Richard Zhao
2012-04-20  2:42     ` Richard Zhao
2012-04-10 13:45 ` [PATCH 10/40] serial " Sascha Hauer
2012-04-10 13:45 ` [PATCH 11/40] mtd mxc_nand: prepare/unprepare clock Sascha Hauer
2012-04-10 13:45 ` [PATCH 12/40] USB ehci mxc: " Sascha Hauer
2012-04-10 13:45 ` [PATCH 13/40] w1 i.MX: " Sascha Hauer
2012-04-10 13:45 ` [PATCH 14/40] watchdog imx2: prepare clk before enabling it Sascha Hauer
2012-04-10 13:45 ` [PATCH 15/40] media mx3 camera: " Sascha Hauer
2012-04-10 13:45 ` [PATCH 16/40] dmaengine i.MX ipu: clk_prepare/unprepare clock Sascha Hauer
2012-04-10 13:45 ` [PATCH 17/40] ARM i.MX5: prepare gpc_dvfs_clk Sascha Hauer
2012-04-10 13:45 ` [PATCH 18/40] ARM i.MX: prepare for common clock framework Sascha Hauer
2012-04-10 13:45 ` [PATCH 19/40] ARM i.MX timer: request correct clock Sascha Hauer
2012-04-10 13:45 ` [PATCH 20/40] ARM i.MX: Add common clock support for pllv1 Sascha Hauer
2012-04-10 13:45 ` [PATCH 21/40] ARM i.MX: Add common clock support for pllv2 Sascha Hauer
2012-04-10 13:45 ` [PATCH 22/40] ARM: imx: add common clock support for pllv3 Sascha Hauer
2012-04-10 13:45 ` [PATCH 23/40] ARM i.MX: Add common clock support for 2bit gate Sascha Hauer
2012-04-19  7:00   ` Shawn Guo
2012-04-19  7:15     ` Richard Zhao
2012-04-19  7:26     ` Lei Wen
2012-04-19  7:52       ` Domenico Andreoli
2012-04-10 13:45 ` [PATCH 24/40] ARM: imx: add common clock support for pfd Sascha Hauer
2012-04-10 13:45 ` [PATCH 25/40] ARM: imx: add common clock support for clk busy Sascha Hauer
2012-04-10 18:59   ` Stephen Boyd
2012-04-11  6:53     ` Sascha Hauer
2012-04-11 22:21       ` Stephen Boyd
2012-04-12  3:30         ` Shawn Guo
2012-04-12  1:50   ` Richard Zhao
2012-04-12  2:44     ` Shawn Guo
2012-04-13  2:09   ` [PATCH] ARM: imx: remove clk_hw from clk_busy Shawn Guo
2012-04-13 14:34     ` Sascha Hauer
2012-04-10 13:45 ` [PATCH 26/40] ARM i.MX3: Make ccm base address a variable Sascha Hauer
2012-04-10 13:45 ` [PATCH 27/40] ARM i.MX25: implement clocks using common clock framework Sascha Hauer
2012-04-10 20:10   ` Roberto Nibali
2012-04-10 20:45     ` Fabio Estevam
2012-04-11  7:01       ` Roberto Nibali
2012-04-10 13:45 ` [PATCH 28/40] ARM i.MX1: " Sascha Hauer
2012-04-16 21:07   ` Sascha Hauer
2012-04-10 13:45 ` [PATCH 29/40] ARM i.MX21: " Sascha Hauer
2012-04-10 13:45 ` [PATCH 30/40] ARM i.MX27: " Sascha Hauer
2012-04-10 13:45 ` [PATCH 31/40] ARM i.MX31: " Sascha Hauer
2012-04-10 13:45 ` [PATCH 32/40] ARM i.MX5: " Sascha Hauer
2012-04-23  6:39   ` Richard Zhao
2012-04-23  6:54     ` Sascha Hauer
2012-04-23  7:28       ` Richard Zhao
2012-04-10 13:45 ` [PATCH 33/40] ARM i.MX35: " Sascha Hauer
2012-04-10 13:45 ` [PATCH 34/40] ARM: imx6: " Sascha Hauer
2012-04-18 11:33   ` Sascha Hauer
2012-04-19 13:56     ` Shawn Guo
2012-04-19 14:06       ` Sascha Hauer
2012-04-10 13:45 ` [PATCH 35/40] ARM i.MX: remove now unused old clock support Sascha Hauer
2012-04-10 13:45 ` [PATCH 36/40] ARM i.MX pllv1: move mxc_decode_pll to its only user Sascha Hauer
2012-04-10 13:45 ` [PATCH 37/40] ARM i.MX: remove unused legacy clock support Sascha Hauer
2012-04-10 13:45 ` [PATCH 38/40] USB gadget i.MX: fix clock handling Sascha Hauer
2012-04-10 13:45 ` [PATCH 39/40] USB ehci i.MX: Fix " Sascha Hauer
2012-04-10 13:45 ` [PATCH 40/40] ARM i.MX: Remove now unused struct clk argument from mxc_timer_init Sascha Hauer

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=1334065553-7565-3-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.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: 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).