From: Maxime Ripard <maxime.ripard@free-electrons.com> To: Mike Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@codeaurora.org>, Chen-Yu Tsai <wens@csie.org> Cc: linux-clk@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>, Andre Przywara <andre.przywara@arm.com>, Rob Herring <robh+dt@kernel.org>, Vishnu Patekar <vishnupatekar0510@gmail.com>, linux-arm-kernel@lists.infradead.org, Boris Brezillon <boris.brezillon@free-electrons.com>, Maxime Ripard <maxime.ripard@free-electrons.com> Subject: [PATCH 04/16] clk: sunxi-ng: Add gate clock support Date: Sun, 8 May 2016 22:01:39 +0200 [thread overview] Message-ID: <1462737711-10017-5-git-send-email-maxime.ripard@free-electrons.com> (raw) In-Reply-To: <1462737711-10017-1-git-send-email-maxime.ripard@free-electrons.com> Some clocks in the Allwinner SoCs clocks unit are just simple gates. Add support for those clocks. Since it's a feature that can also be found in more complex clocks, provide a bunch of helpers that can be reused later on. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/clk/sunxi-ng/Makefile | 1 + drivers/clk/sunxi-ng/ccu_gate.c | 82 +++++++++++++++++++++++++++++++++++++++++ drivers/clk/sunxi-ng/ccu_gate.h | 53 ++++++++++++++++++++++++++ 3 files changed, 136 insertions(+) create mode 100644 drivers/clk/sunxi-ng/ccu_gate.c create mode 100644 drivers/clk/sunxi-ng/ccu_gate.h diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile index d76276736765..fc01127b3b45 100644 --- a/drivers/clk/sunxi-ng/Makefile +++ b/drivers/clk/sunxi-ng/Makefile @@ -2,3 +2,4 @@ obj-y += ccu_common.o obj-y += ccu_reset.o obj-y += ccu_fixed_factor.o +obj-y += ccu_gate.o diff --git a/drivers/clk/sunxi-ng/ccu_gate.c b/drivers/clk/sunxi-ng/ccu_gate.c new file mode 100644 index 000000000000..1e98f8a33ac3 --- /dev/null +++ b/drivers/clk/sunxi-ng/ccu_gate.c @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2016 Maxime Ripard + * Maxime Ripard <maxime.ripard@free-electrons.com> + * + * 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. + */ + +#include <linux/clk-provider.h> + +#include "ccu_gate.h" + +void ccu_gate_helper_disable(struct ccu_common *common, u32 gate) +{ + unsigned long flags; + u32 reg; + + if (!(common->features & CCU_FEATURE_GATE)) + return; + + spin_lock_irqsave(common->lock, flags); + + reg = readl(common->base + common->reg); + writel(reg & ~gate, common->base + common->reg); + + spin_unlock_irqrestore(common->lock, flags); +} + +static void ccu_gate_disable(struct clk_hw *hw) +{ + struct ccu_gate *cg = hw_to_ccu_gate(hw); + + return ccu_gate_helper_disable(&cg->common, cg->enable); +} + +int ccu_gate_helper_enable(struct ccu_common *common, u32 gate) +{ + unsigned long flags; + u32 reg; + + if (!(common->features & CCU_FEATURE_GATE)) + return 0; + + spin_lock_irqsave(common->lock, flags); + + reg = readl(common->base + common->reg); + writel(reg | gate, common->base + common->reg); + + spin_unlock_irqrestore(common->lock, flags); + + return 0; +} + +static int ccu_gate_enable(struct clk_hw *hw) +{ + struct ccu_gate *cg = hw_to_ccu_gate(hw); + + return ccu_gate_helper_enable(&cg->common, cg->enable); +} + +int ccu_gate_helper_is_enabled(struct ccu_common *common, u32 gate) +{ + if (!(common->features & CCU_FEATURE_GATE)) + return 1; + + return readl(common->base + common->reg) & gate; +} + +static int ccu_gate_is_enabled(struct clk_hw *hw) +{ + struct ccu_gate *cg = hw_to_ccu_gate(hw); + + return ccu_gate_helper_is_enabled(&cg->common, cg->enable); +} + +const struct clk_ops ccu_gate_ops = { + .disable = ccu_gate_disable, + .enable = ccu_gate_enable, + .is_enabled = ccu_gate_is_enabled, +}; diff --git a/drivers/clk/sunxi-ng/ccu_gate.h b/drivers/clk/sunxi-ng/ccu_gate.h new file mode 100644 index 000000000000..8e15fa17bcc1 --- /dev/null +++ b/drivers/clk/sunxi-ng/ccu_gate.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2016 Maxime Ripard. All rights reserved. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * 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. + */ + +#ifndef _CCU_GATE_H_ +#define _CCU_GATE_H_ + +#include <linux/clk-provider.h> + +#include "ccu_common.h" + +struct ccu_gate { + u32 enable; + + struct ccu_common common; +}; + +#define SUNXI_CCU_GATE(_struct, _name, _parent, _reg, _gate, _flags) \ + struct ccu_gate _struct = { \ + .enable = _gate, \ + .common = { \ + .reg = _reg, \ + .features = CCU_FEATURE_GATE, \ + .hw.init = SUNXI_HW_INIT(_name, \ + _parent, \ + &ccu_gate_ops, \ + _flags), \ + } \ + } + +static inline struct ccu_gate *hw_to_ccu_gate(struct clk_hw *hw) +{ + struct ccu_common *common = hw_to_ccu_common(hw); + + return container_of(common, struct ccu_gate, common); +} + +void ccu_gate_helper_disable(struct ccu_common *common, u32 gate); +int ccu_gate_helper_enable(struct ccu_common *common, u32 gate); +int ccu_gate_helper_is_enabled(struct ccu_common *common, u32 gate); + +extern const struct clk_ops ccu_gate_ops; + +#endif /* _CCU_GATE_H_ */ -- 2.8.2
WARNING: multiple messages have this Message-ID (diff)
From: maxime.ripard@free-electrons.com (Maxime Ripard) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/16] clk: sunxi-ng: Add gate clock support Date: Sun, 8 May 2016 22:01:39 +0200 [thread overview] Message-ID: <1462737711-10017-5-git-send-email-maxime.ripard@free-electrons.com> (raw) In-Reply-To: <1462737711-10017-1-git-send-email-maxime.ripard@free-electrons.com> Some clocks in the Allwinner SoCs clocks unit are just simple gates. Add support for those clocks. Since it's a feature that can also be found in more complex clocks, provide a bunch of helpers that can be reused later on. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/clk/sunxi-ng/Makefile | 1 + drivers/clk/sunxi-ng/ccu_gate.c | 82 +++++++++++++++++++++++++++++++++++++++++ drivers/clk/sunxi-ng/ccu_gate.h | 53 ++++++++++++++++++++++++++ 3 files changed, 136 insertions(+) create mode 100644 drivers/clk/sunxi-ng/ccu_gate.c create mode 100644 drivers/clk/sunxi-ng/ccu_gate.h diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile index d76276736765..fc01127b3b45 100644 --- a/drivers/clk/sunxi-ng/Makefile +++ b/drivers/clk/sunxi-ng/Makefile @@ -2,3 +2,4 @@ obj-y += ccu_common.o obj-y += ccu_reset.o obj-y += ccu_fixed_factor.o +obj-y += ccu_gate.o diff --git a/drivers/clk/sunxi-ng/ccu_gate.c b/drivers/clk/sunxi-ng/ccu_gate.c new file mode 100644 index 000000000000..1e98f8a33ac3 --- /dev/null +++ b/drivers/clk/sunxi-ng/ccu_gate.c @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2016 Maxime Ripard + * Maxime Ripard <maxime.ripard@free-electrons.com> + * + * 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. + */ + +#include <linux/clk-provider.h> + +#include "ccu_gate.h" + +void ccu_gate_helper_disable(struct ccu_common *common, u32 gate) +{ + unsigned long flags; + u32 reg; + + if (!(common->features & CCU_FEATURE_GATE)) + return; + + spin_lock_irqsave(common->lock, flags); + + reg = readl(common->base + common->reg); + writel(reg & ~gate, common->base + common->reg); + + spin_unlock_irqrestore(common->lock, flags); +} + +static void ccu_gate_disable(struct clk_hw *hw) +{ + struct ccu_gate *cg = hw_to_ccu_gate(hw); + + return ccu_gate_helper_disable(&cg->common, cg->enable); +} + +int ccu_gate_helper_enable(struct ccu_common *common, u32 gate) +{ + unsigned long flags; + u32 reg; + + if (!(common->features & CCU_FEATURE_GATE)) + return 0; + + spin_lock_irqsave(common->lock, flags); + + reg = readl(common->base + common->reg); + writel(reg | gate, common->base + common->reg); + + spin_unlock_irqrestore(common->lock, flags); + + return 0; +} + +static int ccu_gate_enable(struct clk_hw *hw) +{ + struct ccu_gate *cg = hw_to_ccu_gate(hw); + + return ccu_gate_helper_enable(&cg->common, cg->enable); +} + +int ccu_gate_helper_is_enabled(struct ccu_common *common, u32 gate) +{ + if (!(common->features & CCU_FEATURE_GATE)) + return 1; + + return readl(common->base + common->reg) & gate; +} + +static int ccu_gate_is_enabled(struct clk_hw *hw) +{ + struct ccu_gate *cg = hw_to_ccu_gate(hw); + + return ccu_gate_helper_is_enabled(&cg->common, cg->enable); +} + +const struct clk_ops ccu_gate_ops = { + .disable = ccu_gate_disable, + .enable = ccu_gate_enable, + .is_enabled = ccu_gate_is_enabled, +}; diff --git a/drivers/clk/sunxi-ng/ccu_gate.h b/drivers/clk/sunxi-ng/ccu_gate.h new file mode 100644 index 000000000000..8e15fa17bcc1 --- /dev/null +++ b/drivers/clk/sunxi-ng/ccu_gate.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2016 Maxime Ripard. All rights reserved. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * 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. + */ + +#ifndef _CCU_GATE_H_ +#define _CCU_GATE_H_ + +#include <linux/clk-provider.h> + +#include "ccu_common.h" + +struct ccu_gate { + u32 enable; + + struct ccu_common common; +}; + +#define SUNXI_CCU_GATE(_struct, _name, _parent, _reg, _gate, _flags) \ + struct ccu_gate _struct = { \ + .enable = _gate, \ + .common = { \ + .reg = _reg, \ + .features = CCU_FEATURE_GATE, \ + .hw.init = SUNXI_HW_INIT(_name, \ + _parent, \ + &ccu_gate_ops, \ + _flags), \ + } \ + } + +static inline struct ccu_gate *hw_to_ccu_gate(struct clk_hw *hw) +{ + struct ccu_common *common = hw_to_ccu_common(hw); + + return container_of(common, struct ccu_gate, common); +} + +void ccu_gate_helper_disable(struct ccu_common *common, u32 gate); +int ccu_gate_helper_enable(struct ccu_common *common, u32 gate); +int ccu_gate_helper_is_enabled(struct ccu_common *common, u32 gate); + +extern const struct clk_ops ccu_gate_ops; + +#endif /* _CCU_GATE_H_ */ -- 2.8.2
next prev parent reply other threads:[~2016-05-08 20:01 UTC|newest] Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-08 20:01 [PATCH 00/16] clk: sunxi: introduce "modern" clock support Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-08 20:01 ` [PATCH 01/16] clk: fix critical clock locking Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-09 22:11 ` Stephen Boyd 2016-05-09 22:11 ` Stephen Boyd 2016-05-13 7:50 ` Maxime Ripard 2016-05-13 7:50 ` Maxime Ripard 2016-05-08 20:01 ` [PATCH 02/16] clk: sunxi-ng: Add common infrastructure Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-09 10:01 ` Chen-Yu Tsai 2016-05-09 10:01 ` Chen-Yu Tsai 2016-05-15 18:31 ` Maxime Ripard 2016-05-15 18:31 ` Maxime Ripard 2016-05-16 7:02 ` Chen-Yu Tsai 2016-05-16 7:02 ` Chen-Yu Tsai 2016-05-16 8:02 ` Jean-Francois Moine 2016-05-16 8:02 ` Jean-Francois Moine 2016-05-16 20:15 ` Maxime Ripard 2016-05-16 20:15 ` Maxime Ripard 2016-05-17 6:54 ` Jean-Francois Moine 2016-05-17 6:54 ` Jean-Francois Moine 2016-05-18 19:59 ` Maxime Ripard 2016-05-18 19:59 ` Maxime Ripard 2016-05-08 20:01 ` [PATCH 03/16] clk: sunxi-ng: Add fixed factor clock support Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-09 10:05 ` Chen-Yu Tsai 2016-05-09 10:05 ` Chen-Yu Tsai 2016-05-16 13:15 ` Jean-Francois Moine 2016-05-16 13:15 ` Jean-Francois Moine 2016-05-16 21:08 ` Maxime Ripard 2016-05-16 21:08 ` Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard [this message] 2016-05-08 20:01 ` [PATCH 04/16] clk: sunxi-ng: Add gate " Maxime Ripard 2016-05-08 20:01 ` [PATCH 05/16] clk: sunxi-ng: Add mux " Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-21 16:18 ` Chen-Yu Tsai 2016-05-21 16:18 ` Chen-Yu Tsai 2016-05-22 19:20 ` Maxime Ripard 2016-05-22 19:20 ` Maxime Ripard 2016-05-08 20:01 ` [PATCH 06/16] clk: sunxi-ng: Add divider table clock Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-21 16:30 ` Chen-Yu Tsai 2016-05-21 16:30 ` Chen-Yu Tsai 2016-05-08 20:01 ` [PATCH 07/16] clk: sunxi-ng: Add phase clock support Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-21 16:43 ` Chen-Yu Tsai 2016-05-21 16:43 ` Chen-Yu Tsai 2016-05-23 17:01 ` Maxime Ripard 2016-05-23 17:01 ` Maxime Ripard 2016-05-24 9:01 ` Chen-Yu Tsai 2016-05-24 9:01 ` Chen-Yu Tsai 2016-05-08 20:01 ` [PATCH 08/16] clk: sunxi-ng: Add M-factor " Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-11 6:46 ` Jean-Francois Moine 2016-05-11 6:46 ` Jean-Francois Moine 2016-05-15 18:51 ` Maxime Ripard 2016-05-15 18:51 ` Maxime Ripard 2016-05-21 17:09 ` Chen-Yu Tsai 2016-05-21 17:09 ` Chen-Yu Tsai 2016-05-22 19:22 ` Maxime Ripard 2016-05-22 19:22 ` Maxime Ripard 2016-05-08 20:01 ` [PATCH 09/16] clk: sunxi-ng: Add P-factor " Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-08 20:01 ` [PATCH 10/16] clk: sunxi-ng: Add M-P factor " Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-23 13:45 ` Chen-Yu Tsai 2016-05-23 13:45 ` Chen-Yu Tsai 2016-05-23 17:18 ` Maxime Ripard 2016-05-23 17:18 ` Maxime Ripard 2016-05-24 4:14 ` Chen-Yu Tsai 2016-05-24 4:14 ` Chen-Yu Tsai 2016-05-24 21:07 ` Maxime Ripard 2016-05-24 21:07 ` Maxime Ripard 2016-05-08 20:01 ` [PATCH 11/16] clk: sunxi-ng: Add N-K-factor " Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-23 13:58 ` Chen-Yu Tsai 2016-05-23 13:58 ` Chen-Yu Tsai 2016-05-08 20:01 ` [PATCH 12/16] clk: sunxi-ng: Add N-M-factor " Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-09 7:24 ` Jean-Francois Moine 2016-05-09 7:24 ` Jean-Francois Moine 2016-05-15 19:04 ` Maxime Ripard 2016-05-15 19:04 ` Maxime Ripard 2016-05-08 20:01 ` [PATCH 13/16] clk: sunxi-ng: Add N-K-M Factor clock Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-11 8:45 ` Jean-Francois Moine 2016-05-11 8:45 ` Jean-Francois Moine 2016-05-15 19:08 ` Maxime Ripard 2016-05-15 19:08 ` Maxime Ripard 2016-05-23 14:10 ` Chen-Yu Tsai 2016-05-23 14:10 ` Chen-Yu Tsai 2016-05-08 20:01 ` [PATCH 14/16] clk: sunxi-ng: Add N-K-M-P factor clock Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-11 8:49 ` Jean-Francois Moine 2016-05-11 8:49 ` Jean-Francois Moine 2016-05-23 14:36 ` Chen-Yu Tsai 2016-05-23 14:36 ` Chen-Yu Tsai 2016-05-30 7:57 ` Maxime Ripard 2016-05-30 7:57 ` Maxime Ripard 2016-05-08 20:01 ` [PATCH 15/16] clk: sunxi-ng: Add H3 clocks Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard 2016-05-09 7:39 ` Jean-Francois Moine 2016-05-09 7:39 ` Jean-Francois Moine 2016-05-15 19:18 ` Maxime Ripard 2016-05-15 19:18 ` Maxime Ripard 2016-05-13 9:45 ` Jean-Francois Moine 2016-05-13 9:45 ` Jean-Francois Moine 2016-05-18 14:02 ` Maxime Ripard 2016-05-18 14:02 ` Maxime Ripard 2016-05-18 16:23 ` Jean-Francois Moine 2016-05-18 16:23 ` Jean-Francois Moine 2016-05-18 16:27 ` Jean-Francois Moine 2016-05-18 16:27 ` Jean-Francois Moine 2016-05-16 13:47 ` Jean-Francois Moine 2016-05-16 13:47 ` Jean-Francois Moine 2016-05-18 21:20 ` Maxime Ripard 2016-05-18 21:20 ` Maxime Ripard 2016-05-30 16:15 ` Chen-Yu Tsai 2016-05-30 16:15 ` Chen-Yu Tsai 2016-06-01 19:19 ` Maxime Ripard 2016-06-01 19:19 ` Maxime Ripard 2016-06-03 6:42 ` Chen-Yu Tsai 2016-06-03 6:42 ` Chen-Yu Tsai 2016-06-03 6:55 ` Chen-Yu Tsai 2016-06-03 6:55 ` Chen-Yu Tsai 2016-05-08 20:01 ` [PATCH 16/16] ARM: dt: sun8i: switch the H3 to the new CCU driver Maxime Ripard 2016-05-08 20:01 ` Maxime Ripard
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=1462737711-10017-5-git-send-email-maxime.ripard@free-electrons.com \ --to=maxime.ripard@free-electrons.com \ --cc=andre.przywara@arm.com \ --cc=boris.brezillon@free-electrons.com \ --cc=hdegoede@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=mturquette@baylibre.com \ --cc=robh+dt@kernel.org \ --cc=sboyd@codeaurora.org \ --cc=vishnupatekar0510@gmail.com \ --cc=wens@csie.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: 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.