Re: [PATCH v2 09/15] clk: sunxi-ng: a523: add interface mod clocks

From: Jernej Škrabec
Date: Tue Feb 18 2025 - 14:43:07 EST

Next message: Dragos Tatulea: "Re: [PATCH vhost] vdpa/mlx5: Fix oversized null mkey longer than 32bit"
Previous message: Catalin Marinas: "Re: [PATCH v13 4/5] arm64: support copy_mc_[user]_highpage()"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Dne petek, 14. februar 2025 ob 13:53:53 Srednjeevropski standardni čas je Andre Przywara napisal(a):
> Add the clocks driving what the user manual summarises under "interface"
> devices: raw NAND flash, MMC, SPI, EMAC, "IR" infrared, and the "GPADC"
> general purpose analogue/digital converter.
>
> Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
> ---
> drivers/clk/sunxi-ng/ccu-sun55i-a523.c | 160 +++++++++++++++++++++++++
> 1 file changed, 160 insertions(+)
>
> diff --git a/drivers/clk/sunxi-ng/ccu-sun55i-a523.c b/drivers/clk/sunxi-ng/ccu-sun55i-a523.c
> index b68c44bce825f..14d13fb16dfbb 100644
> --- a/drivers/clk/sunxi-ng/ccu-sun55i-a523.c
> +++ b/drivers/clk/sunxi-ng/ccu-sun55i-a523.c
> @@ -113,6 +113,9 @@ static CLK_FIXED_FACTOR_HWS(pll_periph0_150M_clk, "pll-periph0-150M",
> pll_periph0_2x_hws, 8, 1, 0);
> static CLK_FIXED_FACTOR_HWS(pll_periph0_160M_clk, "pll-periph0-160M",
> pll_periph0_480M_hws, 3, 1, 0);
> +static const struct clk_hw *pll_periph0_150M_hws[] = {
> + &pll_periph0_150M_clk.hw
> +};
>
> #define SUN55I_A523_PLL_PERIPH1_REG 0x028
> static struct ccu_nm pll_periph1_4x_clk = {
> @@ -537,6 +540,133 @@ 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 const struct clk_parent_data nand_mmc_parents[] = {
> + { .fw_name = "hosc" },
> + { .hw = &pll_periph0_400M_clk.hw },
> + { .hw = &pll_periph0_300M_clk.hw },
> + { .hw = &pll_periph1_400M_clk.hw },
> + { .hw = &pll_periph1_300M_clk.hw },
> +};
> +
> +static SUNXI_CCU_M_DATA_WITH_MUX_GATE(nand0_clk, "nand0", nand_mmc_parents,
> + 0x810,
> + 0, 5, /* M */
> + 24, 3, /* mux */
> + BIT(31), /* gate */
> + 0);
> +
> +static SUNXI_CCU_M_DATA_WITH_MUX_GATE(nand1_clk, "nand1", nand_mmc_parents,
> + 0x814,
> + 0, 5, /* M */
> + 24, 3, /* mux */
> + BIT(31), /* gate */
> + 0);
> +
> +static SUNXI_CCU_MP_MUX_GATE_POSTDIV_FEAT(mmc0_clk, "mmc0", nand_mmc_parents,
> + 0x830,
> + 0, 5, /* M */
> + 8, 5, /* P */
> + 24, 3, /* mux */
> + BIT(31), /* gate */
> + 2, /* post div */
> + 0, CCU_FEATURE_DUAL_DIV);
> +
> +static SUNXI_CCU_MP_MUX_GATE_POSTDIV_FEAT(mmc1_clk, "mmc1", nand_mmc_parents,
> + 0x834,
> + 0, 5, /* M */
> + 8, 5, /* P */
> + 24, 3, /* mux */
> + BIT(31), /* gate */
> + 2, /* post div */
> + 0, CCU_FEATURE_DUAL_DIV);
> +
> +static const struct clk_parent_data mmc2_parents[] = {
> + { .fw_name = "hosc" },
> + { .hw = &pll_periph0_800M_clk.common.hw },
> + { .hw = &pll_periph0_600M_clk.hw },
> + { .hw = &pll_periph1_800M_clk.common.hw },
> + { .hw = &pll_periph1_600M_clk.hw },
> +};
> +
> +static SUNXI_CCU_MP_MUX_GATE_POSTDIV_FEAT(mmc2_clk, "mmc2", mmc2_parents,
> + 0x838,
> + 0, 5, /* M */
> + 8, 5, /* P */
> + 24, 3, /* mux */
> + BIT(31), /* gate */
> + 2, /* post div */
> + 0, CCU_FEATURE_DUAL_DIV);
> +
> +static const struct clk_parent_data spi_parents[] = {
> + { .fw_name = "hosc" },
> + { .hw = &pll_periph0_300M_clk.hw },
> + { .hw = &pll_periph0_200M_clk.hw },
> + { .hw = &pll_periph1_300M_clk.hw },
> + { .hw = &pll_periph1_200M_clk.hw },
> +};
> +static SUNXI_CCU_MP_DATA_WITH_MUX_GATE(spi0_clk, "spi0", spi_parents, 0x940,
> + 0, 5, /* M */
> + 8, 5, /* P */
> + 24, 3, /* mux */
> + BIT(31), /* gate */
> + 0);
> +static SUNXI_CCU_MP_DATA_WITH_MUX_GATE(spi1_clk, "spi1", spi_parents, 0x944,
> + 0, 5, /* M */
> + 8, 5, /* P */
> + 24, 3, /* mux */
> + BIT(31), /* gate */
> + 0);
> +static SUNXI_CCU_MP_DATA_WITH_MUX_GATE(spi2_clk, "spi2", spi_parents, 0x948,
> + 0, 5, /* M */
> + 8, 5, /* P */
> + 24, 3, /* mux */
> + BIT(31), /* gate */
> + 0);
> +static SUNXI_CCU_MP_DATA_WITH_MUX_GATE(spifc_clk, "spifc", nand_mmc_parents,
> + 0x950,
> + 0, 5, /* M */
> + 8, 5, /* P */
> + 24, 3, /* mux */
> + BIT(31), /* gate */
> + 0);

Missing CCU_FEATURE_DUAL_DIV flag.

Best regards,
Jernej

> +
> +static SUNXI_CCU_GATE_HWS_WITH_PREDIV(emac0_25M_clk, "emac0-25M",
> + pll_periph0_150M_hws,
> + 0x970, BIT(31) | BIT(30), 6, 0);
> +static SUNXI_CCU_GATE_HWS_WITH_PREDIV(emac1_25M_clk, "emac1-25M",
> + pll_periph0_150M_hws,
> + 0x974, BIT(31) | BIT(30), 6, 0);
> +
> +static const struct clk_parent_data ir_rx_parents[] = {
> + { .fw_name = "losc" },
> + { .fw_name = "hosc" },
> +};
> +
> +static SUNXI_CCU_M_DATA_WITH_MUX_GATE(ir_rx_clk, "ir-rx", ir_rx_parents, 0x990,
> + 0, 5, /* M */
> + 24, 1, /* mux */
> + BIT(31), /* gate */
> + 0);
> +static const struct clk_parent_data ir_tx_ledc_parents[] = {
> + { .fw_name = "hosc" },
> + { .hw = &pll_periph1_600M_clk.hw },
> +};
> +static SUNXI_CCU_M_DATA_WITH_MUX_GATE(ir_tx_clk, "ir-tx", ir_tx_ledc_parents,
> + 0x9c0,
> + 0, 5, /* M */
> + 24, 1, /* mux */
> + BIT(31), /* gate */
> + 0);
> +
> +static SUNXI_CCU_M_WITH_GATE(gpadc0_clk, "gpadc0", "hosc", 0x9e0,
> + 0, 5, /* M */
> + BIT(31), /* gate */
> + 0);
> +static SUNXI_CCU_M_WITH_GATE(gpadc1_clk, "gpadc1", "hosc", 0x9e4,
> + 0, 5, /* M */
> + BIT(31), /* gate */
> + 0);
> +
> static const struct clk_parent_data losc_hosc_parents[] = {
> { .fw_name = "hosc" },
> { .fw_name = "losc" },
> @@ -693,6 +823,21 @@ static struct ccu_common *sun55i_a523_ccu_clks[] = {
> &hstimer5_clk.common,
> &iommu_clk.common,
> &dram_clk.common,
> + &nand0_clk.common,
> + &nand1_clk.common,
> + &mmc0_clk.common,
> + &mmc1_clk.common,
> + &mmc2_clk.common,
> + &spi0_clk.common,
> + &spi1_clk.common,
> + &spi2_clk.common,
> + &spifc_clk.common,
> + &emac0_25M_clk.common,
> + &emac1_25M_clk.common,
> + &ir_rx_clk.common,
> + &ir_tx_clk.common,
> + &gpadc0_clk.common,
> + &gpadc1_clk.common,
> &pcie_aux_clk.common,
> &hdmi_24M_clk.common,
> &hdmi_cec_32k_clk.common,
> @@ -767,6 +912,21 @@ static struct clk_hw_onecell_data sun55i_a523_hw_clks = {
> [CLK_HSTIMER5] = &hstimer5_clk.common.hw,
> [CLK_IOMMU] = &iommu_clk.common.hw,
> [CLK_DRAM] = &dram_clk.common.hw,
> + [CLK_NAND0] = &nand0_clk.common.hw,
> + [CLK_NAND1] = &nand1_clk.common.hw,
> + [CLK_MMC0] = &mmc0_clk.common.hw,
> + [CLK_MMC1] = &mmc1_clk.common.hw,
> + [CLK_MMC2] = &mmc2_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_EMAC0_25M] = &emac0_25M_clk.common.hw,
> + [CLK_EMAC1_25M] = &emac1_25M_clk.common.hw,
> + [CLK_IR_RX] = &ir_rx_clk.common.hw,
> + [CLK_IR_TX] = &ir_tx_clk.common.hw,
> + [CLK_GPADC0] = &gpadc0_clk.common.hw,
> + [CLK_GPADC1] = &gpadc1_clk.common.hw,
> [CLK_PCIE_AUX] = &pcie_aux_clk.common.hw,
> [CLK_HDMI_24M] = &hdmi_24M_clk.common.hw,
> [CLK_HDMI_CEC_32K] = &hdmi_cec_32k_clk.common.hw,
>

Next message: Dragos Tatulea: "Re: [PATCH vhost] vdpa/mlx5: Fix oversized null mkey longer than 32bit"
Previous message: Catalin Marinas: "Re: [PATCH v13 4/5] arm64: support copy_mc_[user]_highpage()"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]