[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <2795929.mvXUDI8C0e@jernej-laptop>
Date: Thu, 11 Sep 2025 20:07:04 +0200
From: Jernej Škrabec <jernej.skrabec@...il.com>
To: Stephen Boyd <sboyd@...nel.org>, Chen-Yu Tsai <wens@...e.org>,
Jernej Skrabec <jernej@...nel.org>, Samuel Holland <samuel@...lland.org>,
Chen-Yu Tsai <wens@...nel.org>
Cc: Andre Przywara <andre.przywara@....com>, linux-sunxi@...ts.linux.dev,
linux-clk@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org
Subject:
Re: [PATCH v2 3/7] clk: sunxi-ng: sun55i-a523-ccu: Add missing NPU module
clock
Dne četrtek, 11. september 2025 ob 19:47:06 Srednjeevropski poletni čas je Chen-Yu Tsai napisal(a):
> From: Chen-Yu Tsai <wens@...e.org>
>
> The main clock controller on the A523/T527 has the NPU's module clock.
> It was missing from the original submission, likely because that was
> based on the A523 user manual; the A523 is marketed without the NPU.
>
> Also, merge the private header back into the driver code itself. The
> header only contains a macro containing the total number of clocks.
> This has to be updated every time a missing clock gets added. Having
> it in a separate file doesn't help the process. Instead just drop the
> macro, and thus the header no longer has any reason to exist.
>
> Also move the .num value to after the list of clks to make it obvious
> that it should be updated when new clks are added.
>
> Signed-off-by: Chen-Yu Tsai <wens@...e.org>
Reviewed-by: Jernej Skrabec <jernej.skrabec@...il.com>
Best regards,
Jernej
> ---
> Changes since v1:
> - Move .num to after list of clks
> ---
> drivers/clk/sunxi-ng/ccu-sun55i-a523.c | 21 ++++++++++++++++++---
> drivers/clk/sunxi-ng/ccu-sun55i-a523.h | 14 --------------
> 2 files changed, 18 insertions(+), 17 deletions(-)
> delete mode 100644 drivers/clk/sunxi-ng/ccu-sun55i-a523.h
>
> diff --git a/drivers/clk/sunxi-ng/ccu-sun55i-a523.c b/drivers/clk/sunxi-ng/ccu-sun55i-a523.c
> index 1a9a1cb869e2..acb532f8361b 100644
> --- a/drivers/clk/sunxi-ng/ccu-sun55i-a523.c
> +++ b/drivers/clk/sunxi-ng/ccu-sun55i-a523.c
> @@ -11,6 +11,9 @@
> #include <linux/module.h>
> #include <linux/platform_device.h>
>
> +#include <dt-bindings/clock/sun55i-a523-ccu.h>
> +#include <dt-bindings/reset/sun55i-a523-ccu.h>
> +
> #include "../clk.h"
>
> #include "ccu_common.h"
> @@ -25,8 +28,6 @@
> #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
> @@ -486,6 +487,18 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(ve_clk, "ve", ve_parents, 0x690,
>
> static SUNXI_CCU_GATE_HWS(bus_ve_clk, "bus-ve", ahb_hws, 0x69c, BIT(0), 0);
>
> +static const struct clk_hw *npu_parents[] = {
> + &pll_periph0_480M_clk.common.hw,
> + &pll_periph0_600M_clk.hw,
> + &pll_periph0_800M_clk.common.hw,
> + &pll_npu_2x_clk.hw,
> +};
> +static SUNXI_CCU_M_HW_WITH_MUX_GATE(npu_clk, "npu", npu_parents, 0x6e0,
> + 0, 5, /* M */
> + 24, 3, /* mux */
> + BIT(31), /* gate */
> + CLK_SET_RATE_PARENT);
> +
> 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,
> @@ -1217,6 +1230,7 @@ static struct ccu_common *sun55i_a523_ccu_clks[] = {
> &bus_ce_sys_clk.common,
> &ve_clk.common,
> &bus_ve_clk.common,
> + &npu_clk.common,
> &bus_dma_clk.common,
> &bus_msgbox_clk.common,
> &bus_spinlock_clk.common,
> @@ -1343,7 +1357,6 @@ static struct ccu_common *sun55i_a523_ccu_clks[] = {
> };
>
> static struct clk_hw_onecell_data sun55i_a523_hw_clks = {
> - .num = CLK_NUMBER,
> .hws = {
> [CLK_PLL_DDR0] = &pll_ddr_clk.common.hw,
> [CLK_PLL_PERIPH0_4X] = &pll_periph0_4x_clk.common.hw,
> @@ -1524,7 +1537,9 @@ static struct clk_hw_onecell_data sun55i_a523_hw_clks = {
> [CLK_FANOUT0] = &fanout0_clk.common.hw,
> [CLK_FANOUT1] = &fanout1_clk.common.hw,
> [CLK_FANOUT2] = &fanout2_clk.common.hw,
> + [CLK_NPU] = &npu_clk.common.hw,
> },
> + .num = CLK_NPU + 1,
> };
>
> static struct ccu_reset_map sun55i_a523_ccu_resets[] = {
> diff --git a/drivers/clk/sunxi-ng/ccu-sun55i-a523.h b/drivers/clk/sunxi-ng/ccu-sun55i-a523.h
> deleted file mode 100644
> index fc8dd42f1b47..000000000000
> --- a/drivers/clk/sunxi-ng/ccu-sun55i-a523.h
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -/* 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 */
>
Powered by blists - more mailing lists