On 05/12/2021 16:32, David Virag wrote:
> This is an initial implementation adding basic clocks, such as UART,
> USI, I2C, WDT, ect. and their parent clocks. It is heavily based on the
> Exynos850 clock driver at 'drivers/clk/samsung/clk-exynos850.c' which
> was made by Sam Protsenko, thus the copyright and author lines were
> kept.
>
> Bus clocks are enabled by default as well to avoid hangs while trying to
> access CMU registers.
>
> Only the parts of CMU_TOP needed for CMU_CORE and CMU_PERI, a bit of
> CMU_CORE, and most of CMU_PERI is implemented as of now.
>
> Signed-off-by: David Virag <virag.david003@xxxxxxxxx>
> ---
> drivers/clk/samsung/Makefile | 1 +
> drivers/clk/samsung/clk-exynos7885.c | 680 +++++++++++++++++++++++++++
> 2 files changed, 681 insertions(+)
> create mode 100644 drivers/clk/samsung/clk-exynos7885.c
>
> diff --git a/drivers/clk/samsung/Makefile b/drivers/clk/samsung/Makefile
> index c46cf11e4d0b..149258b232a9 100644
> --- a/drivers/clk/samsung/Makefile
> +++ b/drivers/clk/samsung/Makefile
> @@ -18,6 +18,7 @@ obj-$(CONFIG_EXYNOS_AUDSS_CLK_CON) += clk-exynos-audss.o
> obj-$(CONFIG_EXYNOS_CLKOUT) += clk-exynos-clkout.o
> obj-$(CONFIG_EXYNOS_ARM64_COMMON_CLK) += clk-exynos7.o
> obj-$(CONFIG_EXYNOS_ARM64_COMMON_CLK) += clk-exynos850.o
> +obj-$(CONFIG_EXYNOS_ARM64_COMMON_CLK) += clk-exynos7885.o
> obj-$(CONFIG_S3C2410_COMMON_CLK)+= clk-s3c2410.o
> obj-$(CONFIG_S3C2410_COMMON_DCLK)+= clk-s3c2410-dclk.o
> obj-$(CONFIG_S3C2412_COMMON_CLK)+= clk-s3c2412.o
> diff --git a/drivers/clk/samsung/clk-exynos7885.c b/drivers/clk/samsung/clk-exynos7885.c
> new file mode 100644
> index 000000000000..088f36e64609
> --- /dev/null
> +++ b/drivers/clk/samsung/clk-exynos7885.c
> @@ -0,0 +1,680 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (C) 2021 Linaro Ltd.
> + * Copyright (C) 2021 Dávid Virág <virag.david003@xxxxxxxxx>
> + * Author: Sam Protsenko <semen.protsenko@xxxxxxxxxx>
> + * Author: Dávid Virág <virag.david003@xxxxxxxxx>
> + *
> + * Common Clock Framework support for Exynos7885 SoC.
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/clk-provider.h>
> +#include <linux/of.h>
> +#include <linux/of_address.h>
> +#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> +
> +#include <dt-bindings/clock/exynos7885.h>
> +
> +#include "clk.h"
> +
> +/* Gate register bits */
> +#define GATE_MANUAL BIT(20)
> +#define GATE_ENABLE_HWACG BIT(28)
> +
> +/* Gate register offsets range */
> +#define GATE_OFF_START 0x2000
> +#define GATE_OFF_END 0x2fff
> +
> +/**
> + * exynos7885_init_clocks - Set clocks initial configuration
> + * @np: CMU device tree node with "reg" property (CMU addr)
> + * @reg_offs: Register offsets array for clocks to init
> + * @reg_offs_len: Number of register offsets in reg_offs array
> + *
> + * Set manual control mode for all gate clocks.
> + */
> +static void __init exynos7885_init_clocks(struct device_node *np,
> + const unsigned long *reg_offs, size_t reg_offs_len)
> +{
> + void __iomem *reg_base;
> + size_t i;
> +
> + reg_base = of_iomap(np, 0);
> + if (!reg_base)
> + panic("%s: failed to map registers\n", __func__);
> +
> + for (i = 0; i < reg_offs_len; ++i) {
> + void __iomem *reg = reg_base + reg_offs[i];
> + u32 val;
> +
> + /* Modify only gate clock registers */
> + if (reg_offs[i] < GATE_OFF_START || reg_offs[i] > GATE_OFF_END)
> + continue;
> +
> + val = readl(reg);
> + val |= GATE_MANUAL;
> + val &= ~GATE_ENABLE_HWACG;
> + writel(val, reg);
> + }
> +
> + iounmap(reg_base);
> +}
> +
> +/**
> + * exynos7885_register_cmu - Register specified Exynos7885 CMU domain
> + * @dev: Device object; may be NULL if this function is not being
> + * called from platform driver probe function
> + * @np: CMU device tree node
> + * @cmu: CMU data
> + *
> + * Register specified CMU domain, which includes next steps:
> + *
> + * 1. Enable parent clock of @cmu CMU
> + * 2. Set initial registers configuration for @cmu CMU clocks
> + * 3. Register @cmu CMU clocks using Samsung clock framework API
> + */
> +static void __init exynos7885_register_cmu(struct device *dev,
> + struct device_node *np, const struct samsung_cmu_info *cmu)
> +{
> + /* Keep CMU parent clock running (needed for CMU registers access) */
> + if (cmu->clk_name) {
> + struct clk *parent_clk;
> +
> + if (dev)
> + parent_clk = clk_get(dev, cmu->clk_name);
> + else
> + parent_clk = of_clk_get_by_name(np, cmu->clk_name);
> +
> + if (IS_ERR(parent_clk)) {
> + pr_err("%s: could not find bus clock %s; err = %ld\n",
> + __func__, cmu->clk_name, PTR_ERR(parent_clk));
> + } else {
> + clk_prepare_enable(parent_clk);
> + }
> + }
> +
> + exynos7885_init_clocks(np, cmu->clk_regs, cmu->nr_clk_regs);
> + samsung_cmu_register_one(np, cmu);
> +}
All this looks exactly the same as Exynos850, so this should be shared.
Could be a new file - clk-exynos-arm64.c
> +
> +/* ---- CMU_TOP ------------------------------------------------------------- */
> +
> +/* Register Offset definitions for CMU_TOP (0x12060000) */
> +#define PLL_LOCKTIME_PLL_SHARED0 0x0000
> +#define PLL_LOCKTIME_PLL_SHARED1 0x0004
> +#define PLL_CON0_PLL_SHARED0 0x0100
> +#define PLL_CON0_PLL_SHARED1 0x0120
> +#define CLK_CON_MUX_MUX_CLKCMU_CORE_BUS 0x1014
> +#define CLK_CON_MUX_MUX_CLKCMU_CORE_CCI 0x1018
> +#define CLK_CON_MUX_MUX_CLKCMU_CORE_G3D 0x101c
> +#define CLK_CON_MUX_MUX_CLKCMU_PERI_BUS 0x1058
> +#define CLK_CON_MUX_MUX_CLKCMU_PERI_SPI0 0x105c
> +#define CLK_CON_MUX_MUX_CLKCMU_PERI_SPI1 0x1060
> +#define CLK_CON_MUX_MUX_CLKCMU_PERI_UART0 0x1064
> +#define CLK_CON_MUX_MUX_CLKCMU_PERI_UART1 0x1068
> +#define CLK_CON_MUX_MUX_CLKCMU_PERI_UART2 0x106c
> +#define CLK_CON_MUX_MUX_CLKCMU_PERI_USI0 0x1070
> +#define CLK_CON_MUX_MUX_CLKCMU_PERI_USI1 0x1074
> +#define CLK_CON_MUX_MUX_CLKCMU_PERI_USI2 0x1078
> +#define CLK_CON_DIV_CLKCMU_CORE_BUS 0x181c
> +#define CLK_CON_DIV_CLKCMU_CORE_CCI 0x1820
> +#define CLK_CON_DIV_CLKCMU_CORE_G3D 0x1824
> +#define CLK_CON_DIV_CLKCMU_PERI_BUS 0x1874
> +#define CLK_CON_DIV_CLKCMU_PERI_SPI0 0x1878
> +#define CLK_CON_DIV_CLKCMU_PERI_SPI1 0x187c
> +#define CLK_CON_DIV_CLKCMU_PERI_UART0 0x1880
> +#define CLK_CON_DIV_CLKCMU_PERI_UART1 0x1884
> +#define CLK_CON_DIV_CLKCMU_PERI_UART2 0x1888
> +#define CLK_CON_DIV_CLKCMU_PERI_USI0 0x188c
> +#define CLK_CON_DIV_CLKCMU_PERI_USI1 0x1890
> +#define CLK_CON_DIV_CLKCMU_PERI_USI2 0x1894
> +#define CLK_CON_DIV_PLL_SHARED0_DIV2 0x189c
> +#define CLK_CON_DIV_PLL_SHARED0_DIV3 0x18a0
> +#define CLK_CON_DIV_PLL_SHARED0_DIV4 0x18a4
> +#define CLK_CON_DIV_PLL_SHARED0_DIV5 0x18a8
> +#define CLK_CON_DIV_PLL_SHARED1_DIV2 0x18ac
> +#define CLK_CON_DIV_PLL_SHARED1_DIV3 0x18b0
> +#define CLK_CON_DIV_PLL_SHARED1_DIV4 0x18b4
> +#define CLK_CON_GAT_GATE_CLKCMUC_PERI_UART1 0x2004
> +#define CLK_CON_GAT_GATE_CLKCMU_CORE_BUS 0x201c
> +#define CLK_CON_GAT_GATE_CLKCMU_CORE_CCI 0x2020
> +#define CLK_CON_GAT_GATE_CLKCMU_CORE_G3D 0x2024
> +#define CLK_CON_GAT_GATE_CLKCMU_PERI_BUS 0x207c
> +#define CLK_CON_GAT_GATE_CLKCMU_PERI_SPI0 0x2080
> +#define CLK_CON_GAT_GATE_CLKCMU_PERI_SPI1 0x2084
> +#define CLK_CON_GAT_GATE_CLKCMU_PERI_UART0 0x2088
> +#define CLK_CON_GAT_GATE_CLKCMU_PERI_UART2 0x208c
> +#define CLK_CON_GAT_GATE_CLKCMU_PERI_USI0 0x2090
> +#define CLK_CON_GAT_GATE_CLKCMU_PERI_USI1 0x2094
> +#define CLK_CON_GAT_GATE_CLKCMU_PERI_USI2 0x2098
> +
> +static const unsigned long top_clk_regs[] __initconst = {
> + PLL_LOCKTIME_PLL_SHARED0,
> + PLL_LOCKTIME_PLL_SHARED1,
> + PLL_CON0_PLL_SHARED0,
> + PLL_CON0_PLL_SHARED1,
> + CLK_CON_MUX_MUX_CLKCMU_CORE_BUS,
> + CLK_CON_MUX_MUX_CLKCMU_CORE_CCI,
> + CLK_CON_MUX_MUX_CLKCMU_CORE_G3D,
> + CLK_CON_MUX_MUX_CLKCMU_PERI_BUS,
> + CLK_CON_MUX_MUX_CLKCMU_PERI_SPI0,
> + CLK_CON_MUX_MUX_CLKCMU_PERI_SPI1,
> + CLK_CON_MUX_MUX_CLKCMU_PERI_UART0,
> + CLK_CON_MUX_MUX_CLKCMU_PERI_UART1,
> + CLK_CON_MUX_MUX_CLKCMU_PERI_UART2,
> + CLK_CON_MUX_MUX_CLKCMU_PERI_USI0,
> + CLK_CON_MUX_MUX_CLKCMU_PERI_USI1,
> + CLK_CON_MUX_MUX_CLKCMU_PERI_USI2,
> + CLK_CON_DIV_CLKCMU_CORE_BUS,
> + CLK_CON_DIV_CLKCMU_CORE_CCI,
> + CLK_CON_DIV_CLKCMU_CORE_G3D,
> + CLK_CON_DIV_CLKCMU_PERI_BUS,
> + CLK_CON_DIV_CLKCMU_PERI_SPI0,
> + CLK_CON_DIV_CLKCMU_PERI_SPI1,
> + CLK_CON_DIV_CLKCMU_PERI_UART0,
> + CLK_CON_DIV_CLKCMU_PERI_UART1,
> + CLK_CON_DIV_CLKCMU_PERI_UART2,
> + CLK_CON_DIV_CLKCMU_PERI_USI0,
> + CLK_CON_DIV_CLKCMU_PERI_USI1,
> + CLK_CON_DIV_CLKCMU_PERI_USI2,
> + CLK_CON_DIV_PLL_SHARED0_DIV2,
> + CLK_CON_DIV_PLL_SHARED0_DIV3,
> + CLK_CON_DIV_PLL_SHARED0_DIV4,
> + CLK_CON_DIV_PLL_SHARED0_DIV5,
> + CLK_CON_DIV_PLL_SHARED1_DIV2,
> + CLK_CON_DIV_PLL_SHARED1_DIV3,
> + CLK_CON_DIV_PLL_SHARED1_DIV4,
> + CLK_CON_GAT_GATE_CLKCMUC_PERI_UART1,
> + CLK_CON_GAT_GATE_CLKCMU_CORE_BUS,
> + CLK_CON_GAT_GATE_CLKCMU_CORE_CCI,
> + CLK_CON_GAT_GATE_CLKCMU_CORE_G3D,
> + CLK_CON_GAT_GATE_CLKCMU_PERI_BUS,
> + CLK_CON_GAT_GATE_CLKCMU_PERI_SPI0,
> + CLK_CON_GAT_GATE_CLKCMU_PERI_SPI1,
> + CLK_CON_GAT_GATE_CLKCMU_PERI_UART0,
> + CLK_CON_GAT_GATE_CLKCMU_PERI_UART2,
> + CLK_CON_GAT_GATE_CLKCMU_PERI_USI0,
> + CLK_CON_GAT_GATE_CLKCMU_PERI_USI1,
> + CLK_CON_GAT_GATE_CLKCMU_PERI_USI2,
> +};
> +
> +static const struct samsung_pll_clock top_pll_clks[] __initconst = {
> + PLL(pll_1417x, CLK_FOUT_SHARED0_PLL, "fout_shared0_pll", "oscclk",
> + PLL_LOCKTIME_PLL_SHARED0, PLL_CON0_PLL_SHARED0,
> + NULL),
> + PLL(pll_1417x, CLK_FOUT_SHARED1_PLL, "fout_shared1_pll", "oscclk",
> + PLL_LOCKTIME_PLL_SHARED1, PLL_CON0_PLL_SHARED1,
> + NULL),
> +};
> +
> +/* List of parent clocks for Muxes in CMU_TOP: for CMU_CORE */
> +PNAME(mout_core_bus_p) = { "dout_shared0_div2", "dout_shared1_div2",
> + "dout_shared0_div3", "dout_shared0_div3" };
> +PNAME(mout_core_cci_p) = { "dout_shared0_div2", "dout_shared1_div2",
> + "dout_shared0_div3", "dout_shared0_div3" };
> +PNAME(mout_core_g3d_p) = { "dout_shared0_div2", "dout_shared1_div2",
> + "dout_shared0_div3", "dout_shared0_div3" };
> +
> +/* List of parent clocks for Muxes in CMU_TOP: for CMU_PERI */
> +PNAME(mout_peri_bus_p) = { "dout_shared0_div4", "dout_shared1_div4" };
> +PNAME(mout_peri_spi0_p) = { "oscclk", "dout_shared0_div4" };
> +PNAME(mout_peri_spi1_p) = { "oscclk", "dout_shared0_div4" };
> +PNAME(mout_peri_uart0_p) = { "oscclk", "dout_shared0_div4" };
> +PNAME(mout_peri_uart1_p) = { "oscclk", "dout_shared0_div4" };
> +PNAME(mout_peri_uart2_p) = { "oscclk", "dout_shared0_div4" };
> +PNAME(mout_peri_usi0_p) = { "oscclk", "dout_shared0_div4" };
> +PNAME(mout_peri_usi1_p) = { "oscclk", "dout_shared0_div4" };
> +PNAME(mout_peri_usi2_p) = { "oscclk", "dout_shared0_div4" };
> +
> +
No need for double line break.
Best regards,
Krzysztof
