From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: imx: remove clk_hw from clk_busy
Date: Fri, 13 Apr 2012 16:34:04 +0200 [thread overview]
Message-ID: <20120413143404.GO3852@pengutronix.de> (raw)
In-Reply-To: <1334282997-23071-1-git-send-email-shawn.guo@linaro.org>
On Fri, Apr 13, 2012 at 10:09:57AM +0800, Shawn Guo wrote:
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
> Hi Sascha,
>
> I'm convinced by Richard that we do not need a clk_hw duplication
> in clk_busy for a better OOP view. So please consider to squash
> the patch to "ARM: imx: add common clock support for clk busy".
Ok, will do.
Thanks
Sascha
>
> Thanks,
> Shawn
>
> arch/arm/mach-imx/clk-busy.c | 32 ++++++++++++++++++--------------
> 1 files changed, 18 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm/mach-imx/clk-busy.c b/arch/arm/mach-imx/clk-busy.c
> index 9450f0b..977d50a 100644
> --- a/arch/arm/mach-imx/clk-busy.c
> +++ b/arch/arm/mach-imx/clk-busy.c
> @@ -29,14 +29,18 @@ static int clk_busy_wait(void __iomem *reg, u8 shift)
> }
>
> struct clk_busy_divider {
> - struct clk_hw hw;
> - void __iomem *reg;
> - u8 shift;
> struct clk_divider div;
> const struct clk_ops *div_ops;
> + void __iomem *reg;
> + u8 shift;
> };
>
> -#define to_clk_busy_divider(_hw) container_of(_hw, struct clk_busy_divider, hw)
> +static inline struct clk_busy_divider *to_clk_busy_divider(struct clk_hw *hw)
> +{
> + struct clk_divider *div = container_of(hw, struct clk_divider, hw);
> +
> + return container_of(div, struct clk_busy_divider, div);
> +}
>
> static unsigned long clk_busy_divider_recalc_rate(struct clk_hw *hw,
> unsigned long parent_rate)
> @@ -92,25 +96,27 @@ struct clk *imx_clk_busy_divider(const char *name, char *parent_name,
> busy->div.lock = &imx_ccm_lock;
> busy->div_ops = &clk_divider_ops;
>
> - clk = clk_register(NULL, name, &clk_busy_divider_ops, &busy->hw,
> + clk = clk_register(NULL, name, &clk_busy_divider_ops, &busy->div.hw,
> &parent_name, 1, CLK_SET_RATE_PARENT);
> if (!clk)
> kfree(busy);
>
> - busy->div.hw.clk = clk;
> -
> return clk;
> }
>
> struct clk_busy_mux {
> - struct clk_hw hw;
> - void __iomem *reg;
> - u8 shift;
> struct clk_mux mux;
> const struct clk_ops *mux_ops;
> + void __iomem *reg;
> + u8 shift;
> };
>
> -#define to_clk_busy_mux(_hw) container_of(_hw, struct clk_busy_mux, hw)
> +static inline struct clk_busy_mux *to_clk_busy_mux(struct clk_hw *hw)
> +{
> + struct clk_mux *mux = container_of(hw, struct clk_mux, hw);
> +
> + return container_of(mux, struct clk_busy_mux, mux);
> +}
>
> static u8 clk_busy_mux_get_parent(struct clk_hw *hw)
> {
> @@ -156,12 +162,10 @@ struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift,
> busy->mux.lock = &imx_ccm_lock;
> busy->mux_ops = &clk_mux_ops;
>
> - clk = clk_register(NULL, name, &clk_busy_mux_ops, &busy->hw,
> + clk = clk_register(NULL, name, &clk_busy_mux_ops, &busy->mux.hw,
> parent_names, num_parents, 0);
> if (!clk)
> kfree(busy);
>
> - busy->mux.hw.clk = clk;
> -
> return clk;
> }
> --
> 1.7.5.4
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2012-04-13 14:34 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 ` [PATCH 02/40] clk: add a fixed factor clock Sascha Hauer
2012-04-17 10:15 ` 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 [this message]
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=20120413143404.GO3852@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).