| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <3341127.44csPzL39Z@jernej-laptop>
Date: Tue, 18 Feb 2025 20:03:38 +0100
From: Jernej Škrabec <jernej.skrabec@...il.com>
To: Michael Turquette <mturquette@...libre.com>,
Stephen Boyd <sboyd@...nel.org>, Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>, Conor Dooley <conor+dt@...nel.org>,
Chen-Yu Tsai <wens@...e.org>, Samuel Holland <samuel@...lland.org>,
Andre Przywara <andre.przywara@....com>
Cc: Philipp Zabel <p.zabel@...gutronix.de>, linux-clk@...r.kernel.org,
devicetree@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-sunxi@...ts.linux.dev, linux-kernel@...r.kernel.org
Subject:
Re: [PATCH v2 05/15] clk: sunxi-ng: Add support for the A523/T527 CCU PLLs
Dne petek, 14. februar 2025 ob 13:53:49 Srednjeevropski standardni čas je Andre Przywara napisal(a):
> Add the PLL clocks of the main CCU of the Allwinner A523 and T527 SoCs.
> The clocks were modelled after the A523 and T527 manual, and double
> checked by writing all 1's into the respective register, to spot all
> implemented bits.
>
> The PLL and mod clocks for the two CPU clusters and the DSU are part of
> a separate CCU, also most audio clocks are collected in a DSP CCU, so
> both of these clock groups are missing from this driver.
>
> Signed-off-by: Andre Przywara <andre.przywara@....com>
> ---
> drivers/clk/sunxi-ng/Kconfig | 5 +
> drivers/clk/sunxi-ng/Makefile | 2 +
> drivers/clk/sunxi-ng/ccu-sun55i-a523.c | 481 +++++++++++++++++++++++++
> drivers/clk/sunxi-ng/ccu-sun55i-a523.h | 14 +
> drivers/clk/sunxi-ng/ccu_mp.h | 14 +-
> 5 files changed, 510 insertions(+), 6 deletions(-)
> create mode 100644 drivers/clk/sunxi-ng/ccu-sun55i-a523.c
> create mode 100644 drivers/clk/sunxi-ng/ccu-sun55i-a523.h
>
> diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig
> index b547198a2c654..04efbda847cf9 100644
> --- a/drivers/clk/sunxi-ng/Kconfig
> +++ b/drivers/clk/sunxi-ng/Kconfig
> @@ -52,6 +52,11 @@ config SUN50I_H6_R_CCU
> default y
> depends on ARM64 || COMPILE_TEST
>
> +config SUN55I_A523_CCU
> + tristate "Support for the Allwinner A523/T527 CCU"
> + default y
> + depends on ARM64 || COMPILE_TEST
> +
> config SUN4I_A10_CCU
> tristate "Support for the Allwinner A10/A20 CCU"
> default y
> diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile
> index 6b3ae2b620db6..01a887f7824bb 100644
> --- a/drivers/clk/sunxi-ng/Makefile
> +++ b/drivers/clk/sunxi-ng/Makefile
> @@ -33,6 +33,7 @@ obj-$(CONFIG_SUN50I_A100_R_CCU) += sun50i-a100-r-ccu.o
> obj-$(CONFIG_SUN50I_H6_CCU) += sun50i-h6-ccu.o
> obj-$(CONFIG_SUN50I_H6_R_CCU) += sun50i-h6-r-ccu.o
> obj-$(CONFIG_SUN50I_H616_CCU) += sun50i-h616-ccu.o
> +obj-$(CONFIG_SUN55I_A523_CCU) += sun55i-a523-ccu.o
> obj-$(CONFIG_SUN4I_A10_CCU) += sun4i-a10-ccu.o
> obj-$(CONFIG_SUN5I_CCU) += sun5i-ccu.o
> obj-$(CONFIG_SUN6I_A31_CCU) += sun6i-a31-ccu.o
> @@ -58,6 +59,7 @@ sun50i-a100-r-ccu-y += ccu-sun50i-a100-r.o
> sun50i-h6-ccu-y += ccu-sun50i-h6.o
> sun50i-h6-r-ccu-y += ccu-sun50i-h6-r.o
> sun50i-h616-ccu-y += ccu-sun50i-h616.o
> +sun55i-a523-ccu-y += ccu-sun55i-a523.o
> sun4i-a10-ccu-y += ccu-sun4i-a10.o
> sun5i-ccu-y += ccu-sun5i.o
> sun6i-a31-ccu-y += ccu-sun6i-a31.o
> diff --git a/drivers/clk/sunxi-ng/ccu-sun55i-a523.c b/drivers/clk/sunxi-ng/ccu-sun55i-a523.c
> new file mode 100644
> index 0000000000000..8374e841e9d82
> --- /dev/null
> +++ b/drivers/clk/sunxi-ng/ccu-sun55i-a523.c
> @@ -0,0 +1,481 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2023-2024 Arm Ltd.
> + * Based on the D1 CCU driver:
> + * Copyright (c) 2020 huangzhenwei@...winnertech.com
> + * Copyright (C) 2021 Samuel Holland <samuel@...lland.org>
> + */
> +
> +#include <linux/clk-provider.h>
> +#include <linux/io.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +
> +#include "../clk.h"
> +
> +#include "ccu_common.h"
> +#include "ccu_reset.h"
> +
> +#include "ccu_div.h"
> +#include "ccu_gate.h"
> +#include "ccu_mp.h"
> +#include "ccu_mult.h"
> +#include "ccu_nk.h"
> +#include "ccu_nkm.h"
> +#include "ccu_nkmp.h"
> +#include "ccu_nm.h"
> +
> +#include "ccu-sun55i-a523.h"
> +
> +/*
> + * The 24 MHz oscillator, the root of most of the clock tree.
> + * .fw_name is the string used in the DT "clock-names" property, used to
> + * identify the corresponding clock in the "clocks" property.
> + */
> +static const struct clk_parent_data osc24M[] = {
> + { .fw_name = "hosc" }
> +};
> +
> +/**************************************************************************
> + * PLLs *
> + **************************************************************************/
> +
> +/* Some PLLs are input * N / div1 / P. Model them as NKMP with no K */
> +#define SUN55I_A523_PLL_DDR0_REG 0x010
> +static struct ccu_nkmp pll_ddr0_clk = {
> + .enable = BIT(27),
> + .lock = BIT(28),
> + .n = _SUNXI_CCU_MULT_MIN(8, 8, 11),
> + .m = _SUNXI_CCU_DIV(1, 1), /* input divider */
Newer manuals, for example A523 manual v1.4, don't mention input dividers anymore.
Newer BSP driver doesn't have them either. Should we drop them (for all PLLs)?
> + .p = _SUNXI_CCU_DIV(0, 1), /* output divider */
> + .common = {
> + .reg = 0x010,
> + .hw.init = CLK_HW_INIT_PARENTS_DATA("pll-ddr0", osc24M,
> + &ccu_nkmp_ops,
> + CLK_SET_RATE_GATE |
> + CLK_IS_CRITICAL),
> + },
> +};
> +
> +/*
> + * There is no actual clock output with that frequency (2.4 GHz), instead it
> + * has multiple outputs with adjustable dividers from that base frequency.
> + * Model them separately as divider clocks based on that parent here.
> + */
> +#define SUN55I_A523_PLL_PERIPH0_REG 0x020
> +static struct ccu_nm pll_periph0_4x_clk = {
> + .enable = BIT(27),
> + .lock = BIT(28),
> + .n = _SUNXI_CCU_MULT_MIN(8, 8, 11),
> + .m = _SUNXI_CCU_DIV(1, 1), /* input divider */
> + .common = {
> + .reg = 0x020,
> + .hw.init = CLK_HW_INIT_PARENTS_DATA("pll-periph0-4x",
> + osc24M, &ccu_nm_ops,
> + CLK_SET_RATE_GATE),
> + },
> +};
> +/*
> + * Most clock-defining macros expect an *array* of parent clocks, even if
> + * they do not contain a muxer to select between different parents.
> + * The macros ending in just _HW take a simple clock pointer, but then create
> + * a single-entry array out of that. The macros using _HWS take such an
> + * array (even when it is a single entry one), this avoids having those
> + * helper arrays created inside *every* clock definition.
> + * This means for every clock that is referenced more than once it is
> + * useful to create such a dummy array and use _HWS.
> + */
> +static const struct clk_hw *pll_periph0_4x_hws[] = {
> + &pll_periph0_4x_clk.common.hw
> +};
> +
> +static SUNXI_CCU_M_HWS(pll_periph0_2x_clk, "pll-periph0-2x",
> + pll_periph0_4x_hws, 0x020, 16, 3, 0);
> +static const struct clk_hw *pll_periph0_2x_hws[] = {
> + &pll_periph0_2x_clk.common.hw
> +};
> +static SUNXI_CCU_M_HWS(pll_periph0_800M_clk, "pll-periph0-800M",
> + pll_periph0_4x_hws, 0x020, 20, 3, 0);
> +static SUNXI_CCU_M_HWS(pll_periph0_480M_clk, "pll-periph0-480M",
> + pll_periph0_4x_hws, 0x020, 2, 3, 0);
> +static const struct clk_hw *pll_periph0_480M_hws[] = {
> + &pll_periph0_480M_clk.common.hw
> +};
> +static CLK_FIXED_FACTOR_HWS(pll_periph0_600M_clk, "pll-periph0-600M",
> + pll_periph0_2x_hws, 2, 1, 0);
> +static CLK_FIXED_FACTOR_HWS(pll_periph0_400M_clk, "pll-periph0-400M",
> + pll_periph0_2x_hws, 3, 1, 0);
> +static CLK_FIXED_FACTOR_HWS(pll_periph0_300M_clk, "pll-periph0-300M",
> + pll_periph0_2x_hws, 4, 1, 0);
> +static CLK_FIXED_FACTOR_HWS(pll_periph0_200M_clk, "pll-periph0-200M",
> + pll_periph0_2x_hws, 6, 1, 0);
> +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);
> +
> +#define SUN55I_A523_PLL_PERIPH1_REG 0x028
> +static struct ccu_nm pll_periph1_4x_clk = {
> + .enable = BIT(27),
> + .lock = BIT(28),
> + .n = _SUNXI_CCU_MULT_MIN(8, 8, 11),
> + .m = _SUNXI_CCU_DIV(1, 1), /* input divider */
> + .common = {
> + .reg = 0x028,
> + .hw.init = CLK_HW_INIT_PARENTS_DATA("pll-periph1-4x",
> + osc24M, &ccu_nm_ops,
> + CLK_SET_RATE_GATE),
> + },
> +};
> +
> +static const struct clk_hw *pll_periph1_4x_hws[] = {
> + &pll_periph1_4x_clk.common.hw
> +};
> +static SUNXI_CCU_M_HWS(pll_periph1_2x_clk, "pll-periph1-2x",
> + pll_periph1_4x_hws, 0x028, 16, 3, 0);
> +static SUNXI_CCU_M_HWS(pll_periph1_800M_clk, "pll-periph1-800M",
> + pll_periph1_4x_hws, 0x028, 20, 3, 0);
> +static SUNXI_CCU_M_HWS(pll_periph1_480M_clk, "pll-periph1-480M",
> + pll_periph1_4x_hws, 0x028, 2, 3, 0);
> +
> +static const struct clk_hw *pll_periph1_2x_hws[] = {
> + &pll_periph1_2x_clk.common.hw
> +};
> +static CLK_FIXED_FACTOR_HWS(pll_periph1_600M_clk, "pll-periph1-600M",
> + pll_periph1_2x_hws, 2, 1, 0);
> +static CLK_FIXED_FACTOR_HWS(pll_periph1_400M_clk, "pll-periph1-400M",
> + pll_periph1_2x_hws, 3, 1, 0);
> +static CLK_FIXED_FACTOR_HWS(pll_periph1_300M_clk, "pll-periph1-300M",
> + pll_periph1_2x_hws, 4, 1, 0);
> +static CLK_FIXED_FACTOR_HWS(pll_periph1_200M_clk, "pll-periph1-200M",
> + pll_periph1_2x_hws, 6, 1, 0);
> +static CLK_FIXED_FACTOR_HWS(pll_periph1_150M_clk, "pll-periph1-150M",
> + pll_periph1_2x_hws, 8, 1, 0);
> +static const struct clk_hw *pll_periph1_480M_hws[] = {
> + &pll_periph1_480M_clk.common.hw
> +};
> +static CLK_FIXED_FACTOR_HWS(pll_periph1_160M_clk, "pll-periph1-160M",
> + pll_periph1_480M_hws, 3, 1, 0);
> +
> +#define SUN55I_A523_PLL_GPU_REG 0x030
> +static struct ccu_nkmp pll_gpu_clk = {
> + .enable = BIT(27),
> + .lock = BIT(28),
> + .n = _SUNXI_CCU_MULT_MIN(8, 8, 11),
> + .m = _SUNXI_CCU_DIV(1, 1), /* input divider */
> + .p = _SUNXI_CCU_DIV(0, 1), /* output divider */
> + .common = {
> + .reg = 0x030,
> + .hw.init = CLK_HW_INIT_PARENTS_DATA("pll-gpu", osc24M,
> + &ccu_nkmp_ops,
> + CLK_SET_RATE_GATE),
> + },
> +};
> +
> +#define SUN55I_A523_PLL_VIDEO0_REG 0x040
> +static struct ccu_nm pll_video0_8x_clk = {
> + .enable = BIT(27),
> + .lock = BIT(28),
> + .n = _SUNXI_CCU_MULT_MIN(8, 8, 11),
> + .m = _SUNXI_CCU_DIV(1, 1), /* input divider */
> + .common = {
> + .reg = 0x040,
> + .hw.init = CLK_HW_INIT_PARENTS_DATA("pll-video0-8x",
> + osc24M, &ccu_nm_ops,
> + CLK_SET_RATE_GATE),
> + },
> +};
> +
> +static const struct clk_hw *pll_video0_8x_hws[] = {
> + &pll_video0_8x_clk.common.hw
> +};
> +static SUNXI_CCU_M_HWS(pll_video0_4x_clk, "pll-video0-4x",
> + pll_video0_8x_hws, 0x040, 0, 1, 0);
> +static CLK_FIXED_FACTOR_HWS(pll_video0_3x_clk, "pll-video0-3x",
> + pll_video0_8x_hws, 3, 1, CLK_SET_RATE_PARENT);
> +
> +#define SUN55I_A523_PLL_VIDEO1_REG 0x048
> +static struct ccu_nm pll_video1_8x_clk = {
> + .enable = BIT(27),
> + .lock = BIT(28),
> + .n = _SUNXI_CCU_MULT_MIN(8, 8, 11),
> + .m = _SUNXI_CCU_DIV(1, 1), /* input divider */
> + .common = {
> + .reg = 0x048,
> + .hw.init = CLK_HW_INIT_PARENTS_DATA("pll-video1-8x",
> + osc24M, &ccu_nm_ops,
> + CLK_SET_RATE_GATE),
> + },
> +};
> +
> +static const struct clk_hw *pll_video1_8x_hws[] = {
> + &pll_video1_8x_clk.common.hw
> +};
> +static SUNXI_CCU_M_HWS(pll_video1_4x_clk, "pll-video1-4x",
> + pll_video1_8x_hws, 0x048, 0, 1, 0);
> +static CLK_FIXED_FACTOR_HWS(pll_video1_3x_clk, "pll-video1-3x",
> + pll_video1_8x_hws, 3, 1, CLK_SET_RATE_PARENT);
> +
> +#define SUN55I_A523_PLL_VIDEO2_REG 0x050
> +static struct ccu_nm pll_video2_8x_clk = {
> + .enable = BIT(27),
> + .lock = BIT(28),
> + .n = _SUNXI_CCU_MULT_MIN(8, 8, 11),
> + .m = _SUNXI_CCU_DIV(1, 1), /* input divider */
> + .common = {
> + .reg = 0x050,
> + .hw.init = CLK_HW_INIT_PARENTS_DATA("pll-video2-8x",
> + osc24M, &ccu_nm_ops,
> + CLK_SET_RATE_GATE),
> + },
> +};
> +
> +static const struct clk_hw *pll_video2_8x_hws[] = {
> + &pll_video2_8x_clk.common.hw
> +};
> +static SUNXI_CCU_M_HWS(pll_video2_4x_clk, "pll-video2-4x",
> + pll_video2_8x_hws, 0x050, 0, 1, 0);
> +static CLK_FIXED_FACTOR_HWS(pll_video2_3x_clk, "pll-video2-3x",
> + pll_video2_8x_hws, 3, 1, CLK_SET_RATE_PARENT);
> +
> +#define SUN55I_A523_PLL_VE_REG 0x058
> +static struct ccu_nkmp pll_ve_clk = {
> + .enable = BIT(27),
> + .lock = BIT(28),
> + .n = _SUNXI_CCU_MULT_MIN(8, 8, 11),
> + .m = _SUNXI_CCU_DIV(1, 1), /* input divider */
> + .p = _SUNXI_CCU_DIV(0, 1), /* output divider */
> + .common = {
> + .reg = 0x058,
> + .hw.init = CLK_HW_INIT_PARENTS_DATA("pll-ve", osc24M,
> + &ccu_nkmp_ops,
> + CLK_SET_RATE_GATE),
> + },
> +};
> +
> +#define SUN55I_A523_PLL_VIDEO3_REG 0x068
> +static struct ccu_nm pll_video3_8x_clk = {
> + .enable = BIT(27),
> + .lock = BIT(28),
> + .n = _SUNXI_CCU_MULT_MIN(8, 8, 11),
> + .m = _SUNXI_CCU_DIV(1, 1), /* input divider */
> + .common = {
> + .reg = 0x068,
> + .hw.init = CLK_HW_INIT_PARENTS_DATA("pll-video3-8x",
> + osc24M, &ccu_nm_ops,
> + CLK_SET_RATE_GATE),
> + },
> +};
> +
> +static const struct clk_hw *pll_video3_8x_hws[] = {
> + &pll_video3_8x_clk.common.hw
> +};
> +static SUNXI_CCU_M_HWS(pll_video3_4x_clk, "pll-video3-4x",
> + pll_video3_8x_hws, 0x068, 0, 1, 0);
> +static CLK_FIXED_FACTOR_HWS(pll_video3_3x_clk, "pll-video3-3x",
> + pll_video3_8x_hws, 3, 1, CLK_SET_RATE_PARENT);
> +
> +/*
> + * PLL_AUDIO0 has m0, m1 dividers in addition to the usual N, M factors.
> + * Since we only need some fixed frequency from this PLL (22.5792MHz x 4 and
> + * 24.576MHz x 4), ignore those dividers and force both of them to 1 (encoded
> + * as 0), in the probe function below.
> + * The M factor must be an even number to produce a 50% duty cycle output.
> + */
> +#define SUN55I_A523_PLL_AUDIO0_REG 0x078
> +static struct ccu_sdm_setting pll_audio0_sdm_table[] = {
> + { .rate = 90316800, .pattern = 0xc000872b, .m = 20, .n = 75 },
> + { .rate = 98304000, .pattern = 0xc0004dd3, .m = 12, .n = 49 },
> +
> +};
> +
> +static struct ccu_nm pll_audio0_4x_clk = {
> + .enable = BIT(27),
> + .lock = BIT(28),
> + .n = _SUNXI_CCU_MULT_MIN(8, 8, 11),
> + .m = _SUNXI_CCU_DIV(16, 6),
> + .sdm = _SUNXI_CCU_SDM(pll_audio0_sdm_table, BIT(24),
> + 0x178, BIT(31)),
> + .min_rate = 180000000U,
> + .max_rate = 3000000000U,
> + .common = {
> + .reg = 0x078,
> + .features = CCU_FEATURE_SIGMA_DELTA_MOD,
> + .hw.init = CLK_HW_INIT_PARENTS_DATA("pll-audio0-4x",
> + osc24M, &ccu_nm_ops,
> + CLK_SET_RATE_GATE),
> + },
> +};
> +
> +static CLK_FIXED_FACTOR_HW(pll_audio0_2x_clk, "pll-audio0-2x",
> + &pll_audio0_4x_clk.common.hw, 2, 1, 0);
> +static CLK_FIXED_FACTOR_HW(pll_audio0_clk, "pll-audio0",
> + &pll_audio0_4x_clk.common.hw, 4, 1, 0);
> +
> +#define SUN55I_A523_PLL_NPU_REG 0x080
> +static struct ccu_nm pll_npu_4x_clk = {
> + .enable = BIT(27),
> + .lock = BIT(28),
> + .n = _SUNXI_CCU_MULT_MIN(8, 8, 11),
> + .m = _SUNXI_CCU_DIV(1, 1), /* input divider */
> + .common = {
> + .reg = 0x0080,
> + .hw.init = CLK_HW_INIT_PARENTS_DATA("pll-npu-4x",
> + osc24M, &ccu_nm_ops,
> + CLK_SET_RATE_GATE),
> + },
> +};
> +static CLK_FIXED_FACTOR_HW(pll_npu_2x_clk, "pll-npu-2x",
> + &pll_npu_4x_clk.common.hw, 2, 1, CLK_SET_RATE_PARENT);
> +
> +static CLK_FIXED_FACTOR_HW(pll_npu_1x_clk, "pll-npu-1x",
> + &pll_npu_4x_clk.common.hw, 4, 1, 0);
> +
> +/*
> + * Contains all clocks that are controlled by a hardware register. They
> + * have a (sunxi) .common member, which needs to be initialised by the common
> + * sunxi CCU code, to be filled with the MMIO base address and the shared lock.
> + */
> +static struct ccu_common *sun55i_a523_ccu_clks[] = {
> + &pll_ddr0_clk.common,
> + &pll_periph0_4x_clk.common,
> + &pll_periph0_2x_clk.common,
> + &pll_periph0_800M_clk.common,
> + &pll_periph0_480M_clk.common,
> + &pll_periph1_4x_clk.common,
> + &pll_periph1_2x_clk.common,
> + &pll_periph1_800M_clk.common,
> + &pll_periph1_480M_clk.common,
> + &pll_gpu_clk.common,
> + &pll_video0_8x_clk.common,
> + &pll_video0_4x_clk.common,
> + &pll_video1_8x_clk.common,
> + &pll_video1_4x_clk.common,
> + &pll_video2_8x_clk.common,
> + &pll_video2_4x_clk.common,
> + &pll_video3_8x_clk.common,
> + &pll_video3_4x_clk.common,
> + &pll_ve_clk.common,
> + &pll_audio0_4x_clk.common,
> + &pll_npu_4x_clk.common,
> +};
> +
> +static struct clk_hw_onecell_data sun55i_a523_hw_clks = {
> + .num = CLK_NUMBER,
> + .hws = {
> + [CLK_PLL_DDR0] = &pll_ddr0_clk.common.hw,
> + [CLK_PLL_PERIPH0_4X] = &pll_periph0_4x_clk.common.hw,
> + [CLK_PLL_PERIPH0_2X] = &pll_periph0_2x_clk.common.hw,
> + [CLK_PLL_PERIPH0_800M] = &pll_periph0_800M_clk.common.hw,
> + [CLK_PLL_PERIPH0_480M] = &pll_periph0_480M_clk.common.hw,
> + [CLK_PLL_PERIPH0_600M] = &pll_periph0_600M_clk.hw,
> + [CLK_PLL_PERIPH0_400M] = &pll_periph0_400M_clk.hw,
> + [CLK_PLL_PERIPH0_300M] = &pll_periph0_300M_clk.hw,
> + [CLK_PLL_PERIPH0_200M] = &pll_periph0_200M_clk.hw,
> + [CLK_PLL_PERIPH0_160M] = &pll_periph0_160M_clk.hw,
> + [CLK_PLL_PERIPH0_150M] = &pll_periph0_150M_clk.hw,
> + [CLK_PLL_PERIPH1_4X] = &pll_periph1_4x_clk.common.hw,
> + [CLK_PLL_PERIPH1_2X] = &pll_periph1_2x_clk.common.hw,
> + [CLK_PLL_PERIPH1_800M] = &pll_periph1_800M_clk.common.hw,
> + [CLK_PLL_PERIPH1_480M] = &pll_periph1_480M_clk.common.hw,
> + [CLK_PLL_PERIPH1_600M] = &pll_periph1_600M_clk.hw,
> + [CLK_PLL_PERIPH1_400M] = &pll_periph1_400M_clk.hw,
> + [CLK_PLL_PERIPH1_300M] = &pll_periph1_300M_clk.hw,
> + [CLK_PLL_PERIPH1_200M] = &pll_periph1_200M_clk.hw,
> + [CLK_PLL_PERIPH1_160M] = &pll_periph1_160M_clk.hw,
> + [CLK_PLL_PERIPH1_150M] = &pll_periph1_150M_clk.hw,
> + [CLK_PLL_VIDEO0_8X] = &pll_video0_8x_clk.common.hw,
> + [CLK_PLL_VIDEO0_4X] = &pll_video0_4x_clk.common.hw,
> + [CLK_PLL_VIDEO0_3X] = &pll_video0_3x_clk.hw,
> + [CLK_PLL_VIDEO1_8X] = &pll_video1_8x_clk.common.hw,
> + [CLK_PLL_VIDEO1_4X] = &pll_video1_4x_clk.common.hw,
> + [CLK_PLL_VIDEO1_3X] = &pll_video1_3x_clk.hw,
> + [CLK_PLL_VIDEO2_8X] = &pll_video2_8x_clk.common.hw,
> + [CLK_PLL_VIDEO2_4X] = &pll_video2_4x_clk.common.hw,
> + [CLK_PLL_VIDEO2_3X] = &pll_video2_3x_clk.hw,
> + [CLK_PLL_VIDEO3_8X] = &pll_video3_8x_clk.common.hw,
> + [CLK_PLL_VIDEO3_4X] = &pll_video3_4x_clk.common.hw,
> + [CLK_PLL_VIDEO3_3X] = &pll_video3_3x_clk.hw,
> + [CLK_PLL_VE] = &pll_ve_clk.common.hw,
> + [CLK_PLL_AUDIO0_4X] = &pll_audio0_4x_clk.common.hw,
> + [CLK_PLL_AUDIO0_2X] = &pll_audio0_2x_clk.hw,
> + [CLK_PLL_AUDIO0] = &pll_audio0_clk.hw,
> + [CLK_PLL_NPU_4X] = &pll_npu_4x_clk.common.hw,
> + [CLK_PLL_NPU_2X] = &pll_npu_2x_clk.hw,
> + [CLK_PLL_NPU] = &pll_npu_1x_clk.hw,
> + },
> +};
> +
> +static const struct sunxi_ccu_desc sun55i_a523_ccu_desc = {
> + .ccu_clks = sun55i_a523_ccu_clks,
> + .num_ccu_clks = ARRAY_SIZE(sun55i_a523_ccu_clks),
> +
> + .hw_clks = &sun55i_a523_hw_clks,
> +};
> +
> +static const u32 pll_regs[] = {
> + SUN55I_A523_PLL_DDR0_REG,
> + SUN55I_A523_PLL_PERIPH0_REG,
> + SUN55I_A523_PLL_PERIPH1_REG,
> + SUN55I_A523_PLL_GPU_REG,
> + SUN55I_A523_PLL_VIDEO0_REG,
> + SUN55I_A523_PLL_VIDEO1_REG,
> + SUN55I_A523_PLL_VIDEO2_REG,
> + SUN55I_A523_PLL_VE_REG,
> + SUN55I_A523_PLL_VIDEO3_REG,
> + SUN55I_A523_PLL_AUDIO0_REG,
> + SUN55I_A523_PLL_NPU_REG,
> +};
> +
> +static int sun55i_a523_ccu_probe(struct platform_device *pdev)
> +{
> + void __iomem *reg;
> + u32 val;
> + int i, ret;
> +
> + reg = devm_platform_ioremap_resource(pdev, 0);
> + if (IS_ERR(reg))
> + return PTR_ERR(reg);
> +
> + /*
> + * The PLL clock code does not model all bits, for instance it does
> + * not support a separate enable and gate bit. We present the
> + * gate bit(27) as the enable bit, but then have to set the
> + * PLL Enable, LDO Enable, and Lock Enable bits on all PLLs here.
> + */
> + for (i = 0; i < ARRAY_SIZE(pll_regs); i++) {
> + val = readl(reg + pll_regs[i]);
> + val |= BIT(31) | BIT(30) | BIT(29);
> + writel(val, reg + pll_regs[i]);
> + }
> +
> + /* Enforce m1 = 0, m0 = 0 for PLL_AUDIO0 */
> + val = readl(reg + SUN55I_A523_PLL_AUDIO0_REG);
> + val &= ~(BIT(1) | BIT(0));
> + writel(val, reg + SUN55I_A523_PLL_AUDIO0_REG);
> +
> + ret = devm_sunxi_ccu_probe(&pdev->dev, reg, &sun55i_a523_ccu_desc);
> + if (ret)
> + return ret;
> +
> + return 0;
> +}
> +
> +static const struct of_device_id sun55i_a523_ccu_ids[] = {
> + { .compatible = "allwinner,sun55i-a523-ccu" },
> + { }
> +};
> +
> +static struct platform_driver sun55i_a523_ccu_driver = {
> + .probe = sun55i_a523_ccu_probe,
> + .driver = {
> + .name = "sun55i-a523-ccu",
> + .suppress_bind_attrs = true,
> + .of_match_table = sun55i_a523_ccu_ids,
> + },
> +};
> +module_platform_driver(sun55i_a523_ccu_driver);
> +
> +MODULE_IMPORT_NS("SUNXI_CCU");
> +MODULE_DESCRIPTION("Support for the Allwinner A523 CCU");
> +MODULE_LICENSE("GPL");
> diff --git a/drivers/clk/sunxi-ng/ccu-sun55i-a523.h b/drivers/clk/sunxi-ng/ccu-sun55i-a523.h
> new file mode 100644
> index 0000000000000..fc8dd42f1b47b
> --- /dev/null
> +++ b/drivers/clk/sunxi-ng/ccu-sun55i-a523.h
> @@ -0,0 +1,14 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright 2024 Arm Ltd.
> + */
> +
> +#ifndef _CCU_SUN55I_A523_H
> +#define _CCU_SUN55I_A523_H
> +
> +#include <dt-bindings/clock/sun55i-a523-ccu.h>
> +#include <dt-bindings/reset/sun55i-a523-ccu.h>
> +
> +#define CLK_NUMBER (CLK_FANOUT2 + 1)
> +
> +#endif /* _CCU_SUN55I_A523_H */
> diff --git a/drivers/clk/sunxi-ng/ccu_mp.h b/drivers/clk/sunxi-ng/ccu_mp.h
> index 687bd2ec798e2..5311835a4db60 100644
> --- a/drivers/clk/sunxi-ng/ccu_mp.h
> +++ b/drivers/clk/sunxi-ng/ccu_mp.h
> @@ -100,20 +100,22 @@ struct ccu_mp {
These changes doesn't belong in this commit.
Other than that, this looks like a good start. Thanks!
Best regards,
Jernej
> _muxshift, _muxwidth, \
> 0, _flags)
>
> -#define SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT(_struct, _name, _parents, _reg, \
> +#define SUNXI_CCU_MP_MUX_GATE_POSTDIV_FEAT(_struct, _name, _parents, _reg, \
> _mshift, _mwidth, \
> _pshift, _pwidth, \
> _muxshift, _muxwidth, \
> - _gate, _flags, \
> - _features) \
> + _gate, _postdiv, \
> + _flags, _features) \
> struct ccu_mp _struct = { \
> .enable = _gate, \
> .m = _SUNXI_CCU_DIV(_mshift, _mwidth), \
> .p = _SUNXI_CCU_DIV(_pshift, _pwidth), \
> .mux = _SUNXI_CCU_MUX(_muxshift, _muxwidth), \
> + .fixed_post_div = _postdiv, \
> .common = { \
> .reg = _reg, \
> - .features = _features, \
> + .features = CCU_FEATURE_FIXED_POSTDIV | \
> + _features, \
> .hw.init = CLK_HW_INIT_PARENTS_DATA(_name, \
> _parents, \
> &ccu_mp_ops,\
> @@ -126,11 +128,11 @@ struct ccu_mp {
> _pshift, _pwidth, \
> _muxshift, _muxwidth, \
> _gate, _flags) \
> - SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT(_struct, _name, _parents, \
> + SUNXI_CCU_MP_MUX_GATE_POSTDIV_FEAT(_struct, _name, _parents, \
> _reg, _mshift, _mwidth, \
> _pshift, _pwidth, \
> _muxshift, _muxwidth, \
> - _gate, _flags, 0)
> + _gate, 1, _flags, 0)
>
> #define SUNXI_CCU_MP_DATA_WITH_MUX(_struct, _name, _parents, _reg, \
> _mshift, _mwidth, \
>
Powered by blists - more mailing lists