From: jbrunet@baylibre.com (Jerome Brunet)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH v2 07/19] clk: meson: remove superseded aoclk_gate_regmap
Date: Mon, 12 Feb 2018 15:58:34 +0100 [thread overview]
Message-ID: <20180212145846.19380-8-jbrunet@baylibre.com> (raw)
In-Reply-To: <20180212145846.19380-1-jbrunet@baylibre.com>
aoclk_gate_regmap has been replaced by meson's clk_regmap.
It is no longer necessary so, remove it
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/clk/meson/gxbb-aoclk-regmap.c | 46 -----------------------------------
drivers/clk/meson/gxbb-aoclk.h | 10 --------
2 files changed, 56 deletions(-)
delete mode 100644 drivers/clk/meson/gxbb-aoclk-regmap.c
diff --git a/drivers/clk/meson/gxbb-aoclk-regmap.c b/drivers/clk/meson/gxbb-aoclk-regmap.c
deleted file mode 100644
index 2515fbfa0467..000000000000
--- a/drivers/clk/meson/gxbb-aoclk-regmap.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 BayLibre, SAS.
- * Author: Neil Armstrong <narmstrong@baylibre.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <linux/clk-provider.h>
-#include <linux/bitfield.h>
-#include <linux/regmap.h>
-#include "gxbb-aoclk.h"
-
-static int aoclk_gate_regmap_enable(struct clk_hw *hw)
-{
- struct aoclk_gate_regmap *gate = to_aoclk_gate_regmap(hw);
-
- return regmap_update_bits(gate->regmap, AO_RTI_GEN_CNTL_REG0,
- BIT(gate->bit_idx), BIT(gate->bit_idx));
-}
-
-static void aoclk_gate_regmap_disable(struct clk_hw *hw)
-{
- struct aoclk_gate_regmap *gate = to_aoclk_gate_regmap(hw);
-
- regmap_update_bits(gate->regmap, AO_RTI_GEN_CNTL_REG0,
- BIT(gate->bit_idx), 0);
-}
-
-static int aoclk_gate_regmap_is_enabled(struct clk_hw *hw)
-{
- struct aoclk_gate_regmap *gate = to_aoclk_gate_regmap(hw);
- unsigned int val;
- int ret;
-
- ret = regmap_read(gate->regmap, AO_RTI_GEN_CNTL_REG0, &val);
- if (ret)
- return ret;
-
- return (val & BIT(gate->bit_idx)) != 0;
-}
-
-const struct clk_ops meson_aoclk_gate_regmap_ops = {
- .enable = aoclk_gate_regmap_enable,
- .disable = aoclk_gate_regmap_disable,
- .is_enabled = aoclk_gate_regmap_is_enabled,
-};
diff --git a/drivers/clk/meson/gxbb-aoclk.h b/drivers/clk/meson/gxbb-aoclk.h
index 127d58954cca..0be78383f257 100644
--- a/drivers/clk/meson/gxbb-aoclk.h
+++ b/drivers/clk/meson/gxbb-aoclk.h
@@ -17,16 +17,6 @@
#define AO_RTC_ALT_CLK_CNTL0 0x94
#define AO_RTC_ALT_CLK_CNTL1 0x98
-struct aoclk_gate_regmap {
- struct clk_hw hw;
- unsigned bit_idx;
- struct regmap *regmap;
- spinlock_t *lock;
-};
-
-#define to_aoclk_gate_regmap(_hw) \
- container_of(_hw, struct aoclk_gate_regmap, hw)
-
extern const struct clk_ops meson_aoclk_gate_regmap_ops;
struct aoclk_cec_32k {
--
2.14.3
next prev parent reply other threads:[~2018-02-12 14:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-12 14:58 [PATCH v2 00/19] clk: meson: use regmap in clock controllers Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 01/19] clk: meson: use dev pointer where possible Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 02/19] clk: meson: use devm_of_clk_add_hw_provider Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 03/19] clk: meson: only one loop index is necessary in probe Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 04/19] clk: meson: remove obsolete comments Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 05/19] clk: meson: add regmap clocks Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 06/19] clk: meson: switch gxbb ao_clk to clk_regmap Jerome Brunet
2018-02-12 14:58 ` Jerome Brunet [this message]
2018-02-12 14:58 ` [PATCH v2 08/19] clk: meson: add regmap to the clock controllers Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 09/19] clk: meson: migrate gates to clk_regmap Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 10/19] clk: meson: migrate dividers " Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 11/19] clk: meson: migrate muxes " Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 12/19] clk: meson: add regmap helpers for parm Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 13/19] clk: meson: migrate mplls clocks to clk_regmap Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 14/19] clk: meson: migrate the audio divider clock " Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 15/19] clk: meson: migrate plls clocks " Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 16/19] clk: meson: split divider and gate part of mpll Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 17/19] clk: meson: rework meson8b cpu clock Jerome Brunet
2018-02-18 20:59 ` Martin Blumenstingl
2018-02-12 14:58 ` [PATCH v2 18/19] clk: meson: remove obsolete cpu_clk Jerome Brunet
2018-02-12 14:58 ` [PATCH v2 19/19] clk: meson: use hhi syscon if available Jerome Brunet
2018-03-12 10:22 ` [PATCH v2 00/19] clk: meson: use regmap in clock controllers Neil Armstrong
2018-03-12 18:25 ` Michael Turquette
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=20180212145846.19380-8-jbrunet@baylibre.com \
--to=jbrunet@baylibre.com \
--cc=linus-amlogic@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
all inboxes | Powered by JetHome®