clk: sunxi: add and use dummy gate clocks

Some devices enumerate various clocks in their DT, and many drivers
just blanketly try to enable all of them. This creates problems
since we only model a few gate clocks, and the clock driver outputs
a warning when a clock is not described:
=========
sunxi_set_gate: (CLK#3) unhandled
=========

Some clocks don't have an enable bit, or are already enabled in a
different way, so we might want to just ignore them.

Add a CCU_CLK_F_DUMMY_GATE flag that indicates that case, and define
a GATE_DUMMY macro that can be used in the clock description array.
Define a few clocks, used by some pinctrl devices, that way to suppress
the runtime warnings.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Samuel Holland <samuel@sholland.org>

diff --git a/drivers/clk/sunxi/clk_h6.c b/drivers/clk/sunxi/clk_h6.c
index f4e26cb..b320234 100644 (file)
--- a/drivers/clk/sunxi/clk_h6.c
+++ b/drivers/clk/sunxi/clk_h6.c
@@ -16,6 +16,8 @@
 static struct ccu_clk_gate h6_gates[] = {
        [CLK_PLL_PERIPH0]       = GATE(0x020, BIT(31)),
 
+       [CLK_APB1]              = GATE_DUMMY,
+
        [CLK_BUS_MMC0]          = GATE(0x84c, BIT(0)),
        [CLK_BUS_MMC1]          = GATE(0x84c, BIT(1)),
        [CLK_BUS_MMC2]          = GATE(0x84c, BIT(2)),

diff --git a/drivers/clk/sunxi/clk_h616.c b/drivers/clk/sunxi/clk_h616.c
index 65ab446..8009972 100644 (file)
--- a/drivers/clk/sunxi/clk_h616.c
+++ b/drivers/clk/sunxi/clk_h616.c
@@ -15,6 +15,8 @@
 static struct ccu_clk_gate h616_gates[] = {
        [CLK_PLL_PERIPH0]       = GATE(0x020, BIT(31) | BIT(27)),
 
+       [CLK_APB1]              = GATE_DUMMY,
+
        [CLK_BUS_MMC0]          = GATE(0x84c, BIT(0)),
        [CLK_BUS_MMC1]          = GATE(0x84c, BIT(1)),
        [CLK_BUS_MMC2]          = GATE(0x84c, BIT(2)),

diff --git a/drivers/clk/sunxi/clk_h6_r.c b/drivers/clk/sunxi/clk_h6_r.c
index 2e0bbaa..c592886 100644 (file)
--- a/drivers/clk/sunxi/clk_h6_r.c
+++ b/drivers/clk/sunxi/clk_h6_r.c
@@ -11,6 +11,8 @@
 #include <linux/bitops.h>
 
 static struct ccu_clk_gate h6_r_gates[] = {
+       [CLK_R_APB1]            = GATE_DUMMY,
+
        [CLK_R_APB1_TIMER]      = GATE(0x11c, BIT(0)),
        [CLK_R_APB1_TWD]        = GATE(0x12c, BIT(0)),
        [CLK_R_APB1_PWM]        = GATE(0x13c, BIT(0)),

diff --git a/drivers/clk/sunxi/clk_sunxi.c b/drivers/clk/sunxi/clk_sunxi.c
index 9673b58..9a21367 100644 (file)
--- a/drivers/clk/sunxi/clk_sunxi.c
+++ b/drivers/clk/sunxi/clk_sunxi.c
@@ -27,6 +27,9 @@ static int sunxi_set_gate(struct clk *clk, bool on)
        const struct ccu_clk_gate *gate = priv_to_gate(priv, clk->id);
        u32 reg;
 
+       if ((gate->flags & CCU_CLK_F_DUMMY_GATE))
+               return 0;
+
        if (!(gate->flags & CCU_CLK_F_IS_VALID)) {
                printf("%s: (CLK#%ld) unhandled\n", __func__, clk->id);
                return 0;

diff --git a/include/clk/sunxi.h b/include/clk/sunxi.h
index a2239b9..c4a9dee 100644 (file)
--- a/include/clk/sunxi.h
+++ b/include/clk/sunxi.h
@@ -18,6 +18,7 @@
 enum ccu_flags {
        CCU_CLK_F_IS_VALID              = BIT(0),
        CCU_RST_F_IS_VALID              = BIT(1),
+       CCU_CLK_F_DUMMY_GATE            = BIT(2),
 };
 
 /**
@@ -38,6 +39,10 @@ struct ccu_clk_gate {
        .flags = CCU_CLK_F_IS_VALID,            \
 }
 
+#define GATE_DUMMY {                           \
+       .flags = CCU_CLK_F_DUMMY_GATE,          \
+}
+
 /**
  * struct ccu_reset - ccu reset
  * @off:       reset offset