diff mbox series

[v3,4/6] clk: sunxi-ng: mux: Allow muxes to have keys

Message ID 20220203021736.13434-5-samuel@sholland.org (mailing list archive)
State New, archived
Headers show
Series clk: sunxi-ng: Add a RTC CCU driver | expand

Commit Message

Samuel Holland Feb. 3, 2022, 2:17 a.m. UTC
The muxes in the RTC can only be updated when setting a key field to a
specific value. Add a feature flag to denote muxes with this property.

Since so far the key value is always the same, it does not need to be
provided separately for each mux.

Signed-off-by: Samuel Holland <samuel@sholland.org>
---

Changes in v3:
 - Drop the SUNXI_CCU_MUX_HW_WITH_KEY macro, since it is no longer used.

 drivers/clk/sunxi-ng/ccu_common.h | 1 +
 drivers/clk/sunxi-ng/ccu_mux.c    | 7 +++++++
 2 files changed, 8 insertions(+)

Comments

Maxime Ripard Feb. 7, 2022, 9 a.m. UTC | #1
On Wed, 2 Feb 2022 20:17:34 -0600, Samuel Holland wrote:
> The muxes in the RTC can only be updated when setting a key field to a
> specific value. Add a feature flag to denote muxes with this property.
> 
> Since so far the key value is always the same, it does not need to be
> provided separately for each mux.
> 
> 
> [...]

Applied to local tree (sunxi/clk-for-5.18).

Thanks!
Maxime
diff mbox series

Patch

diff --git a/drivers/clk/sunxi-ng/ccu_common.h b/drivers/clk/sunxi-ng/ccu_common.h
index 98a1834b58bb..fbf16c6b896d 100644
--- a/drivers/clk/sunxi-ng/ccu_common.h
+++ b/drivers/clk/sunxi-ng/ccu_common.h
@@ -17,6 +17,7 @@ 
 #define CCU_FEATURE_LOCK_REG		BIT(5)
 #define CCU_FEATURE_MMC_TIMING_SWITCH	BIT(6)
 #define CCU_FEATURE_SIGMA_DELTA_MOD	BIT(7)
+#define CCU_FEATURE_KEY_FIELD		BIT(8)
 
 /* MMC timing mode switch bit */
 #define CCU_MMC_NEW_TIMING_MODE		BIT(30)
diff --git a/drivers/clk/sunxi-ng/ccu_mux.c b/drivers/clk/sunxi-ng/ccu_mux.c
index 2306a1cd83e4..1d557e323169 100644
--- a/drivers/clk/sunxi-ng/ccu_mux.c
+++ b/drivers/clk/sunxi-ng/ccu_mux.c
@@ -12,6 +12,8 @@ 
 #include "ccu_gate.h"
 #include "ccu_mux.h"
 
+#define CCU_MUX_KEY_VALUE		0x16aa0000
+
 static u16 ccu_mux_get_prediv(struct ccu_common *common,
 			      struct ccu_mux_internal *cm,
 			      int parent_index)
@@ -191,6 +193,11 @@  int ccu_mux_helper_set_parent(struct ccu_common *common,
 	spin_lock_irqsave(common->lock, flags);
 
 	reg = readl(common->base + common->reg);
+
+	/* The key field always reads as zero. */
+	if (common->features & CCU_FEATURE_KEY_FIELD)
+		reg |= CCU_MUX_KEY_VALUE;
+
 	reg &= ~GENMASK(cm->width + cm->shift - 1, cm->shift);
 	writel(reg | (index << cm->shift), common->base + common->reg);