From: Tero Kristo <t-kristo@ti.com> To: linux-omap@vger.kernel.org, paul@pwsan.com, tony@atomide.com, nm@ti.com, rnayak@ti.com, bcousson@baylibre.com, mturquette@linaro.org Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCHv12 09/49] clk: mux: add support for low level ops Date: Fri, 20 Dec 2013 18:34:27 +0200 [thread overview] Message-ID: <1387557274-22583-9-git-send-email-t-kristo@ti.com> (raw) In-Reply-To: <1387557274-22583-1-git-send-email-t-kristo@ti.com> Multiplexer clock can now be registered to use low level register access ops. Preferred initialization method is via clock description. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- drivers/clk/clk-mux.c | 24 +++++++++++++++++++++--- include/linux/clk-provider.h | 4 ++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index 2cbed08..ed3bc36 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -46,7 +46,12 @@ static u8 clk_mux_get_parent(struct clk_hw *hw) * OTOH, pmd_trace_clk_mux_ck uses a separate bit for each clock, so * val = 0x4 really means "bit 2, index starts at bit 0" */ - val = clk_readl(mux->reg) >> mux->shift; + if (mux->ll_ops) + val = mux->ll_ops->clk_readl(mux->reg); + else + val = clk_readl(mux->reg); + + val >>= mux->shift; val &= mux->mask; if (mux->table) { @@ -93,11 +98,19 @@ static int clk_mux_set_parent(struct clk_hw *hw, u8 index) if (mux->flags & CLK_MUX_HIWORD_MASK) { val = mux->mask << (mux->shift + 16); } else { - val = clk_readl(mux->reg); + if (mux->ll_ops) + val = mux->ll_ops->clk_readl(mux->reg); + else + val = clk_readl(mux->reg); + val &= ~(mux->mask << mux->shift); } val |= index << mux->shift; - clk_writel(val, mux->reg); + + if (mux->ll_ops) + mux->ll_ops->clk_writel(val, mux->reg); + else + clk_writel(val, mux->reg); if (mux->lock) spin_unlock_irqrestore(mux->lock, flags); @@ -159,6 +172,7 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name, mux->lock = lock; mux->table = table; mux->hw.init = &init; + mux->ll_ops = &clk_ll_ops_default; clk = clk_register(dev, &mux->hw); @@ -201,6 +215,10 @@ struct clk_hw *clk_register_mux_desc(struct device *dev, struct clk_desc *desc) mux->shift = hw_desc->shift; mux->flags = hw_desc->flags; mux->lock = hw_desc->lock; + mux->ll_ops = hw_desc->ll_ops; + + if (!mux->ll_ops) + mux->ll_ops = &clk_ll_ops_default; if (!desc->ops) { if (mux->flags & CLK_MUX_READ_ONLY) diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 3923d46..629163c 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -408,6 +408,7 @@ struct clk *clk_register_divider_table(struct device *dev, const char *name, * * @hw: handle between common and hardware-specific interfaces * @reg: register controlling multiplexer + * @ll_ops: low-level ops for accessing the register * @shift: shift to multiplexer bit field * @width: width of mutliplexer bit field * @flags: hardware-specific flags @@ -427,6 +428,7 @@ struct clk *clk_register_divider_table(struct device *dev, const char *name, struct clk_mux { struct clk_hw hw; void __iomem *reg; + struct clk_ll_ops *ll_ops; u32 *table; u32 mask; u8 shift; @@ -438,6 +440,7 @@ struct clk_mux { * struct clk_mux_desc - init descriptor for multiplexer clock * @desc: handle between common and hardware-specific interfaces * @reg: register controlling multiplexer + * @ll_ops: low-level ops for accesing the register * @shift: shift to multiplexer bit field * @width: width of multiplexer bit field * @flags: hardware-specific flags @@ -446,6 +449,7 @@ struct clk_mux { struct clk_mux_desc { struct clk_desc desc; void __iomem *reg; + struct clk_ll_ops *ll_ops; u32 *table; u32 mask; u8 shift; -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: t-kristo@ti.com (Tero Kristo) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv12 09/49] clk: mux: add support for low level ops Date: Fri, 20 Dec 2013 18:34:27 +0200 [thread overview] Message-ID: <1387557274-22583-9-git-send-email-t-kristo@ti.com> (raw) In-Reply-To: <1387557274-22583-1-git-send-email-t-kristo@ti.com> Multiplexer clock can now be registered to use low level register access ops. Preferred initialization method is via clock description. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- drivers/clk/clk-mux.c | 24 +++++++++++++++++++++--- include/linux/clk-provider.h | 4 ++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index 2cbed08..ed3bc36 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -46,7 +46,12 @@ static u8 clk_mux_get_parent(struct clk_hw *hw) * OTOH, pmd_trace_clk_mux_ck uses a separate bit for each clock, so * val = 0x4 really means "bit 2, index starts at bit 0" */ - val = clk_readl(mux->reg) >> mux->shift; + if (mux->ll_ops) + val = mux->ll_ops->clk_readl(mux->reg); + else + val = clk_readl(mux->reg); + + val >>= mux->shift; val &= mux->mask; if (mux->table) { @@ -93,11 +98,19 @@ static int clk_mux_set_parent(struct clk_hw *hw, u8 index) if (mux->flags & CLK_MUX_HIWORD_MASK) { val = mux->mask << (mux->shift + 16); } else { - val = clk_readl(mux->reg); + if (mux->ll_ops) + val = mux->ll_ops->clk_readl(mux->reg); + else + val = clk_readl(mux->reg); + val &= ~(mux->mask << mux->shift); } val |= index << mux->shift; - clk_writel(val, mux->reg); + + if (mux->ll_ops) + mux->ll_ops->clk_writel(val, mux->reg); + else + clk_writel(val, mux->reg); if (mux->lock) spin_unlock_irqrestore(mux->lock, flags); @@ -159,6 +172,7 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name, mux->lock = lock; mux->table = table; mux->hw.init = &init; + mux->ll_ops = &clk_ll_ops_default; clk = clk_register(dev, &mux->hw); @@ -201,6 +215,10 @@ struct clk_hw *clk_register_mux_desc(struct device *dev, struct clk_desc *desc) mux->shift = hw_desc->shift; mux->flags = hw_desc->flags; mux->lock = hw_desc->lock; + mux->ll_ops = hw_desc->ll_ops; + + if (!mux->ll_ops) + mux->ll_ops = &clk_ll_ops_default; if (!desc->ops) { if (mux->flags & CLK_MUX_READ_ONLY) diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 3923d46..629163c 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -408,6 +408,7 @@ struct clk *clk_register_divider_table(struct device *dev, const char *name, * * @hw: handle between common and hardware-specific interfaces * @reg: register controlling multiplexer + * @ll_ops: low-level ops for accessing the register * @shift: shift to multiplexer bit field * @width: width of mutliplexer bit field * @flags: hardware-specific flags @@ -427,6 +428,7 @@ struct clk *clk_register_divider_table(struct device *dev, const char *name, struct clk_mux { struct clk_hw hw; void __iomem *reg; + struct clk_ll_ops *ll_ops; u32 *table; u32 mask; u8 shift; @@ -438,6 +440,7 @@ struct clk_mux { * struct clk_mux_desc - init descriptor for multiplexer clock * @desc: handle between common and hardware-specific interfaces * @reg: register controlling multiplexer + * @ll_ops: low-level ops for accesing the register * @shift: shift to multiplexer bit field * @width: width of multiplexer bit field * @flags: hardware-specific flags @@ -446,6 +449,7 @@ struct clk_mux { struct clk_mux_desc { struct clk_desc desc; void __iomem *reg; + struct clk_ll_ops *ll_ops; u32 *table; u32 mask; u8 shift; -- 1.7.9.5
next prev parent reply other threads:[~2013-12-20 16:34 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-12-20 16:34 [PATCHv12 00/49] ARM: TI SoC clock DT conversion Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-20 16:34 ` [PATCHv12 01/49] clk: add support for registering clocks from description Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-20 16:34 ` [PATCHv12 03/49] clk: divider: add support for registering divider clock from descriptor Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-20 16:34 ` [PATCHv12 04/49] clk: mux: add support for registering mux " Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-20 16:34 ` [PATCHv12 05/49] clk: gate: add support for registering gate " Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-20 16:34 ` [PATCHv12 06/49] clk: add support for low level register ops Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-22 17:39 ` Gerhard Sittig 2013-12-22 17:39 ` Gerhard Sittig 2014-01-03 9:13 ` Tero Kristo 2014-01-03 9:13 ` Tero Kristo 2014-01-03 19:48 ` Stephen Boyd 2014-01-03 19:48 ` Stephen Boyd 2014-01-07 7:44 ` Tero Kristo 2014-01-07 7:44 ` Tero Kristo 2013-12-20 16:34 ` [PATCHv12 07/49] clk: divider: add support for low level ops Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-22 17:52 ` Gerhard Sittig 2013-12-22 17:52 ` Gerhard Sittig 2014-01-03 9:17 ` Tero Kristo 2014-01-03 9:17 ` Tero Kristo 2014-01-04 16:48 ` Gerhard Sittig 2014-01-04 16:48 ` Gerhard Sittig 2013-12-20 16:34 ` [PATCHv12 08/49] clk: gate: " Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-20 16:34 ` Tero Kristo [this message] 2013-12-20 16:34 ` [PATCHv12 09/49] clk: mux: " Tero Kristo 2013-12-20 16:34 ` [PATCHv12 12/49] CLK: TI: Add DPLL clock support Tero Kristo 2013-12-20 16:34 ` Tero Kristo [not found] ` <1387557274-22583-1-git-send-email-t-kristo-l0cyMroinI0@public.gmane.org> 2013-12-20 16:34 ` [PATCHv12 11/49] CLK: ti: add init support for clock IP blocks Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-20 16:34 ` [PATCHv12 14/49] clk: ti: add composite clock support Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-20 16:34 ` [PATCHv12 18/49] CLK: TI: add support for clockdomain binding Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-20 16:34 ` [PATCHv12 17/49] CLK: TI: add support for gate clock Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-20 16:34 ` [PATCHv12 23/49] CLK: TI: DRA7: Add APLL support Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-20 16:34 ` [PATCHv12 43/49] ARM: OMAP2+: PRM: add support for initializing PRCM clock modules from DT Tero Kristo 2013-12-20 16:34 ` Tero Kristo 2013-12-20 18:37 ` [PATCHv12 00/49] ARM: TI SoC clock DT conversion Tony Lindgren 2013-12-20 18:37 ` Tony Lindgren 2013-12-20 20:06 ` Felipe Balbi 2013-12-20 20:06 ` Felipe Balbi 2013-12-20 20:10 ` Sebastian Reichel 2013-12-20 20:10 ` Sebastian Reichel 2014-01-07 3:21 ` Nishanth Menon 2014-01-07 3:21 ` Nishanth Menon 2014-01-07 16:36 ` Nishanth Menon 2014-01-07 16:36 ` Nishanth Menon
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=1387557274-22583-9-git-send-email-t-kristo@ti.com \ --to=t-kristo@ti.com \ --cc=bcousson@baylibre.com \ --cc=devicetree@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=mturquette@linaro.org \ --cc=nm@ti.com \ --cc=paul@pwsan.com \ --cc=rnayak@ti.com \ --cc=tony@atomide.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.