Re: [PATCH 2/5] clk: sunxi-ng: v3s: Fix CSI SCLK clock name

Icenowy Zheng
2025-07-02T03:12:09Z

在 2025-07-01星期二的 22:11 +0200，Paul Kocialkowski写道：
> The CSI SCLK clock is incorrectly called CSI1 SCLK while it is used
> for
> both the CSI0 and CSI1 interfaces and is called CSI SCLK all around
> the
> documentation.
>
> Fix the name in the driver, header and device-tree.
>
> Fixes: d0f11d14b0bc ("clk: sunxi-ng: add support for V3s CCU")
> Signed-off-by: Paul Kocialkowski <paulk@sys-base.io>
> ---
>  .../bindings/media/allwinner,sun6i-a31-csi.yaml        |  2 +-
>  .../bindings/media/allwinner,sun6i-a31-isp.yaml        |  2 +-
>  .../bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml  |  2 +-
>  arch/arm/boot/dts/allwinner/sun8i-v3s.dtsi             |  2 +-
>  drivers/clk/sunxi-ng/ccu-sun8i-v3s.c                   | 10 +++++---
> --
>  include/dt-bindings/clock/sun8i-v3s-ccu.h              |  2 +-
>  6 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/media/allwinner,sun6i-
> a31-csi.yaml
> b/Documentation/devicetree/bindings/media/allwinner,sun6i-a31-
> csi.yaml
> index b3d6db922693..1aa5775ba2bc 100644
> --- a/Documentation/devicetree/bindings/media/allwinner,sun6i-a31-
> csi.yaml
> +++ b/Documentation/devicetree/bindings/media/allwinner,sun6i-a31-
> csi.yaml
> @@ -110,7 +110,7 @@ examples:
>          reg = <0x01cb4000 0x1000>;
>          interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
>          clocks = <&ccu CLK_BUS_CSI>,
> -                 <&ccu CLK_CSI1_SCLK>,
> +                 <&ccu CLK_CSI_SCLK>,
>                   <&ccu CLK_DRAM_CSI>;
>          clock-names = "bus",
>                        "mod",
> diff --git a/Documentation/devicetree/bindings/media/allwinner,sun6i-
> a31-isp.yaml
> b/Documentation/devicetree/bindings/media/allwinner,sun6i-a31-
> isp.yaml
> index a61a76bb611c..3ea4a4290f23 100644
> --- a/Documentation/devicetree/bindings/media/allwinner,sun6i-a31-
> isp.yaml
> +++ b/Documentation/devicetree/bindings/media/allwinner,sun6i-a31-
> isp.yaml
> @@ -79,7 +79,7 @@ examples:
>          reg = <0x01cb8000 0x1000>;
>          interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
>          clocks = <&ccu CLK_BUS_CSI>,
> -             <&ccu CLK_CSI1_SCLK>,
> +             <&ccu CLK_CSI_SCLK>,
>               <&ccu CLK_DRAM_CSI>;
>          clock-names = "bus", "mod", "ram";
>          resets = <&ccu RST_BUS_CSI>;
> diff --git a/Documentation/devicetree/bindings/media/allwinner,sun6i-
> a31-mipi-csi2.yaml
> b/Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-
> csi2.yaml
> index 54e15ab8a7f5..627b28e94354 100644
> --- a/Documentation/devicetree/bindings/media/allwinner,sun6i-a31-
> mipi-csi2.yaml
> +++ b/Documentation/devicetree/bindings/media/allwinner,sun6i-a31-
> mipi-csi2.yaml
> @@ -103,7 +103,7 @@ examples:
>          reg = <0x01cb1000 0x1000>;
>          interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
>          clocks = <&ccu CLK_BUS_CSI>,
> -                 <&ccu CLK_CSI1_SCLK>;
> +                 <&ccu CLK_CSI_SCLK>;
>          clock-names = "bus", "mod";
>          resets = <&ccu RST_BUS_CSI>;
>
> diff --git a/arch/arm/boot/dts/allwinner/sun8i-v3s.dtsi
> b/arch/arm/boot/dts/allwinner/sun8i-v3s.dtsi
> index f909b1d4dbca..e82cf312da25 100644
> --- a/arch/arm/boot/dts/allwinner/sun8i-v3s.dtsi
> +++ b/arch/arm/boot/dts/allwinner/sun8i-v3s.dtsi
> @@ -652,7 +652,7 @@ csi1: camera@1cb4000 {
>                         reg = <0x01cb4000 0x3000>;
>                         interrupts = <GIC_SPI 84
> IRQ_TYPE_LEVEL_HIGH>;
>                         clocks = <&ccu CLK_BUS_CSI>,
> -                                <&ccu CLK_CSI1_SCLK>,
> +                                <&ccu CLK_CSI_SCLK>,
>                                  <&ccu CLK_DRAM_CSI>;
>                         clock-names = "bus", "mod", "ram";
>                         resets = <&ccu RST_BUS_CSI>;
> diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
> b/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
> index 579a81bb46df..d12791b31a9d 100644
> --- a/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
> +++ b/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
> @@ -362,8 +362,8 @@ static const char * const csi_mclk_parents[] = {
> "osc24M", "pll-video",
>  static SUNXI_CCU_M_WITH_MUX_GATE(csi0_mclk_clk, "csi0-mclk",
> csi_mclk_parents,
>                                  0x130, 0, 5, 8, 3, BIT(15), 0);
>
> -static const char * const csi1_sclk_parents[] = { "pll-video", "pll-
> isp" };
> -static SUNXI_CCU_M_WITH_MUX_GATE(csi1_sclk_clk, "csi-sclk",
> csi1_sclk_parents,
> +static const char * const csi_sclk_parents[] = { "pll-video", "pll-
> isp" };
> +static SUNXI_CCU_M_WITH_MUX_GATE(csi_sclk_clk, "csi-sclk",
> csi_sclk_parents,

The document seems to call the gating bit "CSI_TOP_SCLK_GATING",
although the divider is "CSI_SCLK_DIV_M"; well at least the drop of 1
is desirable, so

Reviewed-By: Icenowy Zheng <uwu@icenowy.me>

P.S. This is the most weird clock register organization I have seen.

>                                  0x134, 16, 4, 24, 3, BIT(31), 0);
>
>  static SUNXI_CCU_M_WITH_MUX_GATE(csi1_mclk_clk, "csi-mclk",
> csi_mclk_parents,
> @@ -452,7 +452,7 @@ static struct ccu_common *sun8i_v3s_ccu_clks[] =
> {
>         &tcon_clk.common,
>         &csi_misc_clk.common,
>         &csi0_mclk_clk.common,
> -       &csi1_sclk_clk.common,
> +       &csi_sclk_clk.common,
>         &csi1_mclk_clk.common,
>         &ve_clk.common,
>         &ac_dig_clk.common,
> @@ -551,7 +551,7 @@ static struct clk_hw_onecell_data
> sun8i_v3s_hw_clks = {
>                 [CLK_TCON0]             = &tcon_clk.common.hw,
>                 [CLK_CSI_MISC]          = &csi_misc_clk.common.hw,
>                 [CLK_CSI0_MCLK]         = &csi0_mclk_clk.common.hw,
> -               [CLK_CSI1_SCLK]         = &csi1_sclk_clk.common.hw,
> +               [CLK_CSI_SCLK]          = &csi_sclk_clk.common.hw,
>                 [CLK_CSI1_MCLK]         = &csi1_mclk_clk.common.hw,
>                 [CLK_VE]                = &ve_clk.common.hw,
>                 [CLK_AC_DIG]            = &ac_dig_clk.common.hw,
> @@ -633,7 +633,7 @@ static struct clk_hw_onecell_data
> sun8i_v3_hw_clks = {
>                 [CLK_TCON0]             = &tcon_clk.common.hw,
>                 [CLK_CSI_MISC]          = &csi_misc_clk.common.hw,
>                 [CLK_CSI0_MCLK]         = &csi0_mclk_clk.common.hw,
> -               [CLK_CSI1_SCLK]         = &csi1_sclk_clk.common.hw,
> +               [CLK_CSI_SCLK]          = &csi_sclk_clk.common.hw,
>                 [CLK_CSI1_MCLK]         = &csi1_mclk_clk.common.hw,
>                 [CLK_VE]                = &ve_clk.common.hw,
>                 [CLK_AC_DIG]            = &ac_dig_clk.common.hw,
> diff --git a/include/dt-bindings/clock/sun8i-v3s-ccu.h b/include/dt-
> bindings/clock/sun8i-v3s-ccu.h
> index 014ac6123d17..c4055629c9f9 100644
> --- a/include/dt-bindings/clock/sun8i-v3s-ccu.h
> +++ b/include/dt-bindings/clock/sun8i-v3s-ccu.h
> @@ -96,7 +96,7 @@
>  #define CLK_TCON0              64
>  #define CLK_CSI_MISC           65
>  #define CLK_CSI0_MCLK          66
> -#define CLK_CSI1_SCLK          67
> +#define CLK_CSI_SCLK           67
>  #define CLK_CSI1_MCLK          68
>  #define CLK_VE                 69
>  #define CLK_AC_DIG             70