Messages in this thread | | | Date | Mon, 24 Oct 2022 13:29:49 +0100 | From | Paul Cercueil <> | Subject | Re: [PATCH v5 3/3] clk: Add Ingenic JZ4755 CGU driver |
| |
Le lun. 24 oct. 2022 à 10:47:57 +0100, Paul Cercueil <paul@crapouillou.net> a écrit : > Hi Siarhei, > > Le lun. 24 oct. 2022 à 07:40:56 +0300, Siarhei Volkau > <lis8215@gmail.com> a écrit : >> Add support for the clocks provided by the CGU in the Ingenic JZ4755 >> SoC. >> >> Signed-off-by: Siarhei Volkau <lis8215@gmail.com> >> --- >> drivers/clk/ingenic/Kconfig | 10 + >> drivers/clk/ingenic/Makefile | 1 + >> drivers/clk/ingenic/jz4755-cgu.c | 346 >> +++++++++++++++++++++++++++++++ >> 3 files changed, 357 insertions(+) >> create mode 100644 drivers/clk/ingenic/jz4755-cgu.c >> >> diff --git a/drivers/clk/ingenic/Kconfig >> b/drivers/clk/ingenic/Kconfig >> index 898f1bc47..f80ac4f29 100644 >> --- a/drivers/clk/ingenic/Kconfig >> +++ b/drivers/clk/ingenic/Kconfig >> @@ -15,6 +15,16 @@ config INGENIC_CGU_JZ4740 >> >> If building for a JZ4740 SoC, you want to say Y here. >> >> +config INGENIC_CGU_JZ4755 >> + bool "Ingenic JZ4755 CGU driver" >> + default MACH_JZ4755 >> + select INGENIC_CGU_COMMON >> + help >> + Support the clocks provided by the CGU hardware on Ingenic JZ4755 >> + and compatible SoCs. >> + >> + If building for a JZ4755 SoC, you want to say Y here. >> + >> config INGENIC_CGU_JZ4725B >> bool "Ingenic JZ4725B CGU driver" >> default MACH_JZ4725B >> diff --git a/drivers/clk/ingenic/Makefile >> b/drivers/clk/ingenic/Makefile >> index 9edfaf461..81d8e23c2 100644 >> --- a/drivers/clk/ingenic/Makefile >> +++ b/drivers/clk/ingenic/Makefile >> @@ -1,6 +1,7 @@ >> # SPDX-License-Identifier: GPL-2.0-only >> obj-$(CONFIG_INGENIC_CGU_COMMON) += cgu.o pm.o >> obj-$(CONFIG_INGENIC_CGU_JZ4740) += jz4740-cgu.o >> +obj-$(CONFIG_INGENIC_CGU_JZ4755) += jz4755-cgu.o >> obj-$(CONFIG_INGENIC_CGU_JZ4725B) += jz4725b-cgu.o >> obj-$(CONFIG_INGENIC_CGU_JZ4760) += jz4760-cgu.o >> obj-$(CONFIG_INGENIC_CGU_JZ4770) += jz4770-cgu.o >> diff --git a/drivers/clk/ingenic/jz4755-cgu.c >> b/drivers/clk/ingenic/jz4755-cgu.c >> new file mode 100644 >> index 000000000..4f869efa7 >> --- /dev/null >> +++ b/drivers/clk/ingenic/jz4755-cgu.c >> @@ -0,0 +1,346 @@ >> +// SPDX-License-Identifier: GPL-2.0 >> +/* >> + * Ingenic JZ4755 SoC CGU driver >> + * Heavily based on JZ4725b CGU driver >> + * >> + * Copyright (C) 2022 Siarhei Volkau >> + * Author: Siarhei Volkau <lis8215@gmail.com> >> + */ >> + >> +#include <linux/clk-provider.h> >> +#include <linux/delay.h> >> +#include <linux/of.h> >> + >> +#include <dt-bindings/clock/ingenic,jz4755-cgu.h> >> + >> +#include "cgu.h" >> +#include "pm.h" >> + >> +/* CGU register offsets */ >> +#define CGU_REG_CPCCR 0x00 >> +#define CGU_REG_LCR 0x04 >> +#define CGU_REG_CPPCR 0x10 >> +#define CGU_REG_CLKGR 0x20 >> +#define CGU_REG_OPCR 0x24 >> +#define CGU_REG_I2SCDR 0x60 >> +#define CGU_REG_LPCDR 0x64 >> +#define CGU_REG_MSCCDR 0x68 >> +#define CGU_REG_SSICDR 0x74 >> +#define CGU_REG_CIMCDR 0x7C >> + >> +/* bits within the LCR register */ >> +#define LCR_SLEEP BIT(0) >> + >> +static struct ingenic_cgu *cgu; >> + >> +static const s8 pll_od_encoding[4] = { >> + 0x0, 0x1, -1, 0x3, >> +}; >> + >> +static const u8 jz4755_cgu_cpccr_div_table[] = { >> + 1, 2, 3, 4, 6, 8, >> +}; >> + >> +static const u8 jz4755_cgu_pll_half_div_table[] = { >> + 2, 1, >> +}; >> + >> +static const struct ingenic_cgu_clk_info jz4755_cgu_clocks[] = { >> + >> + /* External clocks */ >> + >> + [JZ4755_CLK_EXT] = { "ext", CGU_CLK_EXT }, >> + [JZ4755_CLK_OSC32K] = { "osc32k", CGU_CLK_EXT }, >> + >> + [JZ4755_CLK_PLL] = { >> + "pll", CGU_CLK_PLL, >> + .parents = { JZ4755_CLK_EXT, -1, -1, -1 }, > > You don't have CGU_CLK_MUX so you only have one parent, therefore you > can do: > > .parents = { JZ4755_CLK_EXT, }, > > Sorry for not noticing it before. > > Same for all the other appearances below. > >> + .pll = { >> + .reg = CGU_REG_CPPCR, >> + .rate_multiplier = 1, >> + .m_shift = 23, >> + .m_bits = 9, >> + .m_offset = 2, >> + .n_shift = 18, >> + .n_bits = 5, >> + .n_offset = 2, >> + .od_shift = 16, >> + .od_bits = 2, >> + .od_max = 4, >> + .od_encoding = pll_od_encoding, >> + .stable_bit = 10, >> + .bypass_reg = CGU_REG_CPPCR, >> + .bypass_bit = 9, >> + .enable_bit = 8, >> + }, >> + }, >> + >> + /* Muxes & dividers */ >> + >> + [JZ4755_CLK_PLL_HALF] = { >> + "pll half", CGU_CLK_DIV, >> + .parents = { JZ4755_CLK_PLL, -1, -1, -1 }, >> + .div = { >> + CGU_REG_CPCCR, 21, 1, 1, -1, -1, -1, 0, >> + jz4755_cgu_pll_half_div_table, >> + }, >> + }, >> + >> + [JZ4755_CLK_EXT_HALF] = { >> + "ext half", CGU_CLK_DIV, >> + .parents = { JZ4755_CLK_EXT, -1, -1, -1 }, >> + .div = { >> + CGU_REG_CPCCR, 30, 1, 1, -1, -1, -1, 0, >> + NULL, >> + }, >> + }, >> + >> + [JZ4755_CLK_CCLK] = { >> + "cclk", CGU_CLK_DIV, >> + .parents = { JZ4755_CLK_PLL, -1, -1, -1 }, >> + .div = { >> + CGU_REG_CPCCR, 0, 1, 4, 22, -1, -1, 0, >> + jz4755_cgu_cpccr_div_table, >> + }, >> + }, >> + >> + [JZ4755_CLK_H0CLK] = { >> + "hclk", CGU_CLK_DIV, >> + .parents = { JZ4755_CLK_PLL, -1, -1, -1 }, >> + .div = { >> + CGU_REG_CPCCR, 4, 1, 4, 22, -1, -1, 0, >> + jz4755_cgu_cpccr_div_table, >> + }, >> + }, >> + >> + [JZ4755_CLK_PCLK] = { >> + "pclk", CGU_CLK_DIV, >> + .parents = { JZ4755_CLK_PLL, -1, -1, -1 }, >> + .div = { >> + CGU_REG_CPCCR, 8, 1, 4, 22, -1, -1, 0, >> + jz4755_cgu_cpccr_div_table, >> + }, >> + }, >> + >> + [JZ4755_CLK_MCLK] = { >> + "mclk", CGU_CLK_DIV, >> + .parents = { JZ4755_CLK_PLL, -1, -1, -1 }, >> + .div = { >> + CGU_REG_CPCCR, 12, 1, 4, 22, -1, -1, 0, >> + jz4755_cgu_cpccr_div_table, >> + }, >> + }, >> + >> + [JZ4755_CLK_H1CLK] = { >> + "h1clk", CGU_CLK_DIV, >> + .parents = { JZ4755_CLK_PLL, -1, -1, -1 }, >> + .div = { >> + CGU_REG_CPCCR, 16, 1, 4, 22, -1, -1, 0, >> + jz4755_cgu_cpccr_div_table, >> + }, >> + }, >> + >> + [JZ4755_CLK_UDC] = { >> + "udc", CGU_CLK_MUX | CGU_CLK_DIV | CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_EXT_HALF, JZ4755_CLK_PLL_HALF, -1, -1 }, > > For "mux" clocks, if there's only one mux bit, then you can do: > > .parents = { JZ4755_CLK_EXT_HALF, JZ4755_CLK_PLL_HALF, }, > > Same below. > >> + .mux = { CGU_REG_CPCCR, 29, 1 }, >> + .div = { CGU_REG_CPCCR, 23, 1, 6, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 10 }, >> + }, >> + >> + [JZ4755_CLK_LCD] = { >> + "lcd", CGU_CLK_DIV | CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_PLL_HALF, -1, -1, -1 }, >> + .div = { CGU_REG_LPCDR, 0, 1, 11, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 9 }, >> + }, >> + >> + [JZ4755_CLK_MMC] = { >> + "mmc", CGU_CLK_DIV, >> + .parents = { JZ4755_CLK_PLL_HALF, -1, -1, -1 }, >> + .div = { CGU_REG_MSCCDR, 0, 1, 5, -1, -1, -1 }, >> + }, >> + >> + [JZ4755_CLK_I2S] = { >> + "i2s", CGU_CLK_MUX | CGU_CLK_DIV, >> + .parents = { JZ4755_CLK_EXT_HALF, JZ4755_CLK_PLL_HALF, -1, -1 }, >> + .mux = { CGU_REG_CPCCR, 31, 1 }, >> + .div = { CGU_REG_I2SCDR, 0, 1, 9, -1, -1, -1 }, >> + }, >> + >> + [JZ4755_CLK_SPI] = { >> + "spi", CGU_CLK_DIV | CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_PLL_HALF, -1, -1, -1 }, >> + .div = { CGU_REG_SSICDR, 0, 1, 4, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 4 }, >> + }, >> + >> + [JZ4755_CLK_TVE] = { >> + "tve", CGU_CLK_MUX | CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_LCD, JZ4755_CLK_EXT, -1, -1 }, >> + .mux = { CGU_REG_LPCDR, 31, 1 }, >> + .gate = { CGU_REG_CLKGR, 18 }, >> + }, >> + >> + [JZ4755_CLK_RTC] = { >> + "rtc", CGU_CLK_MUX | CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_EXT512, JZ4755_CLK_OSC32K, -1, -1 }, >> + .mux = { CGU_REG_OPCR, 2, 1}, >> + .gate = { CGU_REG_CLKGR, 2 }, >> + }, >> + >> + [JZ4755_CLK_CIM] = { >> + "cim", CGU_CLK_DIV | CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_PLL_HALF, -1, -1, -1 }, >> + .div = { CGU_REG_CIMCDR, 0, 1, 8, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 8 }, >> + }, >> + >> + /* Gate-only clocks */ >> + >> + [JZ4755_CLK_UART0] = { >> + "uart0", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_EXT_HALF, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 0 }, >> + }, >> + >> + [JZ4755_CLK_UART1] = { >> + "uart1", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_EXT_HALF, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 14 }, >> + }, >> + >> + [JZ4755_CLK_UART2] = { >> + "uart2", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_EXT_HALF, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 15 }, >> + }, >> + >> + [JZ4755_CLK_ADC] = { >> + "adc", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_EXT_HALF, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 7 }, >> + }, >> + >> + [JZ4755_CLK_AIC] = { >> + "aic", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_EXT_HALF, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 5 }, >> + }, >> + >> + [JZ4755_CLK_I2C] = { >> + "i2c", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_EXT_HALF, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 3 }, >> + }, >> + >> + [JZ4755_CLK_BCH] = { >> + "bch", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_MCLK/* not sure */, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 11 }, >> + }, >> + >> + [JZ4755_CLK_TCU] = { >> + "tcu", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_EXT, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 1 }, >> + }, >> + >> + [JZ4755_CLK_DMA] = { >> + "dma", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_PCLK, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 12 }, >> + }, >> + >> + [JZ4755_CLK_MMC0] = { >> + "mmc0", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_MMC, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 6 }, >> + }, >> + >> + [JZ4755_CLK_MMC1] = { >> + "mmc1", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_MMC, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 16 }, >> + }, >> + >> + [JZ4755_CLK_AUX_CPU] = { >> + "aux_cpu", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_H1CLK, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 24 }, >> + }, >> + >> + [JZ4755_CLK_AHB1] = { >> + "ahb1", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_H1CLK, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 23 }, >> + }, >> + >> + [JZ4755_CLK_IDCT] = { >> + "idct", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_H1CLK, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 22 }, >> + }, >> + >> + [JZ4755_CLK_DB] = { >> + "db", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_H1CLK, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 21 }, >> + }, >> + >> + [JZ4755_CLK_ME] = { >> + "me", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_H1CLK, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 20 }, >> + }, >> + >> + [JZ4755_CLK_MC] = { >> + "mc", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_H1CLK, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 19 }, >> + }, >> + >> + [JZ4755_CLK_TSSI] = { >> + "tssi", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_EXT_HALF/* not sure */, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 17 }, >> + }, >> + >> + [JZ4755_CLK_IPU] = { >> + "ipu", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_PLL_HALF/* not sure */, -1, -1, -1 }, >> + .gate = { CGU_REG_CLKGR, 13 }, >> + }, >> + >> + [JZ4755_CLK_EXT512] = { >> + "ext/512", CGU_CLK_FIXDIV, >> + .parents = { JZ4755_CLK_EXT }, >> + >> + .fixdiv = { 512 }, >> + }, >> + >> + [JZ4755_CLK_UDC_PHY] = { >> + "udc_phy", CGU_CLK_GATE, >> + .parents = { JZ4755_CLK_EXT_HALF, -1, -1, -1 }, >> + .gate = { CGU_REG_OPCR, 6, true }, >> + }, >> +}; >> + >> +static void __init jz4755_cgu_init(struct device_node *np) >> +{ >> + int retval; >> + >> + cgu = ingenic_cgu_new(jz4755_cgu_clocks, >> + ARRAY_SIZE(jz4755_cgu_clocks), np); >> + if (!cgu) { >> + pr_err("%s: failed to initialise CGU\n", __func__); > > initialise -> initialize
Nevermind - "initialise" is correct, it's just the GB spelling while "initialize" is the US spelling. So I don't mind.
Cheers, -Paul
>> + return; >> + } >> + >> + retval = ingenic_cgu_register_clocks(cgu); >> + if (retval) >> + pr_err("%s: failed to register CGU Clocks\n", __func__); >> + >> + ingenic_cgu_register_syscore_ops(cgu); >> +} >> +CLK_OF_DECLARE_DRIVER(jz4755_cgu, "ingenic,jz4755-cgu", >> jz4755_cgu_init); >> -- >> 2.36.1 >> >
| |