From: Andre Przywara <andre.przywara@arm.com>
To: "Jernej Škrabec" <jernej.skrabec@gmail.com>
Cc: Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>, Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Samuel Holland <samuel@sholland.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
linux-clk@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 12/15] clk: sunxi-ng: a523: add bus clock gates
Date: Fri, 28 Feb 2025 14:04:58 +0000 [thread overview]
Message-ID: <20250228140458.2e86fd03@donnerap.manchester.arm.com> (raw)
In-Reply-To: <869956354.0ifERbkFSE@jernej-laptop>
On Tue, 18 Feb 2025 21:12:33 +0100
Jernej Škrabec <jernej.skrabec@gmail.com> wrote:
Hi,
> Dne petek, 14. februar 2025 ob 13:53:56 Srednjeevropski standardni čas je Andre Przywara napisal(a):
> > Add the various bus clock gates that control access to the devices'
> > register interface.
> > These clocks are each just one bit, typically the lower bits in some "BGR"
> > (Bus Gate / Reset) registers, for each device group: one for all UARTs,
> > one for all SPI interfaces, and so on.
> >
> > Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> > ---
> > drivers/clk/sunxi-ng/ccu-sun55i-a523.c | 295 ++++++++++++++++++++++++-
> > 1 file changed, 294 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/clk/sunxi-ng/ccu-sun55i-a523.c b/drivers/clk/sunxi-ng/ccu-sun55i-a523.c
> > index 6a4340f1fd041..fbed9b2b3b2f9 100644
> > --- a/drivers/clk/sunxi-ng/ccu-sun55i-a523.c
> > +++ b/drivers/clk/sunxi-ng/ccu-sun55i-a523.c
> > @@ -350,6 +350,8 @@ static SUNXI_CCU_M_DATA_WITH_MUX(ahb_clk, "ahb", ahb_apb0_parents, 0x510,
> > 0, 5, /* M */
> > 24, 2, /* mux */
> > 0);
> > +static const struct clk_hw *ahb_hws[] = { &ahb_clk.common.hw };
> > +
> > static SUNXI_CCU_M_DATA_WITH_MUX(apb0_clk, "apb0", ahb_apb0_parents, 0x520,
> > 0, 5, /* M */
> > 24, 2, /* mux */
> > @@ -367,10 +369,11 @@ static SUNXI_CCU_M_DATA_WITH_MUX(apb1_clk, "apb1", apb1_parents, 0x524,
> > 0, 5, /* M */
> > 24, 3, /* mux */
> > 0);
> > +static const struct clk_hw *apb1_hws[] = { &apb1_clk.common.hw };
> >
> >
> > /**************************************************************************
> > - * mod clocks *
> > + * mod clocks with gates *
> > **************************************************************************/
> >
> > static const struct clk_hw *de_parents[] = {
> > @@ -386,6 +389,8 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(de_clk, "de", de_parents, 0x600,
> > BIT(31), /* gate */
> > CLK_SET_RATE_PARENT);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_de_clk, "bus-de", ahb_hws, 0x60c, BIT(0), 0);
> > +
> > static const struct clk_hw *di_parents[] = {
> > &pll_periph0_300M_clk.hw,
> > &pll_periph0_400M_clk.hw,
> > @@ -399,6 +404,8 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(di_clk, "di", di_parents, 0x620,
> > BIT(31), /* gate */
> > CLK_SET_RATE_PARENT);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_di_clk, "bus-di", ahb_hws, 0x62c, BIT(0), 0);
> > +
> > static const struct clk_hw *g2d_parents[] = {
> > &pll_periph0_400M_clk.hw,
> > &pll_periph0_300M_clk.hw,
> > @@ -412,6 +419,8 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(g2d_clk, "g2d", g2d_parents, 0x630,
> > BIT(31), /* gate */
> > 0);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_g2d_clk, "bus-g2d", ahb_hws, 0x63c, BIT(0), 0);
> > +
> > static const struct clk_hw *gpu_parents[] = {
> > &pll_gpu_clk.common.hw,
> > &pll_periph0_800M_clk.common.hw,
> > @@ -427,6 +436,8 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(gpu_clk, "gpu", gpu_parents, 0x670,
> > BIT(31), /* gate */
> > 0);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_gpu_clk, "bus-gpu", ahb_hws, 0x67c, BIT(0), 0);
> > +
> > static const struct clk_parent_data ce_parents[] = {
> > { .fw_name = "hosc" },
> > { .hw = &pll_periph0_480M_clk.common.hw },
> > @@ -439,6 +450,10 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(ce_clk, "ce", ce_parents, 0x680,
> > BIT(31), /* gate */
> > 0);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_ce_clk, "bus-ce", ahb_hws, 0x68c, BIT(0), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_ce_sys_clk, "bus-ce-sys", ahb_hws, 0x68c,
> > + BIT(1), 0);
> > +
> > static const struct clk_hw *ve_parents[] = {
> > &pll_ve_clk.common.hw,
> > &pll_periph0_480M_clk.common.hw,
> > @@ -451,6 +466,16 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(ve_clk, "ve", ve_parents, 0x690,
> > BIT(31), /* gate */
> > CLK_SET_RATE_PARENT);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_ve_clk, "bus-ve", ahb_hws, 0x69c, BIT(0), 0);
> > +
> > +static SUNXI_CCU_GATE_HWS(bus_dma_clk, "bus-dma", ahb_hws, 0x70c, BIT(0), 0);
> > +
> > +static SUNXI_CCU_GATE_HWS(bus_msgbox_clk, "bus-msgbox", ahb_hws, 0x71c,
> > + BIT(0), 0);
> > +
> > +static SUNXI_CCU_GATE_HWS(bus_spinlock_clk, "bus-spinlock", ahb_hws, 0x72c,
> > + BIT(0), 0);
>
> msgbox and spinlock probably needs to be marked as critical? Crust needs that
> for communication with TF-A.
Do they? I don't see this being done on any of the other SoCs that use
crust?
I would like to leave it like this for now, we can fix this later (and
backport to stable) if we need so, I think?
>
> > +
> > static const struct clk_parent_data hstimer_parents[] = {
> > { .fw_name = "hosc" },
> > { .fw_name = "iosc" },
> > @@ -510,6 +535,15 @@ static SUNXI_CCU_MP_DATA_WITH_MUX_GATE(hstimer5_clk, "hstimer5",
> > BIT(31), /* gate */
> > CLK_SET_RATE_PARENT);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_hstimer_clk, "bus-hstimer", ahb_hws, 0x74c,
> > + BIT(0), 0);
> > +
> > +static SUNXI_CCU_GATE_HWS(bus_dbg_clk, "bus-dbg", ahb_hws, 0x78c,
> > + BIT(0), 0);
> > +
> > +static SUNXI_CCU_GATE_HWS(bus_pwm0_clk, "bus-pwm0", apb1_hws, 0x7ac, BIT(0), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_pwm1_clk, "bus-pwm1", apb1_hws, 0x7ac, BIT(1), 0);
> > +
> > static const struct clk_parent_data iommu_parents[] = {
> > { .hw = &pll_periph0_600M_clk.hw },
> > { .hw = &pll_ddr0_clk.common.hw },
> > @@ -525,6 +559,9 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(iommu_clk, "iommu", iommu_parents, 0x7b0,
> > BIT(31), /* gate */
> > CLK_SET_RATE_PARENT);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_iommu_clk, "bus-iommu", apb0_hws, 0x7bc,
> > + BIT(0), 0);
> > +
> > static const struct clk_hw *dram_parents[] = {
> > &pll_ddr0_clk.common.hw,
> > &pll_periph0_600M_clk.hw,
> > @@ -541,6 +578,22 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(dram_clk, "dram", dram_parents, 0x800,
> > static CLK_FIXED_FACTOR_HW(mbus_clk, "mbus",
> > &dram_clk.common.hw, 4, 1, 0);
> >
> > +static SUNXI_CCU_GATE_HW(mbus_dma_clk, "mbus-dma", &mbus_clk.hw,
> > + 0x804, BIT(0), 0);
> > +static SUNXI_CCU_GATE_HW(mbus_ve_clk, "mbus-ve", &mbus_clk.hw,
> > + 0x804, BIT(1), 0);
> > +static SUNXI_CCU_GATE_HW(mbus_ce_clk, "mbus-ce", &mbus_clk.hw,
> > + 0x804, BIT(2), 0);
> > +static SUNXI_CCU_GATE_HW(mbus_nand_clk, "mbus-nand", &mbus_clk.hw,
> > + 0x804, BIT(5), 0);
> > +static SUNXI_CCU_GATE_HW(mbus_usb3_clk, "mbus-usb3", &mbus_clk.hw,
> > + 0x804, BIT(6), 0);
> > +static SUNXI_CCU_GATE_HW(mbus_csi_clk, "mbus-csi", &mbus_clk.hw,
> > + 0x804, BIT(8), 0);
>
> Missing several MBUS gates. Check T527 manual.
Right, I added isp and gmac1. I did not model the bits in the upper half,
I don't understand what they are for, really, and they are enabled on
reset.
>
> > +
> > +static SUNXI_CCU_GATE_HWS(bus_dram_clk, "bus-dram", ahb_hws, 0x80c,
> > + BIT(0), CLK_IS_CRITICAL);
> > +
> > static const struct clk_parent_data nand_mmc_parents[] = {
> > { .fw_name = "hosc" },
> > { .hw = &pll_periph0_400M_clk.hw },
> > @@ -563,6 +616,9 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(nand1_clk, "nand1", nand_mmc_parents,
> > BIT(31), /* gate */
> > 0);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_nand_clk, "bus-nand", ahb_hws, 0x82c,
> > + BIT(0), 0);
> > +
> > static SUNXI_CCU_MP_MUX_GATE_POSTDIV_FEAT(mmc0_clk, "mmc0", nand_mmc_parents,
> > 0x830,
> > 0, 5, /* M */
> > @@ -598,6 +654,39 @@ static SUNXI_CCU_MP_MUX_GATE_POSTDIV_FEAT(mmc2_clk, "mmc2", mmc2_parents,
> > 2, /* post div */
> > 0, CCU_FEATURE_DUAL_DIV);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_mmc0_clk, "bus-mmc0", ahb_hws, 0x84c, BIT(0), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_mmc1_clk, "bus-mmc1", ahb_hws, 0x84c, BIT(1), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_mmc2_clk, "bus-mmc2", ahb_hws, 0x84c, BIT(2), 0);
> > +
> > +static SUNXI_CCU_GATE_HWS(bus_sysdap_clk, "bus-sysdap", apb1_hws, 0x88c,
> > + BIT(0), 0);
> > +
> > +static SUNXI_CCU_GATE_HWS(bus_uart0_clk, "bus-uart0", apb1_hws, 0x90c,
> > + BIT(0), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_uart1_clk, "bus-uart1", apb1_hws, 0x90c,
> > + BIT(1), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_uart2_clk, "bus-uart2", apb1_hws, 0x90c,
> > + BIT(2), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_uart3_clk, "bus-uart3", apb1_hws, 0x90c,
> > + BIT(3), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_uart4_clk, "bus-uart4", apb1_hws, 0x90c,
> > + BIT(4), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_uart5_clk, "bus-uart5", apb1_hws, 0x90c,
> > + BIT(5), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_uart6_clk, "bus-uart6", apb1_hws, 0x90c,
> > + BIT(6), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_uart7_clk, "bus-uart7", apb1_hws, 0x90c,
> > + BIT(7), 0);
> > +
> > +static SUNXI_CCU_GATE_HWS(bus_i2c0_clk, "bus-i2c0", apb1_hws, 0x91c, BIT(0), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_i2c1_clk, "bus-i2c1", apb1_hws, 0x91c, BIT(1), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_i2c2_clk, "bus-i2c2", apb1_hws, 0x91c, BIT(2), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_i2c3_clk, "bus-i2c3", apb1_hws, 0x91c, BIT(3), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_i2c4_clk, "bus-i2c4", apb1_hws, 0x91c, BIT(4), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_i2c5_clk, "bus-i2c5", apb1_hws, 0x91c, BIT(5), 0);
> > +
> > +static SUNXI_CCU_GATE_HWS(bus_can_clk, "bus-can", apb1_hws, 0x92c, BIT(0), 0);
> > +
> > static const struct clk_parent_data spi_parents[] = {
> > { .fw_name = "hosc" },
> > { .hw = &pll_periph0_300M_clk.hw },
> > @@ -630,6 +719,11 @@ static SUNXI_CCU_MP_DATA_WITH_MUX_GATE(spifc_clk, "spifc", nand_mmc_parents,
> > 24, 3, /* mux */
> > BIT(31), /* gate */
> > 0);
> > +static SUNXI_CCU_GATE_HWS(bus_spi0_clk, "bus-spi0", ahb_hws, 0x96c, BIT(0), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_spi1_clk, "bus-spi1", ahb_hws, 0x96c, BIT(1), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_spi2_clk, "bus-spi2", ahb_hws, 0x96c, BIT(2), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_spifc_clk, "bus-spifc", ahb_hws, 0x96c,
> > + BIT(3), 0);
> >
> > static SUNXI_CCU_GATE_HWS_WITH_PREDIV(emac0_25M_clk, "emac0-25M",
> > pll_periph0_150M_hws,
> > @@ -637,6 +731,10 @@ static SUNXI_CCU_GATE_HWS_WITH_PREDIV(emac0_25M_clk, "emac0-25M",
> > static SUNXI_CCU_GATE_HWS_WITH_PREDIV(emac1_25M_clk, "emac1-25M",
> > pll_periph0_150M_hws,
> > 0x974, BIT(31) | BIT(30), 6, 0);
> > +static SUNXI_CCU_GATE_HWS(bus_emac0_clk, "bus-emac0", ahb_hws, 0x97c,
> > + BIT(0), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_emac1_clk, "bus-emac1", ahb_hws, 0x98c,
> > + BIT(0), 0);
> >
> > static const struct clk_parent_data ir_rx_parents[] = {
> > { .fw_name = "losc" },
> > @@ -648,6 +746,9 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(ir_rx_clk, "ir-rx", ir_rx_parents, 0x990,
> > 24, 1, /* mux */
> > BIT(31), /* gate */
> > 0);
> > +static SUNXI_CCU_GATE_HWS(bus_ir_rx_clk, "bus-ir-rx", apb0_hws, 0x99c,
> > + BIT(0), 0);
> > +
> > static const struct clk_parent_data ir_tx_ledc_parents[] = {
> > { .fw_name = "hosc" },
> > { .hw = &pll_periph1_600M_clk.hw },
> > @@ -658,6 +759,8 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(ir_tx_clk, "ir-tx", ir_tx_ledc_parents,
> > 24, 1, /* mux */
> > BIT(31), /* gate */
> > 0);
> > +static SUNXI_CCU_GATE_HWS(bus_ir_tx_clk, "bus-ir-tx", apb0_hws, 0x9cc,
> > + BIT(0), 0);
> >
> > static SUNXI_CCU_M_WITH_GATE(gpadc0_clk, "gpadc0", "hosc", 0x9e0,
> > 0, 5, /* M */
> > @@ -667,6 +770,12 @@ static SUNXI_CCU_M_WITH_GATE(gpadc1_clk, "gpadc1", "hosc", 0x9e4,
> > 0, 5, /* M */
> > BIT(31), /* gate */
> > 0);
> > +static SUNXI_CCU_GATE_HWS(bus_gpadc0_clk, "bus-gpadc0", ahb_hws, 0x9ec,
> > + BIT(0), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_gpadc1_clk, "bus-gpadc1", ahb_hws, 0x9ec,
> > + BIT(1), 0);
> > +
> > +static SUNXI_CCU_GATE_HWS(bus_ths_clk, "bus-ths", apb0_hws, 0x9fc, BIT(0), 0);
> >
> > /*
> > * The first parent is a 48 MHz input clock divided by 4. That 48 MHz clock is
> > @@ -720,6 +829,18 @@ static struct ccu_mux usb_ohci1_clk = {
> > },
> > };
> >
> > +static SUNXI_CCU_GATE_HWS(bus_ohci0_clk, "bus-ohci0", ahb_hws, 0xa8c,
> > + BIT(0), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_ohci1_clk, "bus-ohci1", ahb_hws, 0xa8c,
> > + BIT(1), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_ehci0_clk, "bus-ehci0", ahb_hws, 0xa8c,
> > + BIT(4), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_ehci1_clk, "bus-ehci1", ahb_hws, 0xa8c,
> > + BIT(5), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_otg_clk, "bus-otg", ahb_hws, 0xa8c, BIT(8), 0);
> > +
> > +static SUNXI_CCU_GATE_HWS(bus_lradc_clk, "bus-lradc", apb0_hws, 0xa9c,
> > + BIT(0), 0);
> >
> > static const struct clk_parent_data losc_hosc_parents[] = {
> > { .fw_name = "hosc" },
> > @@ -733,6 +854,9 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(pcie_aux_clk, "pcie-aux",
> > BIT(31), /* gate */
> > 0);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_dpss_top_clk, "bus-dpss-top", ahb_hws, 0xabc,
> > + BIT(0), 0);
> > +
> > static SUNXI_CCU_GATE_DATA(hdmi_24M_clk, "hdmi-24M", osc24M, 0xb04, BIT(31), 0);
> >
> > /* TODO: add mux between 32kOSC and PERIPH0/18750 */
> > @@ -750,6 +874,8 @@ static SUNXI_CCU_MUX_DATA_WITH_GATE(hdmi_cec_clk, "hdmi-cec", hdmi_cec_parents,
> > BIT(31), /* gate */
> > 0);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_hdmi_clk, "bus-hdmi", ahb_hws, 0xb1c, BIT(0), 0);
> > +
> > static const struct clk_parent_data mipi_dsi_parents[] = {
> > { .fw_name = "hosc" },
> > { .hw = &pll_periph0_200M_clk.hw },
> > @@ -769,6 +895,12 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(mipi_dsi1_clk, "mipi-dsi1",
> > BIT(31), /* gate */
> > CLK_SET_RATE_PARENT);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_mipi_dsi0_clk, "bus-mipi-dsi0", ahb_hws, 0xb4c,
> > + BIT(0), 0);
> > +
> > +static SUNXI_CCU_GATE_HWS(bus_mipi_dsi1_clk, "bus-mipi-dsi1", ahb_hws, 0xb4c,
> > + BIT(1), 0);
> > +
> > static const struct clk_hw *tcon_parents[] = {
> > &pll_video0_4x_clk.common.hw,
> > &pll_video1_4x_clk.common.hw,
> > @@ -806,6 +938,11 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(combophy_dsi1_clk, "combophy-dsi1",
> > BIT(31), /* gate */
> > CLK_SET_RATE_PARENT);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_tcon_lcd0_clk, "bus-tcon-lcd0", ahb_hws, 0xb7c,
> > + BIT(0), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_tcon_lcd1_clk, "bus-tcon-lcd1", ahb_hws, 0xb7c,
> > + BIT(1), 0);
>
> Missing gate for bus-tcon-lcd2.
Right, added now.
>
> > +
> > static SUNXI_CCU_M_HW_WITH_MUX_GATE(tcon_tv0_clk, "tcon-tv0", tcon_parents,
> > 0xb80,
> > 0, 4, /* M */
> > @@ -820,6 +957,11 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(tcon_tv1_clk, "tcon-tv1", tcon_parents,
> > BIT(31), /* gate */
> > CLK_SET_RATE_PARENT);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_tcon_tv0_clk, "bus-tcon-tv0", ahb_hws, 0xb9c,
> > + BIT(0), 0);
> > +static SUNXI_CCU_GATE_HWS(bus_tcon_tv1_clk, "bus-tcon-tv1", ahb_hws, 0xb9c,
> > + BIT(1), 0);
> > +
> > static const struct clk_hw *edp_parents[] = {
> > &pll_video0_4x_clk.common.hw,
> > &pll_video1_4x_clk.common.hw,
> > @@ -833,6 +975,8 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(edp_clk, "edp", edp_parents, 0xbb0,
> > BIT(31), /* gate */
> > 0);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_edp_clk, "bus-edp", ahb_hws, 0xbbc, BIT(0), 0);
> > +
> > static SUNXI_CCU_M_DATA_WITH_MUX_GATE(ledc_clk, "ledc", ir_tx_ledc_parents,
> > 0xbf0,
> > 0, 4, /* M */
> > @@ -840,6 +984,8 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(ledc_clk, "ledc", ir_tx_ledc_parents,
> > BIT(31), /* gate */
> > 0);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_ledc_clk, "bus-ledc", apb0_hws, 0xbfc, BIT(0), 0);
> > +
> > static const struct clk_hw *csi_top_parents[] = {
> > &pll_periph0_300M_clk.hw,
> > &pll_periph0_400M_clk.hw,
> > @@ -893,6 +1039,8 @@ static SUNXI_CCU_MP_DATA_WITH_MUX_GATE(csi_mclk3_clk, "csi-mclk3",
> > BIT(31), /* gate */
> > 0);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_csi_clk, "bus-csi", ahb_hws, 0xc1c, BIT(0), 0);
> > +
> > static const struct clk_hw *isp_parents[] = {
> > &pll_periph0_300M_clk.hw,
> > &pll_periph0_400M_clk.hw,
> > @@ -918,6 +1066,9 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(dsp_clk, "dsp", dsp_parents, 0xc70,
> > BIT(31), /* gate */
> > 0);
> >
> > +static SUNXI_CCU_GATE_HWS(bus_dsp_cfg_clk, "bus-dsp-cfg", ahb_hws, 0xc7c,
> > + BIT(1), 0);
>
> I don't see 0xc7c register.
Mmh, good point, I thought I saw this in some BSP drop, this "cfg" suffix
hints at this also. But poking it in U-Boot again indeed reveals it's not
implemented, the whole register is WI/RAZ.
Removed that.
Thanks!
Andre
> > +
> > static SUNXI_CCU_GATE_DATA(fanout_24M_clk, "fanout-24M", osc24M,
> > 0xf30, BIT(0), 0);
> > static SUNXI_CCU_GATE_DATA_WITH_PREDIV(fanout_12M_clk, "fanout-12M", osc24M,
> > @@ -1011,55 +1162,128 @@ static struct ccu_common *sun55i_a523_ccu_clks[] = {
> > &apb0_clk.common,
> > &apb1_clk.common,
> > &de_clk.common,
> > + &bus_de_clk.common,
> > &di_clk.common,
> > + &bus_di_clk.common,
> > &g2d_clk.common,
> > + &bus_g2d_clk.common,
> > &gpu_clk.common,
> > + &bus_gpu_clk.common,
> > &ce_clk.common,
> > + &bus_ce_clk.common,
> > + &bus_ce_sys_clk.common,
> > &ve_clk.common,
> > + &bus_ve_clk.common,
> > + &bus_dma_clk.common,
> > + &bus_msgbox_clk.common,
> > + &bus_spinlock_clk.common,
> > &hstimer0_clk.common,
> > &hstimer1_clk.common,
> > &hstimer2_clk.common,
> > &hstimer3_clk.common,
> > &hstimer4_clk.common,
> > &hstimer5_clk.common,
> > + &bus_hstimer_clk.common,
> > + &bus_dbg_clk.common,
> > + &bus_pwm0_clk.common,
> > + &bus_pwm1_clk.common,
> > &iommu_clk.common,
> > + &bus_iommu_clk.common,
> > &dram_clk.common,
> > + &mbus_dma_clk.common,
> > + &mbus_ve_clk.common,
> > + &mbus_ce_clk.common,
> > + &mbus_nand_clk.common,
> > + &mbus_usb3_clk.common,
> > + &mbus_csi_clk.common,
> > + &bus_dram_clk.common,
> > &nand0_clk.common,
> > &nand1_clk.common,
> > + &bus_nand_clk.common,
> > &mmc0_clk.common,
> > &mmc1_clk.common,
> > &mmc2_clk.common,
> > + &bus_sysdap_clk.common,
> > + &bus_mmc0_clk.common,
> > + &bus_mmc1_clk.common,
> > + &bus_mmc2_clk.common,
> > + &bus_uart0_clk.common,
> > + &bus_uart1_clk.common,
> > + &bus_uart2_clk.common,
> > + &bus_uart3_clk.common,
> > + &bus_uart4_clk.common,
> > + &bus_uart5_clk.common,
> > + &bus_uart6_clk.common,
> > + &bus_uart7_clk.common,
> > + &bus_i2c0_clk.common,
> > + &bus_i2c1_clk.common,
> > + &bus_i2c2_clk.common,
> > + &bus_i2c3_clk.common,
> > + &bus_i2c4_clk.common,
> > + &bus_i2c5_clk.common,
> > + &bus_can_clk.common,
> > &spi0_clk.common,
> > &spi1_clk.common,
> > &spi2_clk.common,
> > &spifc_clk.common,
> > + &bus_spi0_clk.common,
> > + &bus_spi1_clk.common,
> > + &bus_spi2_clk.common,
> > + &bus_spifc_clk.common,
> > &emac0_25M_clk.common,
> > &emac1_25M_clk.common,
> > + &bus_emac0_clk.common,
> > + &bus_emac1_clk.common,
> > &ir_rx_clk.common,
> > + &bus_ir_rx_clk.common,
> > &ir_tx_clk.common,
> > + &bus_ir_tx_clk.common,
> > &gpadc0_clk.common,
> > &gpadc1_clk.common,
> > + &bus_gpadc0_clk.common,
> > + &bus_gpadc1_clk.common,
> > + &bus_ths_clk.common,
> > &usb_ohci0_clk.common,
> > &usb_ohci1_clk.common,
> > + &bus_ohci0_clk.common,
> > + &bus_ohci1_clk.common,
> > + &bus_ehci0_clk.common,
> > + &bus_ehci1_clk.common,
> > + &bus_otg_clk.common,
> > + &bus_lradc_clk.common,
> > &pcie_aux_clk.common,
> > + &bus_dpss_top_clk.common,
> > &hdmi_24M_clk.common,
> > &hdmi_cec_32k_clk.common,
> > &hdmi_cec_clk.common,
> > + &bus_hdmi_clk.common,
> > &mipi_dsi0_clk.common,
> > &mipi_dsi1_clk.common,
> > + &bus_mipi_dsi0_clk.common,
> > + &bus_mipi_dsi1_clk.common,
> > &tcon_lcd0_clk.common,
> > &tcon_lcd1_clk.common,
> > + &combophy_dsi0_clk.common,
> > + &combophy_dsi1_clk.common,
> > + &bus_tcon_lcd0_clk.common,
> > + &bus_tcon_lcd1_clk.common,
> > &tcon_tv0_clk.common,
> > &tcon_tv1_clk.common,
> > + &bus_tcon_tv0_clk.common,
> > + &bus_tcon_tv1_clk.common,
> > &edp_clk.common,
> > + &bus_edp_clk.common,
> > &ledc_clk.common,
> > + &bus_ledc_clk.common,
> > &csi_top_clk.common,
> > &csi_mclk0_clk.common,
> > &csi_mclk1_clk.common,
> > &csi_mclk2_clk.common,
> > &csi_mclk3_clk.common,
> > + &bus_csi_clk.common,
> > &isp_clk.common,
> > &dsp_clk.common,
> > + &bus_dsp_cfg_clk.common,
> > &fanout_24M_clk.common,
> > &fanout_12M_clk.common,
> > &fanout_16M_clk.common,
> > @@ -1119,57 +1343,126 @@ static struct clk_hw_onecell_data sun55i_a523_hw_clks = {
> > [CLK_APB1] = &apb1_clk.common.hw,
> > [CLK_MBUS] = &mbus_clk.hw,
> > [CLK_DE] = &de_clk.common.hw,
> > + [CLK_BUS_DE] = &bus_de_clk.common.hw,
> > [CLK_DI] = &di_clk.common.hw,
> > + [CLK_BUS_DI] = &bus_di_clk.common.hw,
> > [CLK_G2D] = &g2d_clk.common.hw,
> > + [CLK_BUS_G2D] = &bus_g2d_clk.common.hw,
> > [CLK_GPU] = &gpu_clk.common.hw,
> > + [CLK_BUS_GPU] = &bus_gpu_clk.common.hw,
> > [CLK_CE] = &ce_clk.common.hw,
> > + [CLK_BUS_CE] = &bus_ce_clk.common.hw,
> > + [CLK_BUS_CE_SYS] = &bus_ce_sys_clk.common.hw,
> > [CLK_VE] = &ve_clk.common.hw,
> > + [CLK_BUS_VE] = &bus_ve_clk.common.hw,
> > + [CLK_BUS_DMA] = &bus_dma_clk.common.hw,
> > + [CLK_BUS_MSGBOX] = &bus_msgbox_clk.common.hw,
> > + [CLK_BUS_SPINLOCK] = &bus_spinlock_clk.common.hw,
> > [CLK_HSTIMER0] = &hstimer0_clk.common.hw,
> > [CLK_HSTIMER1] = &hstimer1_clk.common.hw,
> > [CLK_HSTIMER2] = &hstimer2_clk.common.hw,
> > [CLK_HSTIMER3] = &hstimer3_clk.common.hw,
> > [CLK_HSTIMER4] = &hstimer4_clk.common.hw,
> > [CLK_HSTIMER5] = &hstimer5_clk.common.hw,
> > + [CLK_BUS_HSTIMER] = &bus_hstimer_clk.common.hw,
> > + [CLK_BUS_DBG] = &bus_dbg_clk.common.hw,
> > + [CLK_BUS_PWM0] = &bus_pwm0_clk.common.hw,
> > + [CLK_BUS_PWM1] = &bus_pwm1_clk.common.hw,
> > [CLK_IOMMU] = &iommu_clk.common.hw,
> > + [CLK_BUS_IOMMU] = &bus_iommu_clk.common.hw,
> > [CLK_DRAM] = &dram_clk.common.hw,
> > + [CLK_MBUS_DMA] = &mbus_dma_clk.common.hw,
> > + [CLK_MBUS_VE] = &mbus_ve_clk.common.hw,
> > + [CLK_MBUS_CE] = &mbus_ce_clk.common.hw,
> > + [CLK_MBUS_CSI] = &mbus_csi_clk.common.hw,
> > + [CLK_BUS_DRAM] = &bus_dram_clk.common.hw,
> > [CLK_NAND0] = &nand0_clk.common.hw,
> > [CLK_NAND1] = &nand1_clk.common.hw,
> > + [CLK_BUS_NAND] = &bus_nand_clk.common.hw,
> > [CLK_MMC0] = &mmc0_clk.common.hw,
> > [CLK_MMC1] = &mmc1_clk.common.hw,
> > [CLK_MMC2] = &mmc2_clk.common.hw,
> > + [CLK_BUS_SYSDAP] = &bus_sysdap_clk.common.hw,
> > + [CLK_BUS_MMC0] = &bus_mmc0_clk.common.hw,
> > + [CLK_BUS_MMC1] = &bus_mmc1_clk.common.hw,
> > + [CLK_BUS_MMC2] = &bus_mmc2_clk.common.hw,
> > + [CLK_BUS_UART0] = &bus_uart0_clk.common.hw,
> > + [CLK_BUS_UART1] = &bus_uart1_clk.common.hw,
> > + [CLK_BUS_UART2] = &bus_uart2_clk.common.hw,
> > + [CLK_BUS_UART3] = &bus_uart3_clk.common.hw,
> > + [CLK_BUS_UART4] = &bus_uart4_clk.common.hw,
> > + [CLK_BUS_UART5] = &bus_uart5_clk.common.hw,
> > + [CLK_BUS_UART6] = &bus_uart6_clk.common.hw,
> > + [CLK_BUS_UART7] = &bus_uart7_clk.common.hw,
> > + [CLK_BUS_I2C0] = &bus_i2c0_clk.common.hw,
> > + [CLK_BUS_I2C1] = &bus_i2c1_clk.common.hw,
> > + [CLK_BUS_I2C2] = &bus_i2c2_clk.common.hw,
> > + [CLK_BUS_I2C3] = &bus_i2c3_clk.common.hw,
> > + [CLK_BUS_I2C4] = &bus_i2c4_clk.common.hw,
> > + [CLK_BUS_I2C5] = &bus_i2c5_clk.common.hw,
> > + [CLK_BUS_CAN] = &bus_can_clk.common.hw,
> > [CLK_SPI0] = &spi0_clk.common.hw,
> > [CLK_SPI1] = &spi1_clk.common.hw,
> > [CLK_SPI2] = &spi2_clk.common.hw,
> > [CLK_SPIFC] = &spifc_clk.common.hw,
> > + [CLK_BUS_SPI0] = &bus_spi0_clk.common.hw,
> > + [CLK_BUS_SPI1] = &bus_spi1_clk.common.hw,
> > + [CLK_BUS_SPI2] = &bus_spi2_clk.common.hw,
> > + [CLK_BUS_SPIFC] = &bus_spifc_clk.common.hw,
> > [CLK_EMAC0_25M] = &emac0_25M_clk.common.hw,
> > [CLK_EMAC1_25M] = &emac1_25M_clk.common.hw,
> > + [CLK_BUS_EMAC0] = &bus_emac0_clk.common.hw,
> > + [CLK_BUS_EMAC1] = &bus_emac1_clk.common.hw,
> > [CLK_IR_RX] = &ir_rx_clk.common.hw,
> > + [CLK_BUS_IR_RX] = &bus_ir_rx_clk.common.hw,
> > [CLK_IR_TX] = &ir_tx_clk.common.hw,
> > + [CLK_BUS_IR_TX] = &bus_ir_tx_clk.common.hw,
> > [CLK_GPADC0] = &gpadc0_clk.common.hw,
> > [CLK_GPADC1] = &gpadc1_clk.common.hw,
> > + [CLK_BUS_GPADC0] = &bus_gpadc0_clk.common.hw,
> > + [CLK_BUS_GPADC1] = &bus_gpadc1_clk.common.hw,
> > + [CLK_BUS_THS] = &bus_ths_clk.common.hw,
> > [CLK_USB_OHCI0] = &usb_ohci0_clk.common.hw,
> > [CLK_USB_OHCI1] = &usb_ohci1_clk.common.hw,
> > + [CLK_BUS_OHCI0] = &bus_ohci0_clk.common.hw,
> > + [CLK_BUS_OHCI1] = &bus_ohci1_clk.common.hw,
> > + [CLK_BUS_EHCI0] = &bus_ehci0_clk.common.hw,
> > + [CLK_BUS_EHCI1] = &bus_ehci1_clk.common.hw,
> > + [CLK_BUS_OTG] = &bus_otg_clk.common.hw,
> > + [CLK_BUS_LRADC] = &bus_lradc_clk.common.hw,
> > [CLK_PCIE_AUX] = &pcie_aux_clk.common.hw,
> > + [CLK_BUS_DPSS_TOP] = &bus_dpss_top_clk.common.hw,
> > [CLK_HDMI_24M] = &hdmi_24M_clk.common.hw,
> > [CLK_HDMI_CEC_32K] = &hdmi_cec_32k_clk.common.hw,
> > [CLK_HDMI_CEC] = &hdmi_cec_clk.common.hw,
> > + [CLK_BUS_HDMI] = &bus_hdmi_clk.common.hw,
> > [CLK_MIPI_DSI0] = &mipi_dsi0_clk.common.hw,
> > [CLK_MIPI_DSI1] = &mipi_dsi1_clk.common.hw,
> > + [CLK_BUS_MIPI_DSI0] = &bus_mipi_dsi0_clk.common.hw,
> > + [CLK_BUS_MIPI_DSI1] = &bus_mipi_dsi1_clk.common.hw,
> > [CLK_TCON_LCD0] = &tcon_lcd0_clk.common.hw,
> > [CLK_TCON_LCD1] = &tcon_lcd1_clk.common.hw,
> > [CLK_COMBOPHY_DSI0] = &combophy_dsi0_clk.common.hw,
> > [CLK_COMBOPHY_DSI1] = &combophy_dsi1_clk.common.hw,
> > + [CLK_BUS_TCON_LCD0] = &bus_tcon_lcd0_clk.common.hw,
> > + [CLK_BUS_TCON_LCD1] = &bus_tcon_lcd1_clk.common.hw,
> > [CLK_TCON_TV0] = &tcon_tv0_clk.common.hw,
> > [CLK_TCON_TV1] = &tcon_tv1_clk.common.hw,
> > + [CLK_BUS_TCON_TV0] = &bus_tcon_tv0_clk.common.hw,
> > + [CLK_BUS_TCON_TV1] = &bus_tcon_tv1_clk.common.hw,
> > [CLK_EDP] = &edp_clk.common.hw,
> > + [CLK_BUS_EDP] = &bus_edp_clk.common.hw,
> > [CLK_LEDC] = &ledc_clk.common.hw,
> > + [CLK_BUS_LEDC] = &bus_ledc_clk.common.hw,
> > [CLK_CSI_TOP] = &csi_top_clk.common.hw,
> > [CLK_CSI_MCLK0] = &csi_mclk0_clk.common.hw,
> > [CLK_CSI_MCLK1] = &csi_mclk1_clk.common.hw,
> > [CLK_CSI_MCLK2] = &csi_mclk2_clk.common.hw,
> > [CLK_CSI_MCLK3] = &csi_mclk3_clk.common.hw,
> > + [CLK_BUS_CSI] = &bus_csi_clk.common.hw,
> > [CLK_ISP] = &isp_clk.common.hw,
> > [CLK_DSP] = &dsp_clk.common.hw,
> > + [CLK_BUS_DSP_CFG] = &bus_dsp_cfg_clk.common.hw,
> > [CLK_FANOUT_24M] = &fanout_24M_clk.common.hw,
> > [CLK_FANOUT_12M] = &fanout_12M_clk.common.hw,
> > [CLK_FANOUT_16M] = &fanout_16M_clk.common.hw,
> >
>
>
>
>
next prev parent reply other threads:[~2025-02-28 14:07 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-14 12:53 [PATCH v2 00/15] clk: sunxi-ng: add A523 clock support Andre Przywara
2025-02-14 12:53 ` [PATCH v2 01/15] clk: sunxi-ng: mp: Add SUNXI_CCU_P_DATA_WITH_MUX_GATE wrapper Andre Przywara
2025-02-16 8:39 ` Chen-Yu Tsai
2025-02-14 12:53 ` [PATCH v2 02/15] clk: sunxi-ng: mp: introduce dual-divider clock Andre Przywara
2025-02-16 8:39 ` Chen-Yu Tsai
2025-02-14 12:53 ` [PATCH v2 03/15] clk: sunxi-ng: mp: provide wrapper for setting feature flags Andre Przywara
2025-02-16 8:41 ` Chen-Yu Tsai
2025-02-14 12:53 ` [PATCH v2 04/15] dt-bindings: clk: sunxi-ng: add compatible for the A523 CCU Andre Przywara
2025-02-14 12:53 ` [PATCH v2 05/15] clk: sunxi-ng: Add support for the A523/T527 CCU PLLs Andre Przywara
2025-02-18 19:03 ` Jernej Škrabec
2025-02-28 13:29 ` Andre Przywara
2025-02-14 12:53 ` [PATCH v2 06/15] clk: sunxi-ng: a523: Add support for bus clocks Andre Przywara
2025-02-18 19:06 ` Jernej Škrabec
2025-02-14 12:53 ` [PATCH v2 07/15] clk: sunxi-ng: a523: add video mod clocks Andre Przywara
2025-02-18 19:26 ` Jernej Škrabec
2025-02-28 13:42 ` Andre Przywara
2025-02-14 12:53 ` [PATCH v2 08/15] clk: sunxi-ng: a523: add system " Andre Przywara
2025-02-18 19:34 ` Jernej Škrabec
2025-02-28 13:43 ` Andre Przywara
2025-02-14 12:53 ` [PATCH v2 09/15] clk: sunxi-ng: a523: add interface " Andre Przywara
2025-02-18 19:42 ` Jernej Škrabec
2025-02-28 13:46 ` Andre Przywara
2025-02-14 12:53 ` [PATCH v2 10/15] clk: sunxi-ng: a523: add USB " Andre Przywara
2025-02-18 19:46 ` Jernej Škrabec
2025-02-14 12:53 ` [PATCH v2 11/15] clk: sunxi-ng: a523: remaining " Andre Przywara
2025-02-18 19:55 ` Jernej Škrabec
2025-02-28 13:50 ` Andre Przywara
2025-02-14 12:53 ` [PATCH v2 12/15] clk: sunxi-ng: a523: add bus clock gates Andre Przywara
2025-02-18 20:12 ` Jernej Škrabec
2025-02-28 14:04 ` Andre Przywara [this message]
2025-02-28 14:41 ` Jernej Škrabec
2025-02-14 12:53 ` [PATCH v2 13/15] clk: sunxi-ng: a523: add reset lines Andre Przywara
2025-02-18 20:29 ` Jernej Škrabec
2025-02-28 14:21 ` Andre Przywara
2025-02-14 12:53 ` [PATCH v2 14/15] dt-bindings: clk: sunxi-ng: add compatible for the A523 PRCM-CCU Andre Przywara
2025-02-14 12:53 ` [PATCH v2 15/15] clk: sunxi-ng: add support for the A523/T527 PRCM CCU Andre Przywara
2025-02-18 20:42 ` Jernej Škrabec
2025-02-28 14:33 ` Andre Przywara
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=20250228140458.2e86fd03@donnerap.manchester.arm.com \
--to=andre.przywara@arm.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jernej.skrabec@gmail.com \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=mturquette@baylibre.com \
--cc=p.zabel@pengutronix.de \
--cc=robh@kernel.org \
--cc=samuel@sholland.org \
--cc=sboyd@kernel.org \
--cc=wens@csie.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.