sunxi: clk: fix unhandled clocks warnings
cover sunxi: clk: fix unhandled clocks warnings
The introduction of the DM pinctrl driver saw many clocks, referenced in the respective pinctrl DT nodes, being enabled by the DM clock driver.
We didn't model all them correctly, so there are now some warnings on the console when booting:
=========sunxi_set_gate: (CLK#58) unhandled
=========
This series fixes them. The first patch just describes some missing gate clocks, mostly for the pin controller directly.
The second patch introduces a GATE_DUMMY macro, that allows to just ignore some other clocks, and to suppress the warnings.
Please have a look and test!
Cheers,
Andre
Andre Przywara (2):
clk: sunxi: add PIO bus gate clocks
clk: sunxi: add and use dummy gate clocks
drivers/clk/sunxi/clk_a10.c | 2 ++ drivers/clk/sunxi/clk_a10s.c | 2 ++ drivers/clk/sunxi/clk_a23.c | 2 ++ drivers/clk/sunxi/clk_a31.c | 2 ++ drivers/clk/sunxi/clk_a64.c | 4 ++++ drivers/clk/sunxi/clk_a80.c | 2 ++ drivers/clk/sunxi/clk_a83t.c | 2 ++ drivers/clk/sunxi/clk_h3.c | 4 ++++ drivers/clk/sunxi/clk_h6.c | 4 ++++ drivers/clk/sunxi/clk_h616.c | 4 ++++ drivers/clk/sunxi/clk_h6_r.c | 2 ++ drivers/clk/sunxi/clk_r40.c | 2 ++ drivers/clk/sunxi/clk_sunxi.c | 3 +++ drivers/clk/sunxi/clk_v3s.c | 2 ++ include/clk/sunxi.h | 5 +++++ 15 files changed, 42 insertions(+)
Signature · 1 line
2.35.3
PATCH 1/2 clk: sunxi: add PIO bus gate clocks
The introduction of the DM pinctrl driver made its probe function enable all clocks enumerated in the DT. This includes the "CLK_BUS_PIO" (and variations) gate clock, but also CLK_PLL_PERIPH0. So far we didn't describe those clocks in our clock driver.
As we enable them already in the SPL, the devices happen to work, but the clock driver still complains about not finding those clocks:
=========sunxi_set_gate: (CLK#58) unhandled
=========
Add the one-liners that are needed to announce the gate bit for those clocks, to silence that message on the console.
--- drivers/clk/sunxi/clk_a10.c | 2 ++ drivers/clk/sunxi/clk_a10s.c | 2 ++ drivers/clk/sunxi/clk_a23.c | 2 ++ drivers/clk/sunxi/clk_a31.c | 2 ++ drivers/clk/sunxi/clk_a64.c | 4 ++++ drivers/clk/sunxi/clk_a80.c | 2 ++ drivers/clk/sunxi/clk_a83t.c | 2 ++ drivers/clk/sunxi/clk_h3.c | 4 ++++ drivers/clk/sunxi/clk_h6.c | 2 ++ drivers/clk/sunxi/clk_h616.c | 2 ++ drivers/clk/sunxi/clk_r40.c | 2 ++ drivers/clk/sunxi/clk_v3s.c | 2 ++ 12 files changed, 28 insertions(+)
drivers/clk/sunxi/clk_a10.c +2 -0
@@ -31,6 +31,8 @@ static struct ccu_clk_gate a10_gates[] = { [CLK_AHB_GMAC] = GATE(0x064, BIT(17)), + [CLK_APB0_PIO] = GATE(0x068, BIT(5)), + [CLK_APB1_I2C0] = GATE(0x06c, BIT(0)), [CLK_APB1_I2C1] = GATE(0x06c, BIT(1)), [CLK_APB1_I2C2] = GATE(0x06c, BIT(2)),
drivers/clk/sunxi/clk_a10s.c +2 -0
@@ -25,6 +25,8 @@ static struct ccu_clk_gate a10s_gates[] = { [CLK_AHB_SPI1] = GATE(0x060, BIT(21)), [CLK_AHB_SPI2] = GATE(0x060, BIT(22)), + [CLK_APB0_PIO] = GATE(0x068, BIT(5)), + [CLK_APB1_I2C0] = GATE(0x06c, BIT(0)), [CLK_APB1_I2C1] = GATE(0x06c, BIT(1)), [CLK_APB1_I2C2] = GATE(0x06c, BIT(2)),
drivers/clk/sunxi/clk_a23.c +2 -0
@@ -23,6 +23,8 @@ static struct ccu_clk_gate a23_gates[] = { [CLK_BUS_EHCI] = GATE(0x060, BIT(26)), [CLK_BUS_OHCI] = GATE(0x060, BIT(29)), + [CLK_BUS_PIO] = GATE(0x068, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x06c, BIT(0)), [CLK_BUS_I2C1] = GATE(0x06c, BIT(1)), [CLK_BUS_I2C2] = GATE(0x06c, BIT(2)),
drivers/clk/sunxi/clk_a31.c +2 -0
@@ -30,6 +30,8 @@ static struct ccu_clk_gate a31_gates[] = { [CLK_AHB1_OHCI1] = GATE(0x060, BIT(30)), [CLK_AHB1_OHCI2] = GATE(0x060, BIT(31)), + [CLK_APB1_PIO] = GATE(0x068, BIT(5)), + [CLK_APB2_I2C0] = GATE(0x06c, BIT(0)), [CLK_APB2_I2C1] = GATE(0x06c, BIT(1)), [CLK_APB2_I2C2] = GATE(0x06c, BIT(2)),
drivers/clk/sunxi/clk_a64.c +4 -0
@@ -14,6 +14,8 @@#include <linux/bitops.h> static const struct ccu_clk_gate a64_gates[] = { + [CLK_PLL_PERIPH0 ] =GATE (0x028 ,BIT (31 )), + [CLK_BUS_MMC0 ] =GATE (0x060 ,BIT (8 )), [CLK_BUS_MMC1 ] =GATE (0x060 ,BIT (9 )), [CLK_BUS_MMC2 ] =GATE (0x060 ,BIT (10 )),
@@ -26,6 +28,8 @@ static const struct ccu_clk_gate a64_gates[] = { [CLK_BUS_OHCI0] = GATE(0x060, BIT(28)), [CLK_BUS_OHCI1] = GATE(0x060, BIT(29)), + [CLK_BUS_PIO] = GATE(0x068, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x06c, BIT(0)), [CLK_BUS_I2C1] = GATE(0x06c, BIT(1)), [CLK_BUS_I2C2] = GATE(0x06c, BIT(2)),
drivers/clk/sunxi/clk_a80.c +2 -0
@@ -25,6 +25,8 @@ static const struct ccu_clk_gate a80_gates[] = { [CLK_BUS_SPI2] = GATE(0x580, BIT(22)), [CLK_BUS_SPI3] = GATE(0x580, BIT(23)), + [CLK_BUS_PIO] = GATE(0x590, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x594, BIT(0)), [CLK_BUS_I2C1] = GATE(0x594, BIT(1)), [CLK_BUS_I2C2] = GATE(0x594, BIT(2)),
drivers/clk/sunxi/clk_a83t.c +2 -0
@@ -25,6 +25,8 @@ static struct ccu_clk_gate a83t_gates[] = { [CLK_BUS_EHCI1] = GATE(0x060, BIT(27)), [CLK_BUS_OHCI0] = GATE(0x060, BIT(29)), + [CLK_BUS_PIO] = GATE(0x068, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x06c, BIT(0)), [CLK_BUS_I2C1] = GATE(0x06c, BIT(1)), [CLK_BUS_I2C2] = GATE(0x06c, BIT(2)),
drivers/clk/sunxi/clk_h3.c +4 -0
@@ -14,6 +14,8 @@#include <linux/bitops.h> static struct ccu_clk_gate h3_gates[] = { + [CLK_PLL_PERIPH0 ] =GATE (0x028 ,BIT (31 )), + [CLK_BUS_MMC0 ] =GATE (0x060 ,BIT (8 )), [CLK_BUS_MMC1 ] =GATE (0x060 ,BIT (9 )), [CLK_BUS_MMC2 ] =GATE (0x060 ,BIT (10 )),
@@ -30,6 +32,8 @@ static struct ccu_clk_gate h3_gates[] = { [CLK_BUS_OHCI2] = GATE(0x060, BIT(30)), [CLK_BUS_OHCI3] = GATE(0x060, BIT(31)), + [CLK_BUS_PIO] = GATE(0x068, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x06c, BIT(0)), [CLK_BUS_I2C1] = GATE(0x06c, BIT(1)), [CLK_BUS_I2C2] = GATE(0x06c, BIT(2)),
drivers/clk/sunxi/clk_h6.c +2 -0
@@ -14,6 +14,8 @@#include <linux/bitops.h> static struct ccu_clk_gate h6_gates[] = { + [CLK_PLL_PERIPH0 ] =GATE (0x020 ,BIT (31 )), + [CLK_BUS_MMC0 ] =GATE (0x84c ,BIT (0 )), [CLK_BUS_MMC1 ] =GATE (0x84c ,BIT (1 )), [CLK_BUS_MMC2 ] =GATE (0x84c ,BIT (2 )),
drivers/clk/sunxi/clk_h616.c +2 -0
@@ -13,6 +13,8 @@#include <linux/bitops.h> static struct ccu_clk_gate h616_gates[] = { + [CLK_PLL_PERIPH0 ] =GATE (0x020 ,BIT (31 ) |BIT (27 )), + [CLK_BUS_MMC0 ] =GATE (0x84c ,BIT (0 )), [CLK_BUS_MMC1 ] =GATE (0x84c ,BIT (1 )), [CLK_BUS_MMC2 ] =GATE (0x84c ,BIT (2 )),
drivers/clk/sunxi/clk_r40.c +2 -0
@@ -32,6 +32,8 @@ static struct ccu_clk_gate r40_gates[] = { [CLK_BUS_GMAC] = GATE(0x064, BIT(17)), + [CLK_BUS_PIO] = GATE(0x068, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x06c, BIT(0)), [CLK_BUS_I2C1] = GATE(0x06c, BIT(1)), [CLK_BUS_I2C2] = GATE(0x06c, BIT(2)),
drivers/clk/sunxi/clk_v3s.c +2 -0
@@ -20,6 +20,8 @@ static struct ccu_clk_gate v3s_gates[] = { [CLK_BUS_SPI0] = GATE(0x060, BIT(20)), [CLK_BUS_OTG] = GATE(0x060, BIT(24)), + [CLK_BUS_PIO] = GATE(0x068, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x06c, BIT(0)), [CLK_BUS_I2C1] = GATE(0x06c, BIT(1)), [CLK_BUS_UART0] = GATE(0x06c, BIT(16)),
Signature · 1 line
2.35.3
Re: [PATCH 1/2] clk: sunxi: add PIO bus gate clocks
Quoted 3 lines · Andre Przywara
The introduction of the DM pinctrl driver made its probe function enable all clocks enumerated in the DT. This includes the "
CLK_BUS_PIO" (and variations) gate clock, but alsoCLK_PLL_PERIPH0. So far we didn't
I believe the use of CLK_PLL_PERIPH0 is from the R_CCU driver, so it is not directly related to the introduction of DM pinctrl.
Quoted 11 lines
describe those clocks in our clock driver.
As we enable them already in the SPL, the devices happen to work, but the clock driver still complains about not finding those clocks:
=========sunxi_set_gate: (CLK#58) unhandled
=========Add the one-liners that are needed to announce the gate bit for those clocks, to silence that message on the console.
Signed-off-by Andre Przywara <[email protected]>
Andre Przywara
AppliedRe: [PATCH 1/2] clk: sunxi: add PIO bus gate clocks
In reply to Andre PrzywaraQuoted 10 lines · On Fri, 6 May 2022 01:33:00 +0100 Andre Przywara <[email protected]>…
The introduction of the DM pinctrl driver made its probe function enable all clocks enumerated in the DT. This includes the "
CLK_BUS_PIO" (and variations) gate clock, but alsoCLK_PLL_PERIPH0. So far we didn't describe those clocks in our clock driver.
As we enable them already in the SPL, the devices happen to work, but the clock driver still complains about not finding those clocks:
=========sunxi_set_gate: (CLK#58) unhandled
=========
Quoted 4 lines
Add the one-liners that are needed to announce the gate bit for those clocks, to silence that message on the console.
Signed-off-by Andre Przywara <[email protected]>
Applied to sunxi/master.
Thanks,
Andre
Quoted 189 lines
--- drivers/clk/sunxi/clk_a10.c | 2 ++ drivers/clk/sunxi/clk_a10s.c | 2 ++ drivers/clk/sunxi/clk_a23.c | 2 ++ drivers/clk/sunxi/clk_a31.c | 2 ++ drivers/clk/sunxi/clk_a64.c | 4 ++++ drivers/clk/sunxi/clk_a80.c | 2 ++ drivers/clk/sunxi/clk_a83t.c | 2 ++ drivers/clk/sunxi/clk_h3.c | 4 ++++ drivers/clk/sunxi/clk_h6.c | 2 ++ drivers/clk/sunxi/clk_h616.c | 2 ++ drivers/clk/sunxi/clk_r40.c | 2 ++ drivers/clk/sunxi/clk_v3s.c | 2 ++ 12 files changed, 28 insertions(+)drivers/clk/sunxi/clk_a10.c +2
-0@@ -31,6 +31,8 @@ static struct ccu_clk_gate a10_gates[] = { [CLK_AHB_GMAC] = GATE(0x064, BIT(17)), + [CLK_APB0_PIO] = GATE(0x068, BIT(5)), + [CLK_APB1_I2C0] = GATE(0x06c, BIT(0)), [CLK_APB1_I2C1] = GATE(0x06c, BIT(1)), [CLK_APB1_I2C2] = GATE(0x06c, BIT(2)),drivers/clk/sunxi/clk_a10s.c +2
-0@@ -25,6 +25,8 @@ static struct ccu_clk_gate a10s_gates[] = { [CLK_AHB_SPI1] = GATE(0x060, BIT(21)), [CLK_AHB_SPI2] = GATE(0x060, BIT(22)), + [CLK_APB0_PIO] = GATE(0x068, BIT(5)), + [CLK_APB1_I2C0] = GATE(0x06c, BIT(0)), [CLK_APB1_I2C1] = GATE(0x06c, BIT(1)), [CLK_APB1_I2C2] = GATE(0x06c, BIT(2)),drivers/clk/sunxi/clk_a23.c +2
-0@@ -23,6 +23,8 @@ static struct ccu_clk_gate a23_gates[] = { [CLK_BUS_EHCI] = GATE(0x060, BIT(26)), [CLK_BUS_OHCI] = GATE(0x060, BIT(29)), + [CLK_BUS_PIO] = GATE(0x068, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x06c, BIT(0)), [CLK_BUS_I2C1] = GATE(0x06c, BIT(1)), [CLK_BUS_I2C2] = GATE(0x06c, BIT(2)),drivers/clk/sunxi/clk_a31.c +2
-0@@ -30,6 +30,8 @@ static struct ccu_clk_gate a31_gates[] = { [CLK_AHB1_OHCI1] = GATE(0x060, BIT(30)), [CLK_AHB1_OHCI2] = GATE(0x060, BIT(31)), + [CLK_APB1_PIO] = GATE(0x068, BIT(5)), + [CLK_APB2_I2C0] = GATE(0x06c, BIT(0)), [CLK_APB2_I2C1] = GATE(0x06c, BIT(1)), [CLK_APB2_I2C2] = GATE(0x06c, BIT(2)),drivers/clk/sunxi/clk_a64.c +4
-0@@ -14,6 +14,8 @@#include <linux/bitops.h> static const struct ccu_clk_gate a64_gates[] = { + [CLK_PLL_PERIPH0 ] =GATE (0x028 ,BIT (31 )), + [CLK_BUS_MMC0 ] =GATE (0x060 ,BIT (8 )), [CLK_BUS_MMC1 ] =GATE (0x060 ,BIT (9 )), [CLK_BUS_MMC2 ] =GATE (0x060 ,BIT (10 )),@@ -26,6 +28,8 @@ static const struct ccu_clk_gate a64_gates[] = { [CLK_BUS_OHCI0] = GATE(0x060, BIT(28)), [CLK_BUS_OHCI1] = GATE(0x060, BIT(29)), + [CLK_BUS_PIO] = GATE(0x068, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x06c, BIT(0)), [CLK_BUS_I2C1] = GATE(0x06c, BIT(1)), [CLK_BUS_I2C2] = GATE(0x06c, BIT(2)),drivers/clk/sunxi/clk_a80.c +2
-0@@ -25,6 +25,8 @@ static const struct ccu_clk_gate a80_gates[] = { [CLK_BUS_SPI2] = GATE(0x580, BIT(22)), [CLK_BUS_SPI3] = GATE(0x580, BIT(23)), + [CLK_BUS_PIO] = GATE(0x590, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x594, BIT(0)), [CLK_BUS_I2C1] = GATE(0x594, BIT(1)), [CLK_BUS_I2C2] = GATE(0x594, BIT(2)),drivers/clk/sunxi/clk_a83t.c +2
-0@@ -25,6 +25,8 @@ static struct ccu_clk_gate a83t_gates[] = { [CLK_BUS_EHCI1] = GATE(0x060, BIT(27)), [CLK_BUS_OHCI0] = GATE(0x060, BIT(29)), + [CLK_BUS_PIO] = GATE(0x068, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x06c, BIT(0)), [CLK_BUS_I2C1] = GATE(0x06c, BIT(1)), [CLK_BUS_I2C2] = GATE(0x06c, BIT(2)),drivers/clk/sunxi/clk_h3.c +4
-0@@ -14,6 +14,8 @@#include <linux/bitops.h> static struct ccu_clk_gate h3_gates[] = { + [CLK_PLL_PERIPH0 ] =GATE (0x028 ,BIT (31 )), + [CLK_BUS_MMC0 ] =GATE (0x060 ,BIT (8 )), [CLK_BUS_MMC1 ] =GATE (0x060 ,BIT (9 )), [CLK_BUS_MMC2 ] =GATE (0x060 ,BIT (10 )),@@ -30,6 +32,8 @@ static struct ccu_clk_gate h3_gates[] = { [CLK_BUS_OHCI2] = GATE(0x060, BIT(30)), [CLK_BUS_OHCI3] = GATE(0x060, BIT(31)), + [CLK_BUS_PIO] = GATE(0x068, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x06c, BIT(0)), [CLK_BUS_I2C1] = GATE(0x06c, BIT(1)), [CLK_BUS_I2C2] = GATE(0x06c, BIT(2)),drivers/clk/sunxi/clk_h6.c +2
-0@@ -14,6 +14,8 @@#include <linux/bitops.h> static struct ccu_clk_gate h6_gates[] = { + [CLK_PLL_PERIPH0 ] =GATE (0x020 ,BIT (31 )), + [CLK_BUS_MMC0 ] =GATE (0x84c ,BIT (0 )), [CLK_BUS_MMC1 ] =GATE (0x84c ,BIT (1 )), [CLK_BUS_MMC2 ] =GATE (0x84c ,BIT (2 )),drivers/clk/sunxi/clk_h616.c +2
-0@@ -13,6 +13,8 @@#include <linux/bitops.h> static struct ccu_clk_gate h616_gates[] = { + [CLK_PLL_PERIPH0 ] =GATE (0x020 ,BIT (31 ) |BIT (27 )), + [CLK_BUS_MMC0 ] =GATE (0x84c ,BIT (0 )), [CLK_BUS_MMC1 ] =GATE (0x84c ,BIT (1 )), [CLK_BUS_MMC2 ] =GATE (0x84c ,BIT (2 )),drivers/clk/sunxi/clk_r40.c +2
-0@@ -32,6 +32,8 @@ static struct ccu_clk_gate r40_gates[] = { [CLK_BUS_GMAC] = GATE(0x064, BIT(17)), + [CLK_BUS_PIO] = GATE(0x068, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x06c, BIT(0)), [CLK_BUS_I2C1] = GATE(0x06c, BIT(1)), [CLK_BUS_I2C2] = GATE(0x06c, BIT(2)),drivers/clk/sunxi/clk_v3s.c +2
-0@@ -20,6 +20,8 @@ static struct ccu_clk_gate v3s_gates[] = { [CLK_BUS_SPI0] = GATE(0x060, BIT(20)), [CLK_BUS_OTG] = GATE(0x060, BIT(24)), + [CLK_BUS_PIO] = GATE(0x068, BIT(5)), + [CLK_BUS_I2C0] = GATE(0x06c, BIT(0)), [CLK_BUS_I2C1] = GATE(0x06c, BIT(1)), [CLK_BUS_UART0] = GATE(0x06c, BIT(16)),
PATCH 2/2 clk: sunxi: add and use dummy gate clocks
In reply to Andre PrzywaraSome 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.
--- drivers/clk/sunxi/clk_h6.c | 2 ++ drivers/clk/sunxi/clk_h616.c | 2 ++ drivers/clk/sunxi/clk_h6_r.c | 2 ++ drivers/clk/sunxi/clk_sunxi.c | 3 +++ include/clk/sunxi.h | 5 +++++ 5 files changed, 14 insertions(+)
drivers/clk/sunxi/clk_h6.c +2 -0
@@ -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 )),
drivers/clk/sunxi/clk_h616.c +2 -0
@@ -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 )),
drivers/clk/sunxi/clk_h6_r.c +2 -0
@@ -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 )),
drivers/clk/sunxi/clk_sunxi.c +3 -0
@@ -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 ;
include/clk/sunxi.h +5 -0
@@ -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
Signature · 1 line
2.35.3
Re: [PATCH 2/2] clk: sunxi: add and use dummy gate clocks
Quoted 11 lines · Andre Przywara
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.
Quoted 6 lines
Add a
CCU_CLK_F_DUMMY_GATEflag that indicates that case, and define aGATE_DUMMYmacro 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 <[email protected]>
Andre Przywara
AppliedRe: [PATCH 2/2] clk: sunxi: add and use dummy gate clocks
In reply to Andre PrzywaraQuoted 11 lines · On Fri, 6 May 2022 01:33:01 +0100 Andre Przywara <[email protected]>…
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.
Quoted 6 lines
Add a
CCU_CLK_F_DUMMY_GATEflag that indicates that case, and define aGATE_DUMMYmacro 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 <[email protected]>
Applied to sunxi/master.
Thanks,
Andre
Quoted 84 lines
--- drivers/clk/sunxi/clk_h6.c | 2 ++ drivers/clk/sunxi/clk_h616.c | 2 ++ drivers/clk/sunxi/clk_h6_r.c | 2 ++ drivers/clk/sunxi/clk_sunxi.c | 3 +++ include/clk/sunxi.h | 5 +++++ 5 files changed, 14 insertions(+)drivers/clk/sunxi/clk_h6.c +2
-0@@ -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 )),drivers/clk/sunxi/clk_h616.c +2
-0@@ -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 )),drivers/clk/sunxi/clk_h6_r.c +2
-0@@ -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 )),drivers/clk/sunxi/clk_sunxi.c +3
-0@@ -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 ;include/clk/sunxi.h +5
-0@@ -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