Skip to contentSkip to conversation

Basic clock and reset support for StarFive JH7110 RISC-V SoC

PATCH In review Hal Feng 3 participants 56 messages Nov 18, 2022 – Dec 2, 2022

Subsystems (6)
lore
Share & tools
lore

Hal Feng

author maintainer
#0 lore raw

v2 cover Basic clock and reset support for StarFive JH7110 RISC-V SoC

The original patch series "Basic StarFive JH7110 RISC-V SoC support" [1] is split into 3 patch series. They respectively add basic clock&reset, pinctrl and device tree support for StarFive JH7110 SoC. These patch series are independent, but the Visionfive2 board can boot up successfully only if all these patches series applied. This one adds basic clock&reset support. This patch series is pulled out from the patch 7~21 of v1 [1]. You can simply get or review the patches at the link [2].

[1]: https://lore.kernel.org/all/[email protected]/
[2]: https://github.com/hal-feng/linux/commits/visionfive2-minimal

Changes since v1:
- Rebased on tag v6.1-rc5.
- Rewrote the clock and reset drivers using auxiliary bus framework, so patch 8, 9, 15 were dropped and all patches changed a lot. (by Stephen)
- Split Patch 14 into two patches. One is for factoring out the common JH71X0 code, the another one is for renaming. (by Stephen)
- Created a subdirectory for StarFive reset drivers.
- Factored out common JH71X0 reset code.
- Renamed the common clock and reset code from "*starfive*" or "*STARFIVE*" to "*jh71x0*" or "*JH71X0*".
- Combined JH7110 system and always-on clock DT binding headers in one file named "include/dt-bindings/clock/starfive-jh7110.h".
- Renamed clock definitions "JH7110_SYSCLK_PCLK2_MUX_FUNC_PCLK" and "JH7110_SYSCLK_U2_PCLK_MUX_PCLK" to "JH7110_SYSCLK_PCLK2_MUX_FUNC" and "JH7110_SYSCLK_PCLK2_MUX".
- Rewrote the DT bindings of clock and reset for using auxiliary bus.
- Registered an auxiliary device for reset controller in clock drivers.
- Changed clock names "CODAJ*" and "WAVE*" to "codaj*" and "wave*". Changed clock names "u2_pclk_mux_func_pclk" and "u2_pclk_mux_pclk" to "pclk2_mux_func" and "pclk2_mux".
- Changed the flags of clock apb0 and noc_bus_isp_axi to CLK_IS_CRITICAL as suggested by StarFive SDK group.
- Registered clock gmac0_gtxc as a gate clock instead of a div clock as suggested by StarFive SDK group.
- Changed the frequency of clock pll2_out to 1188MHz as suggested by StarFive SDK group.
- Fixed the bug that the clock JH7110_AONCLK_GMAC0_GTXCLK was not handled in JH7110 always-on clock driver.
- Registered the reset driver as an auxiliary driver.
- Reworded the commit messages.

v1: https://lore.kernel.org/all/[email protected]/

Emil Renner Berthing (10):
clk: starfive: Factor out common JH7100 and JH7110 code
reset: Create subdirectory for StarFive drivers
reset: starfive: Factor out common JH71X0 reset code
reset: starfive: jh71x0: Use 32bit I/O on 32bit registers
dt-bindings: clock: Add StarFive JH7110 system and always-on clock
definitions
dt-bindings: reset: Add StarFive JH7110 system and always-on reset
definitions
dt-bindings: clock: Add StarFive JH7110 system clock and reset
generator
dt-bindings: clock: Add StarFive JH7110 always-on clock and reset
generator
clk: starfive: Add StarFive JH7110 system clock driver
clk: starfive: Add StarFive JH7110 always-on clock driver

Hal Feng (4):
clk: starfive: Rename "jh7100" to "jh71x0" for the common code
reset: starfive: Rename "jh7100" to "jh71x0" for the common code
reset: starfive: Add StarFive JH7110 reset driver
clk: starfive: jh71x0: Don't register aux devices if JH7110 reset is
disabled

 .../clock/starfive,jh7110-aoncrg.yaml         |  76 ++
 .../clock/starfive,jh7110-syscrg.yaml         |  80 ++
 MAINTAINERS                                   |  16 +-
 drivers/clk/starfive/Kconfig                  |  25 +
 drivers/clk/starfive/Makefile                 |   6 +-
 .../clk/starfive/clk-starfive-jh7100-audio.c  |  74 +-
 drivers/clk/starfive/clk-starfive-jh7100.c    | 713 +++++-------------
 drivers/clk/starfive/clk-starfive-jh7100.h    | 112 ---
 .../clk/starfive/clk-starfive-jh7110-aon.c    | 165 ++++
 .../clk/starfive/clk-starfive-jh7110-sys.c    | 650 ++++++++++++++++
 drivers/clk/starfive/clk-starfive-jh71x0.c    | 396 ++++++++++
 drivers/clk/starfive/clk-starfive-jh71x0.h    | 122 +++
 drivers/reset/Kconfig                         |   8 +-
 drivers/reset/Makefile                        |   2 +-
 drivers/reset/reset-starfive-jh7100.c         | 173 -----
 drivers/reset/starfive/Kconfig                |  20 +
 drivers/reset/starfive/Makefile               |   5 +
 .../reset/starfive/reset-starfive-jh7100.c    |  74 ++
 .../reset/starfive/reset-starfive-jh7110.c    |  67 ++
 .../reset/starfive/reset-starfive-jh71x0.c    | 130 ++++
 .../reset/starfive/reset-starfive-jh71x0.h    |  21 +
 include/dt-bindings/clock/starfive-jh7110.h   | 234 ++++++
 include/dt-bindings/reset/starfive-jh7110.h   | 154 ++++
 23 files changed, 2466 insertions(+), 857 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml
 delete mode 100644 drivers/clk/starfive/clk-starfive-jh7100.h
 create mode 100644 drivers/clk/starfive/clk-starfive-jh7110-aon.c
 create mode 100644 drivers/clk/starfive/clk-starfive-jh7110-sys.c
 create mode 100644 drivers/clk/starfive/clk-starfive-jh71x0.c
 create mode 100644 drivers/clk/starfive/clk-starfive-jh71x0.h
 delete mode 100644 drivers/reset/reset-starfive-jh7100.c
 create mode 100644 drivers/reset/starfive/Kconfig
 create mode 100644 drivers/reset/starfive/Makefile
 create mode 100644 drivers/reset/starfive/reset-starfive-jh7100.c
 create mode 100644 drivers/reset/starfive/reset-starfive-jh7110.c
 create mode 100644 drivers/reset/starfive/reset-starfive-jh71x0.c
 create mode 100644 drivers/reset/starfive/reset-starfive-jh71x0.h
 create mode 100644 include/dt-bindings/clock/starfive-jh7110.h
 create mode 100644 include/dt-bindings/reset/starfive-jh7110.h

base-commit: 094226ad94f471a9f19e8f8e7140a09c2625abaa

Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
author maintainer
#1 lore raw

PATCH v2 1/14 clk: starfive: Factor out common JH7100 and JH7110 code

From: Emil Renner Berthing <[email protected]>

The clock control registers on the StarFive JH7100 and JH7110 work identically, so factor out the code then drivers for the two SoCs can share it without depending on each other. No functional change.

---
 MAINTAINERS                                |   2 +-
 drivers/clk/starfive/Kconfig               |   5 +
 drivers/clk/starfive/Makefile              |   3 +-
 drivers/clk/starfive/clk-starfive-jh7100.c | 325 --------------------
 drivers/clk/starfive/clk-starfive-jh7100.h |   2 +
 drivers/clk/starfive/clk-starfive-jh71x0.c | 333 +++++++++++++++++++++
 6 files changed, 343 insertions(+), 327 deletions(-)
 create mode 100644 drivers/clk/starfive/clk-starfive-jh71x0.c
MAINTAINERS +1 -1
index 256f03904987..d43daa89d5f1 100644
@@ -19602,7 +19602,7 @@ STARFIVE JH7100 CLOCK DRIVERS
 M:	Emil Renner Berthing <[email protected]>
 S:	Maintained
 F:	Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
-F:	drivers/clk/starfive/clk-starfive-jh7100*
+F:	drivers/clk/starfive/
 F:	include/dt-bindings/clock/starfive-jh7100*.h
 
 STARFIVE JH7100 PINCTRL DRIVER
drivers/clk/starfive/Kconfig +5 -0
index 003bd2d56ce7..594d516dcb38 100644
@@ -1,8 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0
 
+config CLK_STARFIVE_JH71X0
+	bool
+
 config CLK_STARFIVE_JH7100
 	bool "StarFive JH7100 clock support"
 	depends on SOC_STARFIVE || COMPILE_TEST
+	select CLK_STARFIVE_JH71X0
 	default SOC_STARFIVE
 	help
 	  Say yes here to support the clock controller on the StarFive JH7100
@@ -11,6 +15,7 @@ config CLK_STARFIVE_JH7100
 config CLK_STARFIVE_JH7100_AUDIO
 	tristate "StarFive JH7100 audio clock support"
 	depends on CLK_STARFIVE_JH7100
+	select CLK_STARFIVE_JH71X0
 	default m if SOC_STARFIVE
 	help
 	  Say Y or M here to support the audio clocks on the StarFive JH7100
drivers/clk/starfive/Makefile +2 -1
index 0fa8ecb9ec1c..82edfa9f9cb8 100644
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-# StarFive Clock
+obj-$(CONFIG_CLK_STARFIVE_JH71X0)	+= clk-starfive-jh71x0.o
+
 obj-$(CONFIG_CLK_STARFIVE_JH7100)	+= clk-starfive-jh7100.o
 obj-$(CONFIG_CLK_STARFIVE_JH7100_AUDIO)	+= clk-starfive-jh7100-audio.o
drivers/clk/starfive/clk-starfive-jh7100.c +0 -325

341 lines not on this page · raw message

drivers/clk/starfive/clk-starfive-jh7100.h +2 -0
index f116be5740a5..a8ba6e25b5ce 100644
@@ -4,6 +4,8 @@
 
 #include <linux/bits.h>
 #include <linux/clk-provider.h>
+#include <linux/device.h>
+#include <linux/spinlock.h>
 
 /* register fields */
 #define JH7100_CLK_ENABLE	BIT(31)
drivers/clk/starfive/clk-starfive-jh71x0.c new file +333 -0

333 lines not on this page · raw message

Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#2 lore raw

Re: [PATCH v2 01/14] clk: starfive: Factor out common JH7100 and JH7110 code

Quoted 25 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

The clock control registers on the StarFive JH7100 and JH7110 work identically, so factor out the code then drivers for the two SoCs can share it without depending on each other. No functional change.

---
 MAINTAINERS                                |   2 +-
 drivers/clk/starfive/Kconfig               |   5 +
 drivers/clk/starfive/Makefile              |   3 +-
 drivers/clk/starfive/clk-starfive-jh7100.c | 325 --------------------
 drivers/clk/starfive/clk-starfive-jh7100.h |   2 +
 drivers/clk/starfive/clk-starfive-jh71x0.c | 333 +++++++++++++++++++++
 6 files changed, 343 insertions(+), 327 deletions(-)
 create mode 100644 drivers/clk/starfive/clk-starfive-jh71x0.c
MAINTAINERS +0 -0
index 256f03904987..d43daa89d5f1 100644

MAINTAINERS STARFIVE JH7100 CLOCK DRIVERS · line 19605

Quoted 5 lines
MAINTAINERS +1 -1
@@ -19602,7 +19602,7 @@ STARFIVE JH7100 CLOCK DRIVERS
 M:     Emil Renner Berthing <[email protected]>
 S:     Maintained
 F:     Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
-F:     drivers/clk/starfive/clk-starfive-jh7100*
+F:     drivers/clk/starfive/

When this entry cover all the starfive clock drivers the header should also match. Eg.
STARFIVE CLOCK DRIVERS

Quoted 741 lines
MAINTAINERS +0 -0
 F:     include/dt-bindings/clock/starfive-jh7100*.h
 
 STARFIVE JH7100 PINCTRL DRIVER
drivers/clk/starfive/Kconfig +5 -0
index 003bd2d56ce7..594d516dcb38 100644
@@ -1,8 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0
 
+config CLK_STARFIVE_JH71X0
+       bool
+
 config CLK_STARFIVE_JH7100
        bool "StarFive JH7100 clock support"
        depends on SOC_STARFIVE || COMPILE_TEST
+       select CLK_STARFIVE_JH71X0
        default SOC_STARFIVE
        help
          Say yes here to support the clock controller on the StarFive JH7100
@@ -11,6 +15,7 @@ config CLK_STARFIVE_JH7100
 config CLK_STARFIVE_JH7100_AUDIO
        tristate "StarFive JH7100 audio clock support"
        depends on CLK_STARFIVE_JH7100
+       select CLK_STARFIVE_JH71X0
        default m if SOC_STARFIVE
        help
          Say Y or M here to support the audio clocks on the StarFive JH7100
drivers/clk/starfive/Makefile +2 -1
index 0fa8ecb9ec1c..82edfa9f9cb8 100644
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-# StarFive Clock
+obj-$(CONFIG_CLK_STARFIVE_JH71X0)      += clk-starfive-jh71x0.o
+
 obj-$(CONFIG_CLK_STARFIVE_JH7100)      += clk-starfive-jh7100.o
 obj-$(CONFIG_CLK_STARFIVE_JH7100_AUDIO)        += clk-starfive-jh7100-audio.o
drivers/clk/starfive/clk-starfive-jh7100.c +0 -325
index 691aeebc7092..eea52f16af0d 100644
@@ -7,15 +7,10 @@
  * Copyright (C) 2021 Emil Renner Berthing <[email protected]>
  */
 
-#include <linux/bits.h>
 #include <linux/clk-provider.h>
-#include <linux/debugfs.h>
 #include <linux/device.h>
 #include <linux/init.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
 #include <linux/mod_devicetable.h>
-#include <linux/module.h>
 #include <linux/platform_device.h>
 
 #include <dt-bindings/clock/starfive-jh7100.h>
@@ -269,326 +264,6 @@ static const struct jh7100_clk_data jh7100_clk_data[] __initconst = {
        JH7100_GATE(JH7100_CLK_SYSERR_APB, "syserr_apb", 0, JH7100_CLK_APB2_BUS),
 };
 
-static struct jh7100_clk *jh7100_clk_from(struct clk_hw *hw)
-{
-       return container_of(hw, struct jh7100_clk, hw);
-}
-
-static struct jh7100_clk_priv *jh7100_priv_from(struct jh7100_clk *clk)
-{
-       return container_of(clk, struct jh7100_clk_priv, reg[clk->idx]);
-}
-
-static u32 jh7100_clk_reg_get(struct jh7100_clk *clk)
-{
-       struct jh7100_clk_priv *priv = jh7100_priv_from(clk);
-       void __iomem *reg = priv->base + 4 * clk->idx;
-
-       return readl_relaxed(reg);
-}
-
-static void jh7100_clk_reg_rmw(struct jh7100_clk *clk, u32 mask, u32 value)
-{
-       struct jh7100_clk_priv *priv = jh7100_priv_from(clk);
-       void __iomem *reg = priv->base + 4 * clk->idx;
-       unsigned long flags;
-
-       spin_lock_irqsave(&priv->rmw_lock, flags);
-       value |= readl_relaxed(reg) & ~mask;
-       writel_relaxed(value, reg);
-       spin_unlock_irqrestore(&priv->rmw_lock, flags);
-}
-
-static int jh7100_clk_enable(struct clk_hw *hw)
-{
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-
-       jh7100_clk_reg_rmw(clk, JH7100_CLK_ENABLE, JH7100_CLK_ENABLE);
-       return 0;
-}
-
-static void jh7100_clk_disable(struct clk_hw *hw)
-{
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-
-       jh7100_clk_reg_rmw(clk, JH7100_CLK_ENABLE, 0);
-}
-
-static int jh7100_clk_is_enabled(struct clk_hw *hw)
-{
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-
-       return !!(jh7100_clk_reg_get(clk) & JH7100_CLK_ENABLE);
-}
-
-static unsigned long jh7100_clk_recalc_rate(struct clk_hw *hw,
-                                           unsigned long parent_rate)
-{
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       u32 div = jh7100_clk_reg_get(clk) & JH7100_CLK_DIV_MASK;
-
-       return div ? parent_rate / div : 0;
-}
-
-static int jh7100_clk_determine_rate(struct clk_hw *hw,
-                                    struct clk_rate_request *req)
-{
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       unsigned long parent = req->best_parent_rate;
-       unsigned long rate = clamp(req->rate, req->min_rate, req->max_rate);
-       unsigned long div = min_t(unsigned long, DIV_ROUND_UP(parent, rate), clk->max_div);
-       unsigned long result = parent / div;
-
-       /*
-        * we want the result clamped by min_rate and max_rate if possible:
-        * case 1: div hits the max divider value, which means it's less than
-        * parent / rate, so the result is greater than rate and min_rate in
-        * particular. we can't do anything about result > max_rate because the
-        * divider doesn't go any further.
-        * case 2: div = DIV_ROUND_UP(parent, rate) which means the result is
-        * always lower or equal to rate and max_rate. however the result may
-        * turn out lower than min_rate, but then the next higher rate is fine:
-        *   div - 1 = ceil(parent / rate) - 1 < parent / rate
-        * and thus
-        *   min_rate <= rate < parent / (div - 1)
-        */
-       if (result < req->min_rate && div > 1)
-               result = parent / (div - 1);
-
-       req->rate = result;
-       return 0;
-}
-
-static int jh7100_clk_set_rate(struct clk_hw *hw,
-                              unsigned long rate,
-                              unsigned long parent_rate)
-{
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       unsigned long div = clamp(DIV_ROUND_CLOSEST(parent_rate, rate),
-                                 1UL, (unsigned long)clk->max_div);
-
-       jh7100_clk_reg_rmw(clk, JH7100_CLK_DIV_MASK, div);
-       return 0;
-}
-
-static unsigned long jh7100_clk_frac_recalc_rate(struct clk_hw *hw,
-                                                unsigned long parent_rate)
-{
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       u32 reg = jh7100_clk_reg_get(clk);
-       unsigned long div100 = 100 * (reg & JH7100_CLK_INT_MASK) +
-                              ((reg & JH7100_CLK_FRAC_MASK) >> JH7100_CLK_FRAC_SHIFT);
-
-       return (div100 >= JH7100_CLK_FRAC_MIN) ? 100 * parent_rate / div100 : 0;
-}
-
-static int jh7100_clk_frac_determine_rate(struct clk_hw *hw,
-                                         struct clk_rate_request *req)
-{
-       unsigned long parent100 = 100 * req->best_parent_rate;
-       unsigned long rate = clamp(req->rate, req->min_rate, req->max_rate);
-       unsigned long div100 = clamp(DIV_ROUND_CLOSEST(parent100, rate),
-                                    JH7100_CLK_FRAC_MIN, JH7100_CLK_FRAC_MAX);
-       unsigned long result = parent100 / div100;
-
-       /* clamp the result as in jh7100_clk_determine_rate() above */
-       if (result > req->max_rate && div100 < JH7100_CLK_FRAC_MAX)
-               result = parent100 / (div100 + 1);
-       if (result < req->min_rate && div100 > JH7100_CLK_FRAC_MIN)
-               result = parent100 / (div100 - 1);
-
-       req->rate = result;
-       return 0;
-}
-
-static int jh7100_clk_frac_set_rate(struct clk_hw *hw,
-                                   unsigned long rate,
-                                   unsigned long parent_rate)
-{
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       unsigned long div100 = clamp(DIV_ROUND_CLOSEST(100 * parent_rate, rate),
-                                    JH7100_CLK_FRAC_MIN, JH7100_CLK_FRAC_MAX);
-       u32 value = ((div100 % 100) << JH7100_CLK_FRAC_SHIFT) | (div100 / 100);
-
-       jh7100_clk_reg_rmw(clk, JH7100_CLK_DIV_MASK, value);
-       return 0;
-}
-
-static u8 jh7100_clk_get_parent(struct clk_hw *hw)
-{
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       u32 value = jh7100_clk_reg_get(clk);
-
-       return (value & JH7100_CLK_MUX_MASK) >> JH7100_CLK_MUX_SHIFT;
-}
-
-static int jh7100_clk_set_parent(struct clk_hw *hw, u8 index)
-{
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       u32 value = (u32)index << JH7100_CLK_MUX_SHIFT;
-
-       jh7100_clk_reg_rmw(clk, JH7100_CLK_MUX_MASK, value);
-       return 0;
-}
-
-static int jh7100_clk_mux_determine_rate(struct clk_hw *hw,
-                                        struct clk_rate_request *req)
-{
-       return clk_mux_determine_rate_flags(hw, req, 0);
-}
-
-static int jh7100_clk_get_phase(struct clk_hw *hw)
-{
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       u32 value = jh7100_clk_reg_get(clk);
-
-       return (value & JH7100_CLK_INVERT) ? 180 : 0;
-}
-
-static int jh7100_clk_set_phase(struct clk_hw *hw, int degrees)
-{
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       u32 value;
-
-       if (degrees == 0)
-               value = 0;
-       else if (degrees == 180)
-               value = JH7100_CLK_INVERT;
-       else
-               return -EINVAL;
-
-       jh7100_clk_reg_rmw(clk, JH7100_CLK_INVERT, value);
-       return 0;
-}
-
-#ifdef CONFIG_DEBUG_FS
-static void jh7100_clk_debug_init(struct clk_hw *hw, struct dentry *dentry)
-{
-       static const struct debugfs_reg32 jh7100_clk_reg = {
-               .name = "CTRL",
-               .offset = 0,
-       };
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       struct jh7100_clk_priv *priv = jh7100_priv_from(clk);
-       struct debugfs_regset32 *regset;
-
-       regset = devm_kzalloc(priv->dev, sizeof(*regset), GFP_KERNEL);
-       if (!regset)
-               return;
-
-       regset->regs = &jh7100_clk_reg;
-       regset->nregs = 1;
-       regset->base = priv->base + 4 * clk->idx;
-
-       debugfs_create_regset32("registers", 0400, dentry, regset);
-}
-#else
-#define jh7100_clk_debug_init NULL
-#endif
-
-static const struct clk_ops jh7100_clk_gate_ops = {
-       .enable = jh7100_clk_enable,
-       .disable = jh7100_clk_disable,
-       .is_enabled = jh7100_clk_is_enabled,
-       .debug_init = jh7100_clk_debug_init,
-};
-
-static const struct clk_ops jh7100_clk_div_ops = {
-       .recalc_rate = jh7100_clk_recalc_rate,
-       .determine_rate = jh7100_clk_determine_rate,
-       .set_rate = jh7100_clk_set_rate,
-       .debug_init = jh7100_clk_debug_init,
-};
-
-static const struct clk_ops jh7100_clk_fdiv_ops = {
-       .recalc_rate = jh7100_clk_frac_recalc_rate,
-       .determine_rate = jh7100_clk_frac_determine_rate,
-       .set_rate = jh7100_clk_frac_set_rate,
-       .debug_init = jh7100_clk_debug_init,
-};
-
-static const struct clk_ops jh7100_clk_gdiv_ops = {
-       .enable = jh7100_clk_enable,
-       .disable = jh7100_clk_disable,
-       .is_enabled = jh7100_clk_is_enabled,
-       .recalc_rate = jh7100_clk_recalc_rate,
-       .determine_rate = jh7100_clk_determine_rate,
-       .set_rate = jh7100_clk_set_rate,
-       .debug_init = jh7100_clk_debug_init,
-};
-
-static const struct clk_ops jh7100_clk_mux_ops = {
-       .determine_rate = jh7100_clk_mux_determine_rate,
-       .set_parent = jh7100_clk_set_parent,
-       .get_parent = jh7100_clk_get_parent,
-       .debug_init = jh7100_clk_debug_init,
-};
-
-static const struct clk_ops jh7100_clk_gmux_ops = {
-       .enable = jh7100_clk_enable,
-       .disable = jh7100_clk_disable,
-       .is_enabled = jh7100_clk_is_enabled,
-       .determine_rate = jh7100_clk_mux_determine_rate,
-       .set_parent = jh7100_clk_set_parent,
-       .get_parent = jh7100_clk_get_parent,
-       .debug_init = jh7100_clk_debug_init,
-};
-
-static const struct clk_ops jh7100_clk_mdiv_ops = {
-       .recalc_rate = jh7100_clk_recalc_rate,
-       .determine_rate = jh7100_clk_determine_rate,
-       .get_parent = jh7100_clk_get_parent,
-       .set_parent = jh7100_clk_set_parent,
-       .set_rate = jh7100_clk_set_rate,
-       .debug_init = jh7100_clk_debug_init,
-};
-
-static const struct clk_ops jh7100_clk_gmd_ops = {
-       .enable = jh7100_clk_enable,
-       .disable = jh7100_clk_disable,
-       .is_enabled = jh7100_clk_is_enabled,
-       .recalc_rate = jh7100_clk_recalc_rate,
-       .determine_rate = jh7100_clk_determine_rate,
-       .get_parent = jh7100_clk_get_parent,
-       .set_parent = jh7100_clk_set_parent,
-       .set_rate = jh7100_clk_set_rate,
-       .debug_init = jh7100_clk_debug_init,
-};
-
-static const struct clk_ops jh7100_clk_inv_ops = {
-       .get_phase = jh7100_clk_get_phase,
-       .set_phase = jh7100_clk_set_phase,
-       .debug_init = jh7100_clk_debug_init,
-};
-
-const struct clk_ops *starfive_jh7100_clk_ops(u32 max)
-{
-       if (max & JH7100_CLK_DIV_MASK) {
-               if (max & JH7100_CLK_MUX_MASK) {
-                       if (max & JH7100_CLK_ENABLE)
-                               return &jh7100_clk_gmd_ops;
-                       return &jh7100_clk_mdiv_ops;
-               }
-               if (max & JH7100_CLK_ENABLE)
-                       return &jh7100_clk_gdiv_ops;
-               if (max == JH7100_CLK_FRAC_MAX)
-                       return &jh7100_clk_fdiv_ops;
-               return &jh7100_clk_div_ops;
-       }
-
-       if (max & JH7100_CLK_MUX_MASK) {
-               if (max & JH7100_CLK_ENABLE)
-                       return &jh7100_clk_gmux_ops;
-               return &jh7100_clk_mux_ops;
-       }
-
-       if (max & JH7100_CLK_ENABLE)
-               return &jh7100_clk_gate_ops;
-
-       return &jh7100_clk_inv_ops;
-}
-EXPORT_SYMBOL_GPL(starfive_jh7100_clk_ops);
-
 static struct clk_hw *jh7100_clk_get(struct of_phandle_args *clkspec, void *data)
 {
        struct jh7100_clk_priv *priv = data;
drivers/clk/starfive/clk-starfive-jh7100.h +2 -0
index f116be5740a5..a8ba6e25b5ce 100644
@@ -4,6 +4,8 @@
 
 #include <linux/bits.h>
 #include <linux/clk-provider.h>
+#include <linux/device.h>
+#include <linux/spinlock.h>
 
 /* register fields */
 #define JH7100_CLK_ENABLE      BIT(31)
drivers/clk/starfive/clk-starfive-jh71x0.c new file +333 -1
new file mode 100644
index 000000000000..6c07b61b4a32
@@ -0,0 +1,333 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * StarFive JH7100 Clock Generator Driver
+ *
+ * Copyright (C) 2021-2022 Emil Renner Berthing <[email protected]>
+ */
+
+#include <linux/clk-provider.h>
+#include <linux/debugfs.h>
+#include <linux/device.h>
+#include <linux/io.h>
+
+#include "clk-starfive-jh7100.h"
+
+static struct jh7100_clk *jh7100_clk_from(struct clk_hw *hw)
+{
+       return container_of(hw, struct jh7100_clk, hw);
+}
+
+static struct jh7100_clk_priv *jh7100_priv_from(struct jh7100_clk *clk)
+{
+       return container_of(clk, struct jh7100_clk_priv, reg[clk->idx]);
+}
+
+static u32 jh7100_clk_reg_get(struct jh7100_clk *clk)
+{
+       struct jh7100_clk_priv *priv = jh7100_priv_from(clk);
+       void __iomem *reg = priv->base + 4 * clk->idx;
+
+       return readl_relaxed(reg);
+}
+
+static void jh7100_clk_reg_rmw(struct jh7100_clk *clk, u32 mask, u32 value)
+{
+       struct jh7100_clk_priv *priv = jh7100_priv_from(clk);
+       void __iomem *reg = priv->base + 4 * clk->idx;
+       unsigned long flags;
+
+       spin_lock_irqsave(&priv->rmw_lock, flags);
+       value |= readl_relaxed(reg) & ~mask;
+       writel_relaxed(value, reg);
+       spin_unlock_irqrestore(&priv->rmw_lock, flags);
+}
+
+static int jh7100_clk_enable(struct clk_hw *hw)
+{
+       struct jh7100_clk *clk = jh7100_clk_from(hw);
+
+       jh7100_clk_reg_rmw(clk, JH7100_CLK_ENABLE, JH7100_CLK_ENABLE);
+       return 0;
+}
+
+static void jh7100_clk_disable(struct clk_hw *hw)
+{
+       struct jh7100_clk *clk = jh7100_clk_from(hw);
+
+       jh7100_clk_reg_rmw(clk, JH7100_CLK_ENABLE, 0);
+}
+
+static int jh7100_clk_is_enabled(struct clk_hw *hw)
+{
+       struct jh7100_clk *clk = jh7100_clk_from(hw);
+
+       return !!(jh7100_clk_reg_get(clk) & JH7100_CLK_ENABLE);
+}
+
+static unsigned long jh7100_clk_recalc_rate(struct clk_hw *hw,
+                                           unsigned long parent_rate)
+{
+       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       u32 div = jh7100_clk_reg_get(clk) & JH7100_CLK_DIV_MASK;
+
+       return div ? parent_rate / div : 0;
+}
+
+static int jh7100_clk_determine_rate(struct clk_hw *hw,
+                                    struct clk_rate_request *req)
+{
+       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       unsigned long parent = req->best_parent_rate;
+       unsigned long rate = clamp(req->rate, req->min_rate, req->max_rate);
+       unsigned long div = min_t(unsigned long, DIV_ROUND_UP(parent, rate), clk->max_div);
+       unsigned long result = parent / div;
+
+       /*
+        * we want the result clamped by min_rate and max_rate if possible:
+        * case 1: div hits the max divider value, which means it's less than
+        * parent / rate, so the result is greater than rate and min_rate in
+        * particular. we can't do anything about result > max_rate because the
+        * divider doesn't go any further.
+        * case 2: div = DIV_ROUND_UP(parent, rate) which means the result is
+        * always lower or equal to rate and max_rate. however the result may
+        * turn out lower than min_rate, but then the next higher rate is fine:
+        *   div - 1 = ceil(parent / rate) - 1 < parent / rate
+        * and thus
+        *   min_rate <= rate < parent / (div - 1)
+        */
+       if (result < req->min_rate && div > 1)
+               result = parent / (div - 1);
+
+       req->rate = result;
+       return 0;
+}
+
+static int jh7100_clk_set_rate(struct clk_hw *hw,
+                              unsigned long rate,
+                              unsigned long parent_rate)
+{
+       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       unsigned long div = clamp(DIV_ROUND_CLOSEST(parent_rate, rate),
+                                 1UL, (unsigned long)clk->max_div);
+
+       jh7100_clk_reg_rmw(clk, JH7100_CLK_DIV_MASK, div);
+       return 0;
+}
+
+static unsigned long jh7100_clk_frac_recalc_rate(struct clk_hw *hw,
+                                                unsigned long parent_rate)
+{
+       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       u32 reg = jh7100_clk_reg_get(clk);
+       unsigned long div100 = 100 * (reg & JH7100_CLK_INT_MASK) +
+                              ((reg & JH7100_CLK_FRAC_MASK) >> JH7100_CLK_FRAC_SHIFT);
+
+       return (div100 >= JH7100_CLK_FRAC_MIN) ? 100 * parent_rate / div100 : 0;
+}
+
+static int jh7100_clk_frac_determine_rate(struct clk_hw *hw,
+                                         struct clk_rate_request *req)
+{
+       unsigned long parent100 = 100 * req->best_parent_rate;
+       unsigned long rate = clamp(req->rate, req->min_rate, req->max_rate);
+       unsigned long div100 = clamp(DIV_ROUND_CLOSEST(parent100, rate),
+                                    JH7100_CLK_FRAC_MIN, JH7100_CLK_FRAC_MAX);
+       unsigned long result = parent100 / div100;
+
+       /* clamp the result as in jh7100_clk_determine_rate() above */
+       if (result > req->max_rate && div100 < JH7100_CLK_FRAC_MAX)
+               result = parent100 / (div100 + 1);
+       if (result < req->min_rate && div100 > JH7100_CLK_FRAC_MIN)
+               result = parent100 / (div100 - 1);
+
+       req->rate = result;
+       return 0;
+}
+
+static int jh7100_clk_frac_set_rate(struct clk_hw *hw,
+                                   unsigned long rate,
+                                   unsigned long parent_rate)
+{
+       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       unsigned long div100 = clamp(DIV_ROUND_CLOSEST(100 * parent_rate, rate),
+                                    JH7100_CLK_FRAC_MIN, JH7100_CLK_FRAC_MAX);
+       u32 value = ((div100 % 100) << JH7100_CLK_FRAC_SHIFT) | (div100 / 100);
+
+       jh7100_clk_reg_rmw(clk, JH7100_CLK_DIV_MASK, value);
+       return 0;
+}
+
+static u8 jh7100_clk_get_parent(struct clk_hw *hw)
+{
+       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       u32 value = jh7100_clk_reg_get(clk);
+
+       return (value & JH7100_CLK_MUX_MASK) >> JH7100_CLK_MUX_SHIFT;
+}
+
+static int jh7100_clk_set_parent(struct clk_hw *hw, u8 index)
+{
+       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       u32 value = (u32)index << JH7100_CLK_MUX_SHIFT;
+
+       jh7100_clk_reg_rmw(clk, JH7100_CLK_MUX_MASK, value);
+       return 0;
+}
+
+static int jh7100_clk_mux_determine_rate(struct clk_hw *hw,
+                                        struct clk_rate_request *req)
+{
+       return clk_mux_determine_rate_flags(hw, req, 0);
+}
+
+static int jh7100_clk_get_phase(struct clk_hw *hw)
+{
+       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       u32 value = jh7100_clk_reg_get(clk);
+
+       return (value & JH7100_CLK_INVERT) ? 180 : 0;
+}
+
+static int jh7100_clk_set_phase(struct clk_hw *hw, int degrees)
+{
+       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       u32 value;
+
+       if (degrees == 0)
+               value = 0;
+       else if (degrees == 180)
+               value = JH7100_CLK_INVERT;
+       else
+               return -EINVAL;
+
+       jh7100_clk_reg_rmw(clk, JH7100_CLK_INVERT, value);
+       return 0;
+}
+
+#ifdef CONFIG_DEBUG_FS
+static void jh7100_clk_debug_init(struct clk_hw *hw, struct dentry *dentry)
+{
+       static const struct debugfs_reg32 jh7100_clk_reg = {
+               .name = "CTRL",
+               .offset = 0,
+       };
+       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       struct jh7100_clk_priv *priv = jh7100_priv_from(clk);
+       struct debugfs_regset32 *regset;
+
+       regset = devm_kzalloc(priv->dev, sizeof(*regset), GFP_KERNEL);
+       if (!regset)
+               return;
+
+       regset->regs = &jh7100_clk_reg;
+       regset->nregs = 1;
+       regset->base = priv->base + 4 * clk->idx;
+
+       debugfs_create_regset32("registers", 0400, dentry, regset);
+}
+#else
+#define jh7100_clk_debug_init NULL
+#endif
+
+static const struct clk_ops jh7100_clk_gate_ops = {
+       .enable = jh7100_clk_enable,
+       .disable = jh7100_clk_disable,
+       .is_enabled = jh7100_clk_is_enabled,
+       .debug_init = jh7100_clk_debug_init,
+};
+
+static const struct clk_ops jh7100_clk_div_ops = {
+       .recalc_rate = jh7100_clk_recalc_rate,
+       .determine_rate = jh7100_clk_determine_rate,
+       .set_rate = jh7100_clk_set_rate,
+       .debug_init = jh7100_clk_debug_init,
+};
+
+static const struct clk_ops jh7100_clk_fdiv_ops = {
+       .recalc_rate = jh7100_clk_frac_recalc_rate,
+       .determine_rate = jh7100_clk_frac_determine_rate,
+       .set_rate = jh7100_clk_frac_set_rate,
+       .debug_init = jh7100_clk_debug_init,
+};
+
+static const struct clk_ops jh7100_clk_gdiv_ops = {
+       .enable = jh7100_clk_enable,
+       .disable = jh7100_clk_disable,
+       .is_enabled = jh7100_clk_is_enabled,
+       .recalc_rate = jh7100_clk_recalc_rate,
+       .determine_rate = jh7100_clk_determine_rate,
+       .set_rate = jh7100_clk_set_rate,
+       .debug_init = jh7100_clk_debug_init,
+};
+
+static const struct clk_ops jh7100_clk_mux_ops = {
+       .determine_rate = jh7100_clk_mux_determine_rate,
+       .set_parent = jh7100_clk_set_parent,
+       .get_parent = jh7100_clk_get_parent,
+       .debug_init = jh7100_clk_debug_init,
+};
+
+static const struct clk_ops jh7100_clk_gmux_ops = {
+       .enable = jh7100_clk_enable,
+       .disable = jh7100_clk_disable,
+       .is_enabled = jh7100_clk_is_enabled,
+       .determine_rate = jh7100_clk_mux_determine_rate,
+       .set_parent = jh7100_clk_set_parent,
+       .get_parent = jh7100_clk_get_parent,
+       .debug_init = jh7100_clk_debug_init,
+};
+
+static const struct clk_ops jh7100_clk_mdiv_ops = {
+       .recalc_rate = jh7100_clk_recalc_rate,
+       .determine_rate = jh7100_clk_determine_rate,
+       .get_parent = jh7100_clk_get_parent,
+       .set_parent = jh7100_clk_set_parent,
+       .set_rate = jh7100_clk_set_rate,
+       .debug_init = jh7100_clk_debug_init,
+};
+
+static const struct clk_ops jh7100_clk_gmd_ops = {
+       .enable = jh7100_clk_enable,
+       .disable = jh7100_clk_disable,
+       .is_enabled = jh7100_clk_is_enabled,
+       .recalc_rate = jh7100_clk_recalc_rate,
+       .determine_rate = jh7100_clk_determine_rate,
+       .get_parent = jh7100_clk_get_parent,
+       .set_parent = jh7100_clk_set_parent,
+       .set_rate = jh7100_clk_set_rate,
+       .debug_init = jh7100_clk_debug_init,
+};
+
+static const struct clk_ops jh7100_clk_inv_ops = {
+       .get_phase = jh7100_clk_get_phase,
+       .set_phase = jh7100_clk_set_phase,
+       .debug_init = jh7100_clk_debug_init,
+};
+
+const struct clk_ops *starfive_jh7100_clk_ops(u32 max)
+{
+       if (max & JH7100_CLK_DIV_MASK) {
+               if (max & JH7100_CLK_MUX_MASK) {
+                       if (max & JH7100_CLK_ENABLE)
+                               return &jh7100_clk_gmd_ops;
+                       return &jh7100_clk_mdiv_ops;
+               }
+               if (max & JH7100_CLK_ENABLE)
+                       return &jh7100_clk_gdiv_ops;
+               if (max == JH7100_CLK_FRAC_MAX)
+                       return &jh7100_clk_fdiv_ops;
+               return &jh7100_clk_div_ops;
+       }
+
+       if (max & JH7100_CLK_MUX_MASK) {
+               if (max & JH7100_CLK_ENABLE)
+                       return &jh7100_clk_gmux_ops;
+               return &jh7100_clk_mux_ops;
+       }
+
+       if (max & JH7100_CLK_ENABLE)
+               return &jh7100_clk_gate_ops;
+
+       return &jh7100_clk_inv_ops;
+}
+EXPORT_SYMBOL_GPL(starfive_jh7100_clk_ops);
--

2.38.1

author maintainer
#3 lore raw

Re: [PATCH v2 01/14] clk: starfive: Factor out common JH7100 and JH7110 code

Quoted 21 lines · Emil Renner Berthing
Quoted 20 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

The clock control registers on the StarFive JH7100 and JH7110 work identically, so factor out the code then drivers for the two SoCs can share it without depending on each other. No functional change.

---
 MAINTAINERS                                |   2 +-
 drivers/clk/starfive/Kconfig               |   5 +
 drivers/clk/starfive/Makefile              |   3 +-
 drivers/clk/starfive/clk-starfive-jh7100.c | 325 --------------------
 drivers/clk/starfive/clk-starfive-jh7100.h |   2 +
 drivers/clk/starfive/clk-starfive-jh71x0.c | 333 +++++++++++++++++++++
 6 files changed, 343 insertions(+), 327 deletions(-)
 create mode 100644 drivers/clk/starfive/clk-starfive-jh71x0.c
Quoted 14 lines

MAINTAINERS STARFIVE JH7100 CLOCK DRIVERS · line 19605

Quoted 10 lines
MAINTAINERS +1 -1
index 256f03904987..d43daa89d5f1 100644
@@ -19602,7 +19602,7 @@ STARFIVE JH7100 CLOCK DRIVERS
 M:     Emil Renner Berthing <[email protected]>
 S:     Maintained
 F:     Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
-F:     drivers/clk/starfive/clk-starfive-jh7100*
+F:     drivers/clk/starfive/

When this entry cover all the starfive clock drivers the header should also match. Eg.
STARFIVE CLOCK DRIVERS

OK, will fix it. Ditto for the reset driver.

Best regards,
Hal

author maintainer
#4 lore raw

PATCH v2 2/14 clk: starfive: Rename "jh7100" to "jh71x0" for the common code

In reply to Hal Feng

Rename "clk-starfive-jh7100.h" to "clk-starfive-jh71x0.h" and rename some variables from "jh7100" or "JH7100" to "jh71x0" or "JH71X0".

---
 .../clk/starfive/clk-starfive-jh7100-audio.c  |  74 ++--
 drivers/clk/starfive/clk-starfive-jh7100.c    | 388 +++++++++---------
 drivers/clk/starfive/clk-starfive-jh7100.h    | 114 -----
 drivers/clk/starfive/clk-starfive-jh71x0.c    | 284 ++++++-------
 drivers/clk/starfive/clk-starfive-jh71x0.h    | 114 +++++
 5 files changed, 487 insertions(+), 487 deletions(-)
 delete mode 100644 drivers/clk/starfive/clk-starfive-jh7100.h
 create mode 100644 drivers/clk/starfive/clk-starfive-jh71x0.h
drivers/clk/starfive/clk-starfive-jh7100-audio.c +37 -37
index 8473a65e219b..02aefb7264f8 100644
@@ -16,7 +16,7 @@
 
 #include <dt-bindings/clock/starfive-jh7100-audio.h>
 
-#include "clk-starfive-jh7100.h"
+#include "clk-starfive-jh71x0.h"
 
 /* external clocks */
 #define JH7100_AUDCLK_AUDIO_SRC			(JH7100_AUDCLK_END + 0)
@@ -28,66 +28,66 @@
 #define JH7100_AUDCLK_I2SDAC_LRCLK_IOPAD	(JH7100_AUDCLK_END + 6)
 #define JH7100_AUDCLK_VAD_INTMEM                (JH7100_AUDCLK_END + 7)
 
-static const struct jh7100_clk_data jh7100_audclk_data[] = {
-	JH7100__GMD(JH7100_AUDCLK_ADC_MCLK, "adc_mclk", 0, 15, 2,
+static const struct jh71x0_clk_data jh7100_audclk_data[] = {
+	JH71X0__GMD(JH7100_AUDCLK_ADC_MCLK, "adc_mclk", 0, 15, 2,
 		    JH7100_AUDCLK_AUDIO_SRC,
 		    JH7100_AUDCLK_AUDIO_12288),
-	JH7100__GMD(JH7100_AUDCLK_I2S1_MCLK, "i2s1_mclk", 0, 15, 2,
+	JH71X0__GMD(JH7100_AUDCLK_I2S1_MCLK, "i2s1_mclk", 0, 15, 2,
 		    JH7100_AUDCLK_AUDIO_SRC,
 		    JH7100_AUDCLK_AUDIO_12288),
-	JH7100_GATE(JH7100_AUDCLK_I2SADC_APB, "i2sadc_apb", 0, JH7100_AUDCLK_APB0_BUS),
-	JH7100_MDIV(JH7100_AUDCLK_I2SADC_BCLK, "i2sadc_bclk", 31, 2,
+	JH71X0_GATE(JH7100_AUDCLK_I2SADC_APB, "i2sadc_apb", 0, JH7100_AUDCLK_APB0_BUS),
+	JH71X0_MDIV(JH7100_AUDCLK_I2SADC_BCLK, "i2sadc_bclk", 31, 2,
 		    JH7100_AUDCLK_ADC_MCLK,
 		    JH7100_AUDCLK_I2SADC_BCLK_IOPAD),
-	JH7100__INV(JH7100_AUDCLK_I2SADC_BCLK_N, "i2sadc_bclk_n", JH7100_AUDCLK_I2SADC_BCLK),
-	JH7100_MDIV(JH7100_AUDCLK_I2SADC_LRCLK, "i2sadc_lrclk", 63, 3,
+	JH71X0__INV(JH7100_AUDCLK_I2SADC_BCLK_N, "i2sadc_bclk_n", JH7100_AUDCLK_I2SADC_BCLK),
+	JH71X0_MDIV(JH7100_AUDCLK_I2SADC_LRCLK, "i2sadc_lrclk", 63, 3,
 		    JH7100_AUDCLK_I2SADC_BCLK_N,
 		    JH7100_AUDCLK_I2SADC_LRCLK_IOPAD,
 		    JH7100_AUDCLK_I2SADC_BCLK),
-	JH7100_GATE(JH7100_AUDCLK_PDM_APB, "pdm_apb", 0, JH7100_AUDCLK_APB0_BUS),
-	JH7100__GMD(JH7100_AUDCLK_PDM_MCLK, "pdm_mclk", 0, 15, 2,
+	JH71X0_GATE(JH7100_AUDCLK_PDM_APB, "pdm_apb", 0, JH7100_AUDCLK_APB0_BUS),
+	JH71X0__GMD(JH7100_AUDCLK_PDM_MCLK, "pdm_mclk", 0, 15, 2,
 		    JH7100_AUDCLK_AUDIO_SRC,
 		    JH7100_AUDCLK_AUDIO_12288),
-	JH7100_GATE(JH7100_AUDCLK_I2SVAD_APB, "i2svad_apb", 0, JH7100_AUDCLK_APB0_BUS),
-	JH7100__GMD(JH7100_AUDCLK_SPDIF, "spdif", 0, 15, 2,
+	JH71X0_GATE(JH7100_AUDCLK_I2SVAD_APB, "i2svad_apb", 0, JH7100_AUDCLK_APB0_BUS),
+	JH71X0__GMD(JH7100_AUDCLK_SPDIF, "spdif", 0, 15, 2,
 		    JH7100_AUDCLK_AUDIO_SRC,
 		    JH7100_AUDCLK_AUDIO_12288),
-	JH7100_GATE(JH7100_AUDCLK_SPDIF_APB, "spdif_apb", 0, JH7100_AUDCLK_APB0_BUS),
-	JH7100_GATE(JH7100_AUDCLK_PWMDAC_APB, "pwmdac_apb", 0, JH7100_AUDCLK_APB0_BUS),
-	JH7100__GMD(JH7100_AUDCLK_DAC_MCLK, "dac_mclk", 0, 15, 2,
+	JH71X0_GATE(JH7100_AUDCLK_SPDIF_APB, "spdif_apb", 0, JH7100_AUDCLK_APB0_BUS),
+	JH71X0_GATE(JH7100_AUDCLK_PWMDAC_APB, "pwmdac_apb", 0, JH7100_AUDCLK_APB0_BUS),
+	JH71X0__GMD(JH7100_AUDCLK_DAC_MCLK, "dac_mclk", 0, 15, 2,
 		    JH7100_AUDCLK_AUDIO_SRC,
 		    JH7100_AUDCLK_AUDIO_12288),
-	JH7100_GATE(JH7100_AUDCLK_I2SDAC_APB, "i2sdac_apb", 0, JH7100_AUDCLK_APB0_BUS),
-	JH7100_MDIV(JH7100_AUDCLK_I2SDAC_BCLK, "i2sdac_bclk", 31, 2,
+	JH71X0_GATE(JH7100_AUDCLK_I2SDAC_APB, "i2sdac_apb", 0, JH7100_AUDCLK_APB0_BUS),
+	JH71X0_MDIV(JH7100_AUDCLK_I2SDAC_BCLK, "i2sdac_bclk", 31, 2,
 		    JH7100_AUDCLK_DAC_MCLK,
 		    JH7100_AUDCLK_I2SDAC_BCLK_IOPAD),
-	JH7100__INV(JH7100_AUDCLK_I2SDAC_BCLK_N, "i2sdac_bclk_n", JH7100_AUDCLK_I2SDAC_BCLK),
-	JH7100_MDIV(JH7100_AUDCLK_I2SDAC_LRCLK, "i2sdac_lrclk", 31, 2,
+	JH71X0__INV(JH7100_AUDCLK_I2SDAC_BCLK_N, "i2sdac_bclk_n", JH7100_AUDCLK_I2SDAC_BCLK),
+	JH71X0_MDIV(JH7100_AUDCLK_I2SDAC_LRCLK, "i2sdac_lrclk", 31, 2,
 		    JH7100_AUDCLK_I2S1_MCLK,
 		    JH7100_AUDCLK_I2SDAC_BCLK_IOPAD),
-	JH7100_GATE(JH7100_AUDCLK_I2S1_APB, "i2s1_apb", 0, JH7100_AUDCLK_APB0_BUS),
-	JH7100_MDIV(JH7100_AUDCLK_I2S1_BCLK, "i2s1_bclk", 31, 2,
+	JH71X0_GATE(JH7100_AUDCLK_I2S1_APB, "i2s1_apb", 0, JH7100_AUDCLK_APB0_BUS),
+	JH71X0_MDIV(JH7100_AUDCLK_I2S1_BCLK, "i2s1_bclk", 31, 2,
 		    JH7100_AUDCLK_I2S1_MCLK,
 		    JH7100_AUDCLK_I2SDAC_BCLK_IOPAD),
-	JH7100__INV(JH7100_AUDCLK_I2S1_BCLK_N, "i2s1_bclk_n", JH7100_AUDCLK_I2S1_BCLK),
-	JH7100_MDIV(JH7100_AUDCLK_I2S1_LRCLK, "i2s1_lrclk", 63, 3,
+	JH71X0__INV(JH7100_AUDCLK_I2S1_BCLK_N, "i2s1_bclk_n", JH7100_AUDCLK_I2S1_BCLK),
+	JH71X0_MDIV(JH7100_AUDCLK_I2S1_LRCLK, "i2s1_lrclk", 63, 3,
 		    JH7100_AUDCLK_I2S1_BCLK_N,
 		    JH7100_AUDCLK_I2SDAC_LRCLK_IOPAD),
-	JH7100_GATE(JH7100_AUDCLK_I2SDAC16K_APB, "i2s1dac16k_apb", 0, JH7100_AUDCLK_APB0_BUS),
-	JH7100__DIV(JH7100_AUDCLK_APB0_BUS, "apb0_bus", 8, JH7100_AUDCLK_DOM7AHB_BUS),
-	JH7100_GATE(JH7100_AUDCLK_DMA1P_AHB, "dma1p_ahb", 0, JH7100_AUDCLK_DOM7AHB_BUS),
-	JH7100_GATE(JH7100_AUDCLK_USB_APB, "usb_apb", CLK_IGNORE_UNUSED, JH7100_AUDCLK_APB_EN),
-	JH7100_GDIV(JH7100_AUDCLK_USB_LPM, "usb_lpm", CLK_IGNORE_UNUSED, 4, JH7100_AUDCLK_USB_APB),
-	JH7100_GDIV(JH7100_AUDCLK_USB_STB, "usb_stb", CLK_IGNORE_UNUSED, 3, JH7100_AUDCLK_USB_APB),
-	JH7100__DIV(JH7100_AUDCLK_APB_EN, "apb_en", 8, JH7100_AUDCLK_DOM7AHB_BUS),
-	JH7100__MUX(JH7100_AUDCLK_VAD_MEM, "vad_mem", 2,
+	JH71X0_GATE(JH7100_AUDCLK_I2SDAC16K_APB, "i2s1dac16k_apb", 0, JH7100_AUDCLK_APB0_BUS),
+	JH71X0__DIV(JH7100_AUDCLK_APB0_BUS, "apb0_bus", 8, JH7100_AUDCLK_DOM7AHB_BUS),
+	JH71X0_GATE(JH7100_AUDCLK_DMA1P_AHB, "dma1p_ahb", 0, JH7100_AUDCLK_DOM7AHB_BUS),
+	JH71X0_GATE(JH7100_AUDCLK_USB_APB, "usb_apb", CLK_IGNORE_UNUSED, JH7100_AUDCLK_APB_EN),
+	JH71X0_GDIV(JH7100_AUDCLK_USB_LPM, "usb_lpm", CLK_IGNORE_UNUSED, 4, JH7100_AUDCLK_USB_APB),
+	JH71X0_GDIV(JH7100_AUDCLK_USB_STB, "usb_stb", CLK_IGNORE_UNUSED, 3, JH7100_AUDCLK_USB_APB),
+	JH71X0__DIV(JH7100_AUDCLK_APB_EN, "apb_en", 8, JH7100_AUDCLK_DOM7AHB_BUS),
+	JH71X0__MUX(JH7100_AUDCLK_VAD_MEM, "vad_mem", 2,
 		    JH7100_AUDCLK_VAD_INTMEM,
 		    JH7100_AUDCLK_AUDIO_12288),
 };
 
 static struct clk_hw *jh7100_audclk_get(struct of_phandle_args *clkspec, void *data)
 {
-	struct jh7100_clk_priv *priv = data;
+	struct jh71x0_clk_priv *priv = data;
 	unsigned int idx = clkspec->args[0];
 
 	if (idx < JH7100_AUDCLK_END)
@@ -98,7 +98,7 @@ static struct clk_hw *jh7100_audclk_get(struct of_phandle_args *clkspec, void *d
 
 static int jh7100_audclk_probe(struct platform_device *pdev)
 {
-	struct jh7100_clk_priv *priv;
+	struct jh71x0_clk_priv *priv;
 	unsigned int idx;
 	int ret;
 
@@ -117,12 +117,12 @@ static int jh7100_audclk_probe(struct platform_device *pdev)
 		struct clk_parent_data parents[4] = {};
 		struct clk_init_data init = {
 			.name = jh7100_audclk_data[idx].name,
-			.ops = starfive_jh7100_clk_ops(max),
+			.ops = starfive_jh71x0_clk_ops(max),
 			.parent_data = parents,
-			.num_parents = ((max & JH7100_CLK_MUX_MASK) >> JH7100_CLK_MUX_SHIFT) + 1,
+			.num_parents = ((max & JH71X0_CLK_MUX_MASK) >> JH71X0_CLK_MUX_SHIFT) + 1,
 			.flags = jh7100_audclk_data[idx].flags,
 		};
-		struct jh7100_clk *clk = &priv->reg[idx];
+		struct jh71x0_clk *clk = &priv->reg[idx];
 		unsigned int i;
 
 		for (i = 0; i < init.num_parents; i++) {
@@ -140,7 +140,7 @@ static int jh7100_audclk_probe(struct platform_device *pdev)
 
 		clk->hw.init = &init;
 		clk->idx = idx;
-		clk->max_div = max & JH7100_CLK_DIV_MASK;
+		clk->max_div = max & JH71X0_CLK_DIV_MASK;
 
 		ret = devm_clk_hw_register(priv->dev, &clk->hw);
 		if (ret)
drivers/clk/starfive/clk-starfive-jh7100.c +194 -194

477 lines not on this page · raw message

drivers/clk/starfive/clk-starfive-jh7100.h deleted +0 -114

114 lines not on this page · raw message

drivers/clk/starfive/clk-starfive-jh71x0.c +142 -142

450 lines not on this page · raw message

drivers/clk/starfive/clk-starfive-jh71x0.h new file +114 -0

114 lines not on this page · raw message

Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#5 lore raw

Re: [PATCH v2 02/14] clk: starfive: Rename "jh7100" to "jh71x0" for the common code

Quoted 5 lines · Hal Feng

Rename "clk-starfive-jh7100.h" to "clk-starfive-jh71x0.h" and rename some variables from "jh7100" or "JH7100" to "jh71x0" or "JH71X0".

The patch is fine, but I'm a little unsure about this Co-developed-by. This patch is taken directly from my jh7110 branch so does Hal sending it count as co-developed-by?

Quoted 1,344 lines
---
 .../clk/starfive/clk-starfive-jh7100-audio.c  |  74 ++--
 drivers/clk/starfive/clk-starfive-jh7100.c    | 388 +++++++++---------
 drivers/clk/starfive/clk-starfive-jh7100.h    | 114 -----
 drivers/clk/starfive/clk-starfive-jh71x0.c    | 284 ++++++-------
 drivers/clk/starfive/clk-starfive-jh71x0.h    | 114 +++++
 5 files changed, 487 insertions(+), 487 deletions(-)
 delete mode 100644 drivers/clk/starfive/clk-starfive-jh7100.h
 create mode 100644 drivers/clk/starfive/clk-starfive-jh71x0.h
drivers/clk/starfive/clk-starfive-jh7100-audio.c +37 -37
index 8473a65e219b..02aefb7264f8 100644
@@ -16,7 +16,7 @@
 
 #include <dt-bindings/clock/starfive-jh7100-audio.h>
 
-#include "clk-starfive-jh7100.h"
+#include "clk-starfive-jh71x0.h"
 
 /* external clocks */
 #define JH7100_AUDCLK_AUDIO_SRC                        (JH7100_AUDCLK_END + 0)
@@ -28,66 +28,66 @@
 #define JH7100_AUDCLK_I2SDAC_LRCLK_IOPAD       (JH7100_AUDCLK_END + 6)
 #define JH7100_AUDCLK_VAD_INTMEM                (JH7100_AUDCLK_END + 7)
 
-static const struct jh7100_clk_data jh7100_audclk_data[] = {
-       JH7100__GMD(JH7100_AUDCLK_ADC_MCLK, "adc_mclk", 0, 15, 2,
+static const struct jh71x0_clk_data jh7100_audclk_data[] = {
+       JH71X0__GMD(JH7100_AUDCLK_ADC_MCLK, "adc_mclk", 0, 15, 2,
                    JH7100_AUDCLK_AUDIO_SRC,
                    JH7100_AUDCLK_AUDIO_12288),
-       JH7100__GMD(JH7100_AUDCLK_I2S1_MCLK, "i2s1_mclk", 0, 15, 2,
+       JH71X0__GMD(JH7100_AUDCLK_I2S1_MCLK, "i2s1_mclk", 0, 15, 2,
                    JH7100_AUDCLK_AUDIO_SRC,
                    JH7100_AUDCLK_AUDIO_12288),
-       JH7100_GATE(JH7100_AUDCLK_I2SADC_APB, "i2sadc_apb", 0, JH7100_AUDCLK_APB0_BUS),
-       JH7100_MDIV(JH7100_AUDCLK_I2SADC_BCLK, "i2sadc_bclk", 31, 2,
+       JH71X0_GATE(JH7100_AUDCLK_I2SADC_APB, "i2sadc_apb", 0, JH7100_AUDCLK_APB0_BUS),
+       JH71X0_MDIV(JH7100_AUDCLK_I2SADC_BCLK, "i2sadc_bclk", 31, 2,
                    JH7100_AUDCLK_ADC_MCLK,
                    JH7100_AUDCLK_I2SADC_BCLK_IOPAD),
-       JH7100__INV(JH7100_AUDCLK_I2SADC_BCLK_N, "i2sadc_bclk_n", JH7100_AUDCLK_I2SADC_BCLK),
-       JH7100_MDIV(JH7100_AUDCLK_I2SADC_LRCLK, "i2sadc_lrclk", 63, 3,
+       JH71X0__INV(JH7100_AUDCLK_I2SADC_BCLK_N, "i2sadc_bclk_n", JH7100_AUDCLK_I2SADC_BCLK),
+       JH71X0_MDIV(JH7100_AUDCLK_I2SADC_LRCLK, "i2sadc_lrclk", 63, 3,
                    JH7100_AUDCLK_I2SADC_BCLK_N,
                    JH7100_AUDCLK_I2SADC_LRCLK_IOPAD,
                    JH7100_AUDCLK_I2SADC_BCLK),
-       JH7100_GATE(JH7100_AUDCLK_PDM_APB, "pdm_apb", 0, JH7100_AUDCLK_APB0_BUS),
-       JH7100__GMD(JH7100_AUDCLK_PDM_MCLK, "pdm_mclk", 0, 15, 2,
+       JH71X0_GATE(JH7100_AUDCLK_PDM_APB, "pdm_apb", 0, JH7100_AUDCLK_APB0_BUS),
+       JH71X0__GMD(JH7100_AUDCLK_PDM_MCLK, "pdm_mclk", 0, 15, 2,
                    JH7100_AUDCLK_AUDIO_SRC,
                    JH7100_AUDCLK_AUDIO_12288),
-       JH7100_GATE(JH7100_AUDCLK_I2SVAD_APB, "i2svad_apb", 0, JH7100_AUDCLK_APB0_BUS),
-       JH7100__GMD(JH7100_AUDCLK_SPDIF, "spdif", 0, 15, 2,
+       JH71X0_GATE(JH7100_AUDCLK_I2SVAD_APB, "i2svad_apb", 0, JH7100_AUDCLK_APB0_BUS),
+       JH71X0__GMD(JH7100_AUDCLK_SPDIF, "spdif", 0, 15, 2,
                    JH7100_AUDCLK_AUDIO_SRC,
                    JH7100_AUDCLK_AUDIO_12288),
-       JH7100_GATE(JH7100_AUDCLK_SPDIF_APB, "spdif_apb", 0, JH7100_AUDCLK_APB0_BUS),
-       JH7100_GATE(JH7100_AUDCLK_PWMDAC_APB, "pwmdac_apb", 0, JH7100_AUDCLK_APB0_BUS),
-       JH7100__GMD(JH7100_AUDCLK_DAC_MCLK, "dac_mclk", 0, 15, 2,
+       JH71X0_GATE(JH7100_AUDCLK_SPDIF_APB, "spdif_apb", 0, JH7100_AUDCLK_APB0_BUS),
+       JH71X0_GATE(JH7100_AUDCLK_PWMDAC_APB, "pwmdac_apb", 0, JH7100_AUDCLK_APB0_BUS),
+       JH71X0__GMD(JH7100_AUDCLK_DAC_MCLK, "dac_mclk", 0, 15, 2,
                    JH7100_AUDCLK_AUDIO_SRC,
                    JH7100_AUDCLK_AUDIO_12288),
-       JH7100_GATE(JH7100_AUDCLK_I2SDAC_APB, "i2sdac_apb", 0, JH7100_AUDCLK_APB0_BUS),
-       JH7100_MDIV(JH7100_AUDCLK_I2SDAC_BCLK, "i2sdac_bclk", 31, 2,
+       JH71X0_GATE(JH7100_AUDCLK_I2SDAC_APB, "i2sdac_apb", 0, JH7100_AUDCLK_APB0_BUS),
+       JH71X0_MDIV(JH7100_AUDCLK_I2SDAC_BCLK, "i2sdac_bclk", 31, 2,
                    JH7100_AUDCLK_DAC_MCLK,
                    JH7100_AUDCLK_I2SDAC_BCLK_IOPAD),
-       JH7100__INV(JH7100_AUDCLK_I2SDAC_BCLK_N, "i2sdac_bclk_n", JH7100_AUDCLK_I2SDAC_BCLK),
-       JH7100_MDIV(JH7100_AUDCLK_I2SDAC_LRCLK, "i2sdac_lrclk", 31, 2,
+       JH71X0__INV(JH7100_AUDCLK_I2SDAC_BCLK_N, "i2sdac_bclk_n", JH7100_AUDCLK_I2SDAC_BCLK),
+       JH71X0_MDIV(JH7100_AUDCLK_I2SDAC_LRCLK, "i2sdac_lrclk", 31, 2,
                    JH7100_AUDCLK_I2S1_MCLK,
                    JH7100_AUDCLK_I2SDAC_BCLK_IOPAD),
-       JH7100_GATE(JH7100_AUDCLK_I2S1_APB, "i2s1_apb", 0, JH7100_AUDCLK_APB0_BUS),
-       JH7100_MDIV(JH7100_AUDCLK_I2S1_BCLK, "i2s1_bclk", 31, 2,
+       JH71X0_GATE(JH7100_AUDCLK_I2S1_APB, "i2s1_apb", 0, JH7100_AUDCLK_APB0_BUS),
+       JH71X0_MDIV(JH7100_AUDCLK_I2S1_BCLK, "i2s1_bclk", 31, 2,
                    JH7100_AUDCLK_I2S1_MCLK,
                    JH7100_AUDCLK_I2SDAC_BCLK_IOPAD),
-       JH7100__INV(JH7100_AUDCLK_I2S1_BCLK_N, "i2s1_bclk_n", JH7100_AUDCLK_I2S1_BCLK),
-       JH7100_MDIV(JH7100_AUDCLK_I2S1_LRCLK, "i2s1_lrclk", 63, 3,
+       JH71X0__INV(JH7100_AUDCLK_I2S1_BCLK_N, "i2s1_bclk_n", JH7100_AUDCLK_I2S1_BCLK),
+       JH71X0_MDIV(JH7100_AUDCLK_I2S1_LRCLK, "i2s1_lrclk", 63, 3,
                    JH7100_AUDCLK_I2S1_BCLK_N,
                    JH7100_AUDCLK_I2SDAC_LRCLK_IOPAD),
-       JH7100_GATE(JH7100_AUDCLK_I2SDAC16K_APB, "i2s1dac16k_apb", 0, JH7100_AUDCLK_APB0_BUS),
-       JH7100__DIV(JH7100_AUDCLK_APB0_BUS, "apb0_bus", 8, JH7100_AUDCLK_DOM7AHB_BUS),
-       JH7100_GATE(JH7100_AUDCLK_DMA1P_AHB, "dma1p_ahb", 0, JH7100_AUDCLK_DOM7AHB_BUS),
-       JH7100_GATE(JH7100_AUDCLK_USB_APB, "usb_apb", CLK_IGNORE_UNUSED, JH7100_AUDCLK_APB_EN),
-       JH7100_GDIV(JH7100_AUDCLK_USB_LPM, "usb_lpm", CLK_IGNORE_UNUSED, 4, JH7100_AUDCLK_USB_APB),
-       JH7100_GDIV(JH7100_AUDCLK_USB_STB, "usb_stb", CLK_IGNORE_UNUSED, 3, JH7100_AUDCLK_USB_APB),
-       JH7100__DIV(JH7100_AUDCLK_APB_EN, "apb_en", 8, JH7100_AUDCLK_DOM7AHB_BUS),
-       JH7100__MUX(JH7100_AUDCLK_VAD_MEM, "vad_mem", 2,
+       JH71X0_GATE(JH7100_AUDCLK_I2SDAC16K_APB, "i2s1dac16k_apb", 0, JH7100_AUDCLK_APB0_BUS),
+       JH71X0__DIV(JH7100_AUDCLK_APB0_BUS, "apb0_bus", 8, JH7100_AUDCLK_DOM7AHB_BUS),
+       JH71X0_GATE(JH7100_AUDCLK_DMA1P_AHB, "dma1p_ahb", 0, JH7100_AUDCLK_DOM7AHB_BUS),
+       JH71X0_GATE(JH7100_AUDCLK_USB_APB, "usb_apb", CLK_IGNORE_UNUSED, JH7100_AUDCLK_APB_EN),
+       JH71X0_GDIV(JH7100_AUDCLK_USB_LPM, "usb_lpm", CLK_IGNORE_UNUSED, 4, JH7100_AUDCLK_USB_APB),
+       JH71X0_GDIV(JH7100_AUDCLK_USB_STB, "usb_stb", CLK_IGNORE_UNUSED, 3, JH7100_AUDCLK_USB_APB),
+       JH71X0__DIV(JH7100_AUDCLK_APB_EN, "apb_en", 8, JH7100_AUDCLK_DOM7AHB_BUS),
+       JH71X0__MUX(JH7100_AUDCLK_VAD_MEM, "vad_mem", 2,
                    JH7100_AUDCLK_VAD_INTMEM,
                    JH7100_AUDCLK_AUDIO_12288),
 };
 
 static struct clk_hw *jh7100_audclk_get(struct of_phandle_args *clkspec, void *data)
 {
-       struct jh7100_clk_priv *priv = data;
+       struct jh71x0_clk_priv *priv = data;
        unsigned int idx = clkspec->args[0];
 
        if (idx < JH7100_AUDCLK_END)
@@ -98,7 +98,7 @@ static struct clk_hw *jh7100_audclk_get(struct of_phandle_args *clkspec, void *d
 
 static int jh7100_audclk_probe(struct platform_device *pdev)
 {
-       struct jh7100_clk_priv *priv;
+       struct jh71x0_clk_priv *priv;
        unsigned int idx;
        int ret;
 
@@ -117,12 +117,12 @@ static int jh7100_audclk_probe(struct platform_device *pdev)
                struct clk_parent_data parents[4] = {};
                struct clk_init_data init = {
                        .name = jh7100_audclk_data[idx].name,
-                       .ops = starfive_jh7100_clk_ops(max),
+                       .ops = starfive_jh71x0_clk_ops(max),
                        .parent_data = parents,
-                       .num_parents = ((max & JH7100_CLK_MUX_MASK) >> JH7100_CLK_MUX_SHIFT) + 1,
+                       .num_parents = ((max & JH71X0_CLK_MUX_MASK) >> JH71X0_CLK_MUX_SHIFT) + 1,
                        .flags = jh7100_audclk_data[idx].flags,
                };
-               struct jh7100_clk *clk = &priv->reg[idx];
+               struct jh71x0_clk *clk = &priv->reg[idx];
                unsigned int i;
 
                for (i = 0; i < init.num_parents; i++) {
@@ -140,7 +140,7 @@ static int jh7100_audclk_probe(struct platform_device *pdev)
 
                clk->hw.init = &init;
                clk->idx = idx;
-               clk->max_div = max & JH7100_CLK_DIV_MASK;
+               clk->max_div = max & JH71X0_CLK_DIV_MASK;
 
                ret = devm_clk_hw_register(priv->dev, &clk->hw);
                if (ret)
drivers/clk/starfive/clk-starfive-jh7100.c +194 -194
index eea52f16af0d..bcc9acdd5936 100644
@@ -15,7 +15,7 @@
 
 #include <dt-bindings/clock/starfive-jh7100.h>
 
-#include "clk-starfive-jh7100.h"
+#include "clk-starfive-jh71x0.h"
 
 /* external clocks */
 #define JH7100_CLK_OSC_SYS             (JH7100_CLK_END + 0)
@@ -23,250 +23,250 @@
 #define JH7100_CLK_GMAC_RMII_REF       (JH7100_CLK_END + 2)
 #define JH7100_CLK_GMAC_GR_MII_RX      (JH7100_CLK_END + 3)
 
-static const struct jh7100_clk_data jh7100_clk_data[] __initconst = {
-       JH7100__MUX(JH7100_CLK_CPUNDBUS_ROOT, "cpundbus_root", 4,
+static const struct jh71x0_clk_data jh7100_clk_data[] __initconst = {
+       JH71X0__MUX(JH7100_CLK_CPUNDBUS_ROOT, "cpundbus_root", 4,
                    JH7100_CLK_OSC_SYS,
                    JH7100_CLK_PLL0_OUT,
                    JH7100_CLK_PLL1_OUT,
                    JH7100_CLK_PLL2_OUT),
-       JH7100__MUX(JH7100_CLK_DLA_ROOT, "dla_root", 3,
+       JH71X0__MUX(JH7100_CLK_DLA_ROOT, "dla_root", 3,
                    JH7100_CLK_OSC_SYS,
                    JH7100_CLK_PLL1_OUT,
                    JH7100_CLK_PLL2_OUT),
-       JH7100__MUX(JH7100_CLK_DSP_ROOT, "dsp_root", 4,
+       JH71X0__MUX(JH7100_CLK_DSP_ROOT, "dsp_root", 4,
                    JH7100_CLK_OSC_SYS,
                    JH7100_CLK_PLL0_OUT,
                    JH7100_CLK_PLL1_OUT,
                    JH7100_CLK_PLL2_OUT),
-       JH7100__MUX(JH7100_CLK_GMACUSB_ROOT, "gmacusb_root", 3,
+       JH71X0__MUX(JH7100_CLK_GMACUSB_ROOT, "gmacusb_root", 3,
                    JH7100_CLK_OSC_SYS,
                    JH7100_CLK_PLL0_OUT,
                    JH7100_CLK_PLL2_OUT),
-       JH7100__MUX(JH7100_CLK_PERH0_ROOT, "perh0_root", 2,
+       JH71X0__MUX(JH7100_CLK_PERH0_ROOT, "perh0_root", 2,
                    JH7100_CLK_OSC_SYS,
                    JH7100_CLK_PLL0_OUT),
-       JH7100__MUX(JH7100_CLK_PERH1_ROOT, "perh1_root", 2,
+       JH71X0__MUX(JH7100_CLK_PERH1_ROOT, "perh1_root", 2,
                    JH7100_CLK_OSC_SYS,
                    JH7100_CLK_PLL2_OUT),
-       JH7100__MUX(JH7100_CLK_VIN_ROOT, "vin_root", 3,
+       JH71X0__MUX(JH7100_CLK_VIN_ROOT, "vin_root", 3,
                    JH7100_CLK_OSC_SYS,
                    JH7100_CLK_PLL1_OUT,
                    JH7100_CLK_PLL2_OUT),
-       JH7100__MUX(JH7100_CLK_VOUT_ROOT, "vout_root", 3,
+       JH71X0__MUX(JH7100_CLK_VOUT_ROOT, "vout_root", 3,
                    JH7100_CLK_OSC_AUD,
                    JH7100_CLK_PLL0_OUT,
                    JH7100_CLK_PLL2_OUT),
-       JH7100_GDIV(JH7100_CLK_AUDIO_ROOT, "audio_root", 0, 8, JH7100_CLK_PLL0_OUT),
-       JH7100__MUX(JH7100_CLK_CDECHIFI4_ROOT, "cdechifi4_root", 3,
+       JH71X0_GDIV(JH7100_CLK_AUDIO_ROOT, "audio_root", 0, 8, JH7100_CLK_PLL0_OUT),
+       JH71X0__MUX(JH7100_CLK_CDECHIFI4_ROOT, "cdechifi4_root", 3,
                    JH7100_CLK_OSC_SYS,
                    JH7100_CLK_PLL1_OUT,
                    JH7100_CLK_PLL2_OUT),
-       JH7100__MUX(JH7100_CLK_CDEC_ROOT, "cdec_root", 3,
+       JH71X0__MUX(JH7100_CLK_CDEC_ROOT, "cdec_root", 3,
                    JH7100_CLK_OSC_SYS,
                    JH7100_CLK_PLL0_OUT,
                    JH7100_CLK_PLL1_OUT),
-       JH7100__MUX(JH7100_CLK_VOUTBUS_ROOT, "voutbus_root", 3,
+       JH71X0__MUX(JH7100_CLK_VOUTBUS_ROOT, "voutbus_root", 3,
                    JH7100_CLK_OSC_AUD,
                    JH7100_CLK_PLL0_OUT,
                    JH7100_CLK_PLL2_OUT),
-       JH7100__DIV(JH7100_CLK_CPUNBUS_ROOT_DIV, "cpunbus_root_div", 2, JH7100_CLK_CPUNDBUS_ROOT),
-       JH7100__DIV(JH7100_CLK_DSP_ROOT_DIV, "dsp_root_div", 4, JH7100_CLK_DSP_ROOT),
-       JH7100__DIV(JH7100_CLK_PERH0_SRC, "perh0_src", 4, JH7100_CLK_PERH0_ROOT),
-       JH7100__DIV(JH7100_CLK_PERH1_SRC, "perh1_src", 4, JH7100_CLK_PERH1_ROOT),
-       JH7100_GDIV(JH7100_CLK_PLL0_TESTOUT, "pll0_testout", 0, 31, JH7100_CLK_PERH0_SRC),
-       JH7100_GDIV(JH7100_CLK_PLL1_TESTOUT, "pll1_testout", 0, 31, JH7100_CLK_DLA_ROOT),
-       JH7100_GDIV(JH7100_CLK_PLL2_TESTOUT, "pll2_testout", 0, 31, JH7100_CLK_PERH1_SRC),
-       JH7100__MUX(JH7100_CLK_PLL2_REF, "pll2_refclk", 2,
+       JH71X0__DIV(JH7100_CLK_CPUNBUS_ROOT_DIV, "cpunbus_root_div", 2, JH7100_CLK_CPUNDBUS_ROOT),
+       JH71X0__DIV(JH7100_CLK_DSP_ROOT_DIV, "dsp_root_div", 4, JH7100_CLK_DSP_ROOT),
+       JH71X0__DIV(JH7100_CLK_PERH0_SRC, "perh0_src", 4, JH7100_CLK_PERH0_ROOT),
+       JH71X0__DIV(JH7100_CLK_PERH1_SRC, "perh1_src", 4, JH7100_CLK_PERH1_ROOT),
+       JH71X0_GDIV(JH7100_CLK_PLL0_TESTOUT, "pll0_testout", 0, 31, JH7100_CLK_PERH0_SRC),
+       JH71X0_GDIV(JH7100_CLK_PLL1_TESTOUT, "pll1_testout", 0, 31, JH7100_CLK_DLA_ROOT),
+       JH71X0_GDIV(JH7100_CLK_PLL2_TESTOUT, "pll2_testout", 0, 31, JH7100_CLK_PERH1_SRC),
+       JH71X0__MUX(JH7100_CLK_PLL2_REF, "pll2_refclk", 2,
                    JH7100_CLK_OSC_SYS,
                    JH7100_CLK_OSC_AUD),
-       JH7100__DIV(JH7100_CLK_CPU_CORE, "cpu_core", 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
-       JH7100__DIV(JH7100_CLK_CPU_AXI, "cpu_axi", 8, JH7100_CLK_CPU_CORE),
-       JH7100__DIV(JH7100_CLK_AHB_BUS, "ahb_bus", 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
-       JH7100__DIV(JH7100_CLK_APB1_BUS, "apb1_bus", 8, JH7100_CLK_AHB_BUS),
-       JH7100__DIV(JH7100_CLK_APB2_BUS, "apb2_bus", 8, JH7100_CLK_AHB_BUS),
-       JH7100_GATE(JH7100_CLK_DOM3AHB_BUS, "dom3ahb_bus", CLK_IS_CRITICAL, JH7100_CLK_AHB_BUS),
-       JH7100_GATE(JH7100_CLK_DOM7AHB_BUS, "dom7ahb_bus", CLK_IS_CRITICAL, JH7100_CLK_AHB_BUS),
-       JH7100_GATE(JH7100_CLK_U74_CORE0, "u74_core0", CLK_IS_CRITICAL, JH7100_CLK_CPU_CORE),
-       JH7100_GDIV(JH7100_CLK_U74_CORE1, "u74_core1", CLK_IS_CRITICAL, 8, JH7100_CLK_CPU_CORE),
-       JH7100_GATE(JH7100_CLK_U74_AXI, "u74_axi", CLK_IS_CRITICAL, JH7100_CLK_CPU_AXI),
-       JH7100_GATE(JH7100_CLK_U74RTC_TOGGLE, "u74rtc_toggle", CLK_IS_CRITICAL, JH7100_CLK_OSC_SYS),
-       JH7100_GATE(JH7100_CLK_SGDMA2P_AXI, "sgdma2p_axi", 0, JH7100_CLK_CPU_AXI),
-       JH7100_GATE(JH7100_CLK_DMA2PNOC_AXI, "dma2pnoc_axi", 0, JH7100_CLK_CPU_AXI),
-       JH7100_GATE(JH7100_CLK_SGDMA2P_AHB, "sgdma2p_ahb", 0, JH7100_CLK_AHB_BUS),
-       JH7100__DIV(JH7100_CLK_DLA_BUS, "dla_bus", 4, JH7100_CLK_DLA_ROOT),
-       JH7100_GATE(JH7100_CLK_DLA_AXI, "dla_axi", 0, JH7100_CLK_DLA_BUS),
-       JH7100_GATE(JH7100_CLK_DLANOC_AXI, "dlanoc_axi", 0, JH7100_CLK_DLA_BUS),
-       JH7100_GATE(JH7100_CLK_DLA_APB, "dla_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GDIV(JH7100_CLK_VP6_CORE, "vp6_core", 0, 4, JH7100_CLK_DSP_ROOT_DIV),
-       JH7100__DIV(JH7100_CLK_VP6BUS_SRC, "vp6bus_src", 4, JH7100_CLK_DSP_ROOT),
-       JH7100_GDIV(JH7100_CLK_VP6_AXI, "vp6_axi", 0, 4, JH7100_CLK_VP6BUS_SRC),
-       JH7100__DIV(JH7100_CLK_VCDECBUS_SRC, "vcdecbus_src", 4, JH7100_CLK_CDECHIFI4_ROOT),
-       JH7100__DIV(JH7100_CLK_VDEC_BUS, "vdec_bus", 8, JH7100_CLK_VCDECBUS_SRC),
-       JH7100_GATE(JH7100_CLK_VDEC_AXI, "vdec_axi", 0, JH7100_CLK_VDEC_BUS),
-       JH7100_GATE(JH7100_CLK_VDECBRG_MAIN, "vdecbrg_mainclk", 0, JH7100_CLK_VDEC_BUS),
-       JH7100_GDIV(JH7100_CLK_VDEC_BCLK, "vdec_bclk", 0, 8, JH7100_CLK_VCDECBUS_SRC),
-       JH7100_GDIV(JH7100_CLK_VDEC_CCLK, "vdec_cclk", 0, 8, JH7100_CLK_CDEC_ROOT),
-       JH7100_GATE(JH7100_CLK_VDEC_APB, "vdec_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GDIV(JH7100_CLK_JPEG_AXI, "jpeg_axi", 0, 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
-       JH7100_GDIV(JH7100_CLK_JPEG_CCLK, "jpeg_cclk", 0, 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
-       JH7100_GATE(JH7100_CLK_JPEG_APB, "jpeg_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GDIV(JH7100_CLK_GC300_2X, "gc300_2x", 0, 8, JH7100_CLK_CDECHIFI4_ROOT),
-       JH7100_GATE(JH7100_CLK_GC300_AHB, "gc300_ahb", 0, JH7100_CLK_AHB_BUS),
-       JH7100__DIV(JH7100_CLK_JPCGC300_AXIBUS, "jpcgc300_axibus", 8, JH7100_CLK_VCDECBUS_SRC),
-       JH7100_GATE(JH7100_CLK_GC300_AXI, "gc300_axi", 0, JH7100_CLK_JPCGC300_AXIBUS),
-       JH7100_GATE(JH7100_CLK_JPCGC300_MAIN, "jpcgc300_mainclk", 0, JH7100_CLK_JPCGC300_AXIBUS),
-       JH7100__DIV(JH7100_CLK_VENC_BUS, "venc_bus", 8, JH7100_CLK_VCDECBUS_SRC),
-       JH7100_GATE(JH7100_CLK_VENC_AXI, "venc_axi", 0, JH7100_CLK_VENC_BUS),
-       JH7100_GATE(JH7100_CLK_VENCBRG_MAIN, "vencbrg_mainclk", 0, JH7100_CLK_VENC_BUS),
-       JH7100_GDIV(JH7100_CLK_VENC_BCLK, "venc_bclk", 0, 8, JH7100_CLK_VCDECBUS_SRC),
-       JH7100_GDIV(JH7100_CLK_VENC_CCLK, "venc_cclk", 0, 8, JH7100_CLK_CDEC_ROOT),
-       JH7100_GATE(JH7100_CLK_VENC_APB, "venc_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GDIV(JH7100_CLK_DDRPLL_DIV2, "ddrpll_div2", CLK_IS_CRITICAL, 2, JH7100_CLK_PLL1_OUT),
-       JH7100_GDIV(JH7100_CLK_DDRPLL_DIV4, "ddrpll_div4", CLK_IS_CRITICAL, 2, JH7100_CLK_DDRPLL_DIV2),
-       JH7100_GDIV(JH7100_CLK_DDRPLL_DIV8, "ddrpll_div8", CLK_IS_CRITICAL, 2, JH7100_CLK_DDRPLL_DIV4),
-       JH7100_GDIV(JH7100_CLK_DDROSC_DIV2, "ddrosc_div2", CLK_IS_CRITICAL, 2, JH7100_CLK_OSC_SYS),
-       JH7100_GMUX(JH7100_CLK_DDRC0, "ddrc0", CLK_IS_CRITICAL, 4,
+       JH71X0__DIV(JH7100_CLK_CPU_CORE, "cpu_core", 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
+       JH71X0__DIV(JH7100_CLK_CPU_AXI, "cpu_axi", 8, JH7100_CLK_CPU_CORE),
+       JH71X0__DIV(JH7100_CLK_AHB_BUS, "ahb_bus", 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
+       JH71X0__DIV(JH7100_CLK_APB1_BUS, "apb1_bus", 8, JH7100_CLK_AHB_BUS),
+       JH71X0__DIV(JH7100_CLK_APB2_BUS, "apb2_bus", 8, JH7100_CLK_AHB_BUS),
+       JH71X0_GATE(JH7100_CLK_DOM3AHB_BUS, "dom3ahb_bus", CLK_IS_CRITICAL, JH7100_CLK_AHB_BUS),
+       JH71X0_GATE(JH7100_CLK_DOM7AHB_BUS, "dom7ahb_bus", CLK_IS_CRITICAL, JH7100_CLK_AHB_BUS),
+       JH71X0_GATE(JH7100_CLK_U74_CORE0, "u74_core0", CLK_IS_CRITICAL, JH7100_CLK_CPU_CORE),
+       JH71X0_GDIV(JH7100_CLK_U74_CORE1, "u74_core1", CLK_IS_CRITICAL, 8, JH7100_CLK_CPU_CORE),
+       JH71X0_GATE(JH7100_CLK_U74_AXI, "u74_axi", CLK_IS_CRITICAL, JH7100_CLK_CPU_AXI),
+       JH71X0_GATE(JH7100_CLK_U74RTC_TOGGLE, "u74rtc_toggle", CLK_IS_CRITICAL, JH7100_CLK_OSC_SYS),
+       JH71X0_GATE(JH7100_CLK_SGDMA2P_AXI, "sgdma2p_axi", 0, JH7100_CLK_CPU_AXI),
+       JH71X0_GATE(JH7100_CLK_DMA2PNOC_AXI, "dma2pnoc_axi", 0, JH7100_CLK_CPU_AXI),
+       JH71X0_GATE(JH7100_CLK_SGDMA2P_AHB, "sgdma2p_ahb", 0, JH7100_CLK_AHB_BUS),
+       JH71X0__DIV(JH7100_CLK_DLA_BUS, "dla_bus", 4, JH7100_CLK_DLA_ROOT),
+       JH71X0_GATE(JH7100_CLK_DLA_AXI, "dla_axi", 0, JH7100_CLK_DLA_BUS),
+       JH71X0_GATE(JH7100_CLK_DLANOC_AXI, "dlanoc_axi", 0, JH7100_CLK_DLA_BUS),
+       JH71X0_GATE(JH7100_CLK_DLA_APB, "dla_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GDIV(JH7100_CLK_VP6_CORE, "vp6_core", 0, 4, JH7100_CLK_DSP_ROOT_DIV),
+       JH71X0__DIV(JH7100_CLK_VP6BUS_SRC, "vp6bus_src", 4, JH7100_CLK_DSP_ROOT),
+       JH71X0_GDIV(JH7100_CLK_VP6_AXI, "vp6_axi", 0, 4, JH7100_CLK_VP6BUS_SRC),
+       JH71X0__DIV(JH7100_CLK_VCDECBUS_SRC, "vcdecbus_src", 4, JH7100_CLK_CDECHIFI4_ROOT),
+       JH71X0__DIV(JH7100_CLK_VDEC_BUS, "vdec_bus", 8, JH7100_CLK_VCDECBUS_SRC),
+       JH71X0_GATE(JH7100_CLK_VDEC_AXI, "vdec_axi", 0, JH7100_CLK_VDEC_BUS),
+       JH71X0_GATE(JH7100_CLK_VDECBRG_MAIN, "vdecbrg_mainclk", 0, JH7100_CLK_VDEC_BUS),
+       JH71X0_GDIV(JH7100_CLK_VDEC_BCLK, "vdec_bclk", 0, 8, JH7100_CLK_VCDECBUS_SRC),
+       JH71X0_GDIV(JH7100_CLK_VDEC_CCLK, "vdec_cclk", 0, 8, JH7100_CLK_CDEC_ROOT),
+       JH71X0_GATE(JH7100_CLK_VDEC_APB, "vdec_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GDIV(JH7100_CLK_JPEG_AXI, "jpeg_axi", 0, 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
+       JH71X0_GDIV(JH7100_CLK_JPEG_CCLK, "jpeg_cclk", 0, 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
+       JH71X0_GATE(JH7100_CLK_JPEG_APB, "jpeg_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GDIV(JH7100_CLK_GC300_2X, "gc300_2x", 0, 8, JH7100_CLK_CDECHIFI4_ROOT),
+       JH71X0_GATE(JH7100_CLK_GC300_AHB, "gc300_ahb", 0, JH7100_CLK_AHB_BUS),
+       JH71X0__DIV(JH7100_CLK_JPCGC300_AXIBUS, "jpcgc300_axibus", 8, JH7100_CLK_VCDECBUS_SRC),
+       JH71X0_GATE(JH7100_CLK_GC300_AXI, "gc300_axi", 0, JH7100_CLK_JPCGC300_AXIBUS),
+       JH71X0_GATE(JH7100_CLK_JPCGC300_MAIN, "jpcgc300_mainclk", 0, JH7100_CLK_JPCGC300_AXIBUS),
+       JH71X0__DIV(JH7100_CLK_VENC_BUS, "venc_bus", 8, JH7100_CLK_VCDECBUS_SRC),
+       JH71X0_GATE(JH7100_CLK_VENC_AXI, "venc_axi", 0, JH7100_CLK_VENC_BUS),
+       JH71X0_GATE(JH7100_CLK_VENCBRG_MAIN, "vencbrg_mainclk", 0, JH7100_CLK_VENC_BUS),
+       JH71X0_GDIV(JH7100_CLK_VENC_BCLK, "venc_bclk", 0, 8, JH7100_CLK_VCDECBUS_SRC),
+       JH71X0_GDIV(JH7100_CLK_VENC_CCLK, "venc_cclk", 0, 8, JH7100_CLK_CDEC_ROOT),
+       JH71X0_GATE(JH7100_CLK_VENC_APB, "venc_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GDIV(JH7100_CLK_DDRPLL_DIV2, "ddrpll_div2", CLK_IS_CRITICAL, 2, JH7100_CLK_PLL1_OUT),
+       JH71X0_GDIV(JH7100_CLK_DDRPLL_DIV4, "ddrpll_div4", CLK_IS_CRITICAL, 2, JH7100_CLK_DDRPLL_DIV2),
+       JH71X0_GDIV(JH7100_CLK_DDRPLL_DIV8, "ddrpll_div8", CLK_IS_CRITICAL, 2, JH7100_CLK_DDRPLL_DIV4),
+       JH71X0_GDIV(JH7100_CLK_DDROSC_DIV2, "ddrosc_div2", CLK_IS_CRITICAL, 2, JH7100_CLK_OSC_SYS),
+       JH71X0_GMUX(JH7100_CLK_DDRC0, "ddrc0", CLK_IS_CRITICAL, 4,
                    JH7100_CLK_DDROSC_DIV2,
                    JH7100_CLK_DDRPLL_DIV2,
                    JH7100_CLK_DDRPLL_DIV4,
                    JH7100_CLK_DDRPLL_DIV8),
-       JH7100_GMUX(JH7100_CLK_DDRC1, "ddrc1", CLK_IS_CRITICAL, 4,
+       JH71X0_GMUX(JH7100_CLK_DDRC1, "ddrc1", CLK_IS_CRITICAL, 4,
                    JH7100_CLK_DDROSC_DIV2,
                    JH7100_CLK_DDRPLL_DIV2,
                    JH7100_CLK_DDRPLL_DIV4,
                    JH7100_CLK_DDRPLL_DIV8),
-       JH7100_GATE(JH7100_CLK_DDRPHY_APB, "ddrphy_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100__DIV(JH7100_CLK_NOC_ROB, "noc_rob", 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
-       JH7100__DIV(JH7100_CLK_NOC_COG, "noc_cog", 8, JH7100_CLK_DLA_ROOT),
-       JH7100_GATE(JH7100_CLK_NNE_AHB, "nne_ahb", 0, JH7100_CLK_AHB_BUS),
-       JH7100__DIV(JH7100_CLK_NNEBUS_SRC1, "nnebus_src1", 4, JH7100_CLK_DSP_ROOT),
-       JH7100__MUX(JH7100_CLK_NNE_BUS, "nne_bus", 2,
+       JH71X0_GATE(JH7100_CLK_DDRPHY_APB, "ddrphy_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0__DIV(JH7100_CLK_NOC_ROB, "noc_rob", 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
+       JH71X0__DIV(JH7100_CLK_NOC_COG, "noc_cog", 8, JH7100_CLK_DLA_ROOT),
+       JH71X0_GATE(JH7100_CLK_NNE_AHB, "nne_ahb", 0, JH7100_CLK_AHB_BUS),
+       JH71X0__DIV(JH7100_CLK_NNEBUS_SRC1, "nnebus_src1", 4, JH7100_CLK_DSP_ROOT),
+       JH71X0__MUX(JH7100_CLK_NNE_BUS, "nne_bus", 2,
                    JH7100_CLK_CPU_AXI,
                    JH7100_CLK_NNEBUS_SRC1),
-       JH7100_GATE(JH7100_CLK_NNE_AXI, "nne_axi", 0, JH7100_CLK_NNE_BUS),
-       JH7100_GATE(JH7100_CLK_NNENOC_AXI, "nnenoc_axi", 0, JH7100_CLK_NNE_BUS),
-       JH7100_GATE(JH7100_CLK_DLASLV_AXI, "dlaslv_axi", 0, JH7100_CLK_NNE_BUS),
-       JH7100_GATE(JH7100_CLK_DSPX2C_AXI, "dspx2c_axi", CLK_IS_CRITICAL, JH7100_CLK_NNE_BUS),
-       JH7100__DIV(JH7100_CLK_HIFI4_SRC, "hifi4_src", 4, JH7100_CLK_CDECHIFI4_ROOT),
-       JH7100__DIV(JH7100_CLK_HIFI4_COREFREE, "hifi4_corefree", 8, JH7100_CLK_HIFI4_SRC),
-       JH7100_GATE(JH7100_CLK_HIFI4_CORE, "hifi4_core", 0, JH7100_CLK_HIFI4_COREFREE),
-       JH7100__DIV(JH7100_CLK_HIFI4_BUS, "hifi4_bus", 8, JH7100_CLK_HIFI4_COREFREE),
-       JH7100_GATE(JH7100_CLK_HIFI4_AXI, "hifi4_axi", 0, JH7100_CLK_HIFI4_BUS),
-       JH7100_GATE(JH7100_CLK_HIFI4NOC_AXI, "hifi4noc_axi", 0, JH7100_CLK_HIFI4_BUS),
-       JH7100__DIV(JH7100_CLK_SGDMA1P_BUS, "sgdma1p_bus", 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
-       JH7100_GATE(JH7100_CLK_SGDMA1P_AXI, "sgdma1p_axi", 0, JH7100_CLK_SGDMA1P_BUS),
-       JH7100_GATE(JH7100_CLK_DMA1P_AXI, "dma1p_axi", 0, JH7100_CLK_SGDMA1P_BUS),
-       JH7100_GDIV(JH7100_CLK_X2C_AXI, "x2c_axi", CLK_IS_CRITICAL, 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
-       JH7100__DIV(JH7100_CLK_USB_BUS, "usb_bus", 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
-       JH7100_GATE(JH7100_CLK_USB_AXI, "usb_axi", 0, JH7100_CLK_USB_BUS),
-       JH7100_GATE(JH7100_CLK_USBNOC_AXI, "usbnoc_axi", 0, JH7100_CLK_USB_BUS),
-       JH7100__DIV(JH7100_CLK_USBPHY_ROOTDIV, "usbphy_rootdiv", 4, JH7100_CLK_GMACUSB_ROOT),
-       JH7100_GDIV(JH7100_CLK_USBPHY_125M, "usbphy_125m", 0, 8, JH7100_CLK_USBPHY_ROOTDIV),
-       JH7100_GDIV(JH7100_CLK_USBPHY_PLLDIV25M, "usbphy_plldiv25m", 0, 32, JH7100_CLK_USBPHY_ROOTDIV),
-       JH7100__MUX(JH7100_CLK_USBPHY_25M, "usbphy_25m", 2,
+       JH71X0_GATE(JH7100_CLK_NNE_AXI, "nne_axi", 0, JH7100_CLK_NNE_BUS),
+       JH71X0_GATE(JH7100_CLK_NNENOC_AXI, "nnenoc_axi", 0, JH7100_CLK_NNE_BUS),
+       JH71X0_GATE(JH7100_CLK_DLASLV_AXI, "dlaslv_axi", 0, JH7100_CLK_NNE_BUS),
+       JH71X0_GATE(JH7100_CLK_DSPX2C_AXI, "dspx2c_axi", CLK_IS_CRITICAL, JH7100_CLK_NNE_BUS),
+       JH71X0__DIV(JH7100_CLK_HIFI4_SRC, "hifi4_src", 4, JH7100_CLK_CDECHIFI4_ROOT),
+       JH71X0__DIV(JH7100_CLK_HIFI4_COREFREE, "hifi4_corefree", 8, JH7100_CLK_HIFI4_SRC),
+       JH71X0_GATE(JH7100_CLK_HIFI4_CORE, "hifi4_core", 0, JH7100_CLK_HIFI4_COREFREE),
+       JH71X0__DIV(JH7100_CLK_HIFI4_BUS, "hifi4_bus", 8, JH7100_CLK_HIFI4_COREFREE),
+       JH71X0_GATE(JH7100_CLK_HIFI4_AXI, "hifi4_axi", 0, JH7100_CLK_HIFI4_BUS),
+       JH71X0_GATE(JH7100_CLK_HIFI4NOC_AXI, "hifi4noc_axi", 0, JH7100_CLK_HIFI4_BUS),
+       JH71X0__DIV(JH7100_CLK_SGDMA1P_BUS, "sgdma1p_bus", 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
+       JH71X0_GATE(JH7100_CLK_SGDMA1P_AXI, "sgdma1p_axi", 0, JH7100_CLK_SGDMA1P_BUS),
+       JH71X0_GATE(JH7100_CLK_DMA1P_AXI, "dma1p_axi", 0, JH7100_CLK_SGDMA1P_BUS),
+       JH71X0_GDIV(JH7100_CLK_X2C_AXI, "x2c_axi", CLK_IS_CRITICAL, 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
+       JH71X0__DIV(JH7100_CLK_USB_BUS, "usb_bus", 8, JH7100_CLK_CPUNBUS_ROOT_DIV),
+       JH71X0_GATE(JH7100_CLK_USB_AXI, "usb_axi", 0, JH7100_CLK_USB_BUS),
+       JH71X0_GATE(JH7100_CLK_USBNOC_AXI, "usbnoc_axi", 0, JH7100_CLK_USB_BUS),
+       JH71X0__DIV(JH7100_CLK_USBPHY_ROOTDIV, "usbphy_rootdiv", 4, JH7100_CLK_GMACUSB_ROOT),
+       JH71X0_GDIV(JH7100_CLK_USBPHY_125M, "usbphy_125m", 0, 8, JH7100_CLK_USBPHY_ROOTDIV),
+       JH71X0_GDIV(JH7100_CLK_USBPHY_PLLDIV25M, "usbphy_plldiv25m", 0, 32, JH7100_CLK_USBPHY_ROOTDIV),
+       JH71X0__MUX(JH7100_CLK_USBPHY_25M, "usbphy_25m", 2,
                    JH7100_CLK_OSC_SYS,
                    JH7100_CLK_USBPHY_PLLDIV25M),
-       JH7100_FDIV(JH7100_CLK_AUDIO_DIV, "audio_div", JH7100_CLK_AUDIO_ROOT),
-       JH7100_GATE(JH7100_CLK_AUDIO_SRC, "audio_src", 0, JH7100_CLK_AUDIO_DIV),
-       JH7100_GATE(JH7100_CLK_AUDIO_12288, "audio_12288", 0, JH7100_CLK_OSC_AUD),
-       JH7100_GDIV(JH7100_CLK_VIN_SRC, "vin_src", 0, 4, JH7100_CLK_VIN_ROOT),
-       JH7100__DIV(JH7100_CLK_ISP0_BUS, "isp0_bus", 8, JH7100_CLK_VIN_SRC),
-       JH7100_GATE(JH7100_CLK_ISP0_AXI, "isp0_axi", 0, JH7100_CLK_ISP0_BUS),
-       JH7100_GATE(JH7100_CLK_ISP0NOC_AXI, "isp0noc_axi", 0, JH7100_CLK_ISP0_BUS),
-       JH7100_GATE(JH7100_CLK_ISPSLV_AXI, "ispslv_axi", 0, JH7100_CLK_ISP0_BUS),
-       JH7100__DIV(JH7100_CLK_ISP1_BUS, "isp1_bus", 8, JH7100_CLK_VIN_SRC),
-       JH7100_GATE(JH7100_CLK_ISP1_AXI, "isp1_axi", 0, JH7100_CLK_ISP1_BUS),
-       JH7100_GATE(JH7100_CLK_ISP1NOC_AXI, "isp1noc_axi", 0, JH7100_CLK_ISP1_BUS),
-       JH7100__DIV(JH7100_CLK_VIN_BUS, "vin_bus", 8, JH7100_CLK_VIN_SRC),
-       JH7100_GATE(JH7100_CLK_VIN_AXI, "vin_axi", 0, JH7100_CLK_VIN_BUS),
-       JH7100_GATE(JH7100_CLK_VINNOC_AXI, "vinnoc_axi", 0, JH7100_CLK_VIN_BUS),
-       JH7100_GDIV(JH7100_CLK_VOUT_SRC, "vout_src", 0, 4, JH7100_CLK_VOUT_ROOT),
-       JH7100__DIV(JH7100_CLK_DISPBUS_SRC, "dispbus_src", 4, JH7100_CLK_VOUTBUS_ROOT),
-       JH7100__DIV(JH7100_CLK_DISP_BUS, "disp_bus", 4, JH7100_CLK_DISPBUS_SRC),
-       JH7100_GATE(JH7100_CLK_DISP_AXI, "disp_axi", 0, JH7100_CLK_DISP_BUS),
-       JH7100_GATE(JH7100_CLK_DISPNOC_AXI, "dispnoc_axi", 0, JH7100_CLK_DISP_BUS),
-       JH7100_GATE(JH7100_CLK_SDIO0_AHB, "sdio0_ahb", 0, JH7100_CLK_AHB_BUS),
-       JH7100_GDIV(JH7100_CLK_SDIO0_CCLKINT, "sdio0_cclkint", 0, 24, JH7100_CLK_PERH0_SRC),
-       JH7100__INV(JH7100_CLK_SDIO0_CCLKINT_INV, "sdio0_cclkint_inv", JH7100_CLK_SDIO0_CCLKINT),
-       JH7100_GATE(JH7100_CLK_SDIO1_AHB, "sdio1_ahb", 0, JH7100_CLK_AHB_BUS),
-       JH7100_GDIV(JH7100_CLK_SDIO1_CCLKINT, "sdio1_cclkint", 0, 24, JH7100_CLK_PERH1_SRC),
-       JH7100__INV(JH7100_CLK_SDIO1_CCLKINT_INV, "sdio1_cclkint_inv", JH7100_CLK_SDIO1_CCLKINT),
-       JH7100_GATE(JH7100_CLK_GMAC_AHB, "gmac_ahb", 0, JH7100_CLK_AHB_BUS),
-       JH7100__DIV(JH7100_CLK_GMAC_ROOT_DIV, "gmac_root_div", 8, JH7100_CLK_GMACUSB_ROOT),
-       JH7100_GDIV(JH7100_CLK_GMAC_PTP_REF, "gmac_ptp_refclk", 0, 31, JH7100_CLK_GMAC_ROOT_DIV),
-       JH7100_GDIV(JH7100_CLK_GMAC_GTX, "gmac_gtxclk", 0, 255, JH7100_CLK_GMAC_ROOT_DIV),
-       JH7100_GDIV(JH7100_CLK_GMAC_RMII_TX, "gmac_rmii_txclk", 0, 8, JH7100_CLK_GMAC_RMII_REF),
-       JH7100_GDIV(JH7100_CLK_GMAC_RMII_RX, "gmac_rmii_rxclk", 0, 8, JH7100_CLK_GMAC_RMII_REF),
-       JH7100__MUX(JH7100_CLK_GMAC_TX, "gmac_tx", 3,
+       JH71X0_FDIV(JH7100_CLK_AUDIO_DIV, "audio_div", JH7100_CLK_AUDIO_ROOT),
+       JH71X0_GATE(JH7100_CLK_AUDIO_SRC, "audio_src", 0, JH7100_CLK_AUDIO_DIV),
+       JH71X0_GATE(JH7100_CLK_AUDIO_12288, "audio_12288", 0, JH7100_CLK_OSC_AUD),
+       JH71X0_GDIV(JH7100_CLK_VIN_SRC, "vin_src", 0, 4, JH7100_CLK_VIN_ROOT),
+       JH71X0__DIV(JH7100_CLK_ISP0_BUS, "isp0_bus", 8, JH7100_CLK_VIN_SRC),
+       JH71X0_GATE(JH7100_CLK_ISP0_AXI, "isp0_axi", 0, JH7100_CLK_ISP0_BUS),
+       JH71X0_GATE(JH7100_CLK_ISP0NOC_AXI, "isp0noc_axi", 0, JH7100_CLK_ISP0_BUS),
+       JH71X0_GATE(JH7100_CLK_ISPSLV_AXI, "ispslv_axi", 0, JH7100_CLK_ISP0_BUS),
+       JH71X0__DIV(JH7100_CLK_ISP1_BUS, "isp1_bus", 8, JH7100_CLK_VIN_SRC),
+       JH71X0_GATE(JH7100_CLK_ISP1_AXI, "isp1_axi", 0, JH7100_CLK_ISP1_BUS),
+       JH71X0_GATE(JH7100_CLK_ISP1NOC_AXI, "isp1noc_axi", 0, JH7100_CLK_ISP1_BUS),
+       JH71X0__DIV(JH7100_CLK_VIN_BUS, "vin_bus", 8, JH7100_CLK_VIN_SRC),
+       JH71X0_GATE(JH7100_CLK_VIN_AXI, "vin_axi", 0, JH7100_CLK_VIN_BUS),
+       JH71X0_GATE(JH7100_CLK_VINNOC_AXI, "vinnoc_axi", 0, JH7100_CLK_VIN_BUS),
+       JH71X0_GDIV(JH7100_CLK_VOUT_SRC, "vout_src", 0, 4, JH7100_CLK_VOUT_ROOT),
+       JH71X0__DIV(JH7100_CLK_DISPBUS_SRC, "dispbus_src", 4, JH7100_CLK_VOUTBUS_ROOT),
+       JH71X0__DIV(JH7100_CLK_DISP_BUS, "disp_bus", 4, JH7100_CLK_DISPBUS_SRC),
+       JH71X0_GATE(JH7100_CLK_DISP_AXI, "disp_axi", 0, JH7100_CLK_DISP_BUS),
+       JH71X0_GATE(JH7100_CLK_DISPNOC_AXI, "dispnoc_axi", 0, JH7100_CLK_DISP_BUS),
+       JH71X0_GATE(JH7100_CLK_SDIO0_AHB, "sdio0_ahb", 0, JH7100_CLK_AHB_BUS),
+       JH71X0_GDIV(JH7100_CLK_SDIO0_CCLKINT, "sdio0_cclkint", 0, 24, JH7100_CLK_PERH0_SRC),
+       JH71X0__INV(JH7100_CLK_SDIO0_CCLKINT_INV, "sdio0_cclkint_inv", JH7100_CLK_SDIO0_CCLKINT),
+       JH71X0_GATE(JH7100_CLK_SDIO1_AHB, "sdio1_ahb", 0, JH7100_CLK_AHB_BUS),
+       JH71X0_GDIV(JH7100_CLK_SDIO1_CCLKINT, "sdio1_cclkint", 0, 24, JH7100_CLK_PERH1_SRC),
+       JH71X0__INV(JH7100_CLK_SDIO1_CCLKINT_INV, "sdio1_cclkint_inv", JH7100_CLK_SDIO1_CCLKINT),
+       JH71X0_GATE(JH7100_CLK_GMAC_AHB, "gmac_ahb", 0, JH7100_CLK_AHB_BUS),
+       JH71X0__DIV(JH7100_CLK_GMAC_ROOT_DIV, "gmac_root_div", 8, JH7100_CLK_GMACUSB_ROOT),
+       JH71X0_GDIV(JH7100_CLK_GMAC_PTP_REF, "gmac_ptp_refclk", 0, 31, JH7100_CLK_GMAC_ROOT_DIV),
+       JH71X0_GDIV(JH7100_CLK_GMAC_GTX, "gmac_gtxclk", 0, 255, JH7100_CLK_GMAC_ROOT_DIV),
+       JH71X0_GDIV(JH7100_CLK_GMAC_RMII_TX, "gmac_rmii_txclk", 0, 8, JH7100_CLK_GMAC_RMII_REF),
+       JH71X0_GDIV(JH7100_CLK_GMAC_RMII_RX, "gmac_rmii_rxclk", 0, 8, JH7100_CLK_GMAC_RMII_REF),
+       JH71X0__MUX(JH7100_CLK_GMAC_TX, "gmac_tx", 3,
                    JH7100_CLK_GMAC_GTX,
                    JH7100_CLK_GMAC_TX_INV,
                    JH7100_CLK_GMAC_RMII_TX),
-       JH7100__INV(JH7100_CLK_GMAC_TX_INV, "gmac_tx_inv", JH7100_CLK_GMAC_TX),
-       JH7100__MUX(JH7100_CLK_GMAC_RX_PRE, "gmac_rx_pre", 2,
+       JH71X0__INV(JH7100_CLK_GMAC_TX_INV, "gmac_tx_inv", JH7100_CLK_GMAC_TX),
+       JH71X0__MUX(JH7100_CLK_GMAC_RX_PRE, "gmac_rx_pre", 2,
                    JH7100_CLK_GMAC_GR_MII_RX,
                    JH7100_CLK_GMAC_RMII_RX),
-       JH7100__INV(JH7100_CLK_GMAC_RX_INV, "gmac_rx_inv", JH7100_CLK_GMAC_RX_PRE),
-       JH7100_GATE(JH7100_CLK_GMAC_RMII, "gmac_rmii", 0, JH7100_CLK_GMAC_RMII_REF),
-       JH7100_GDIV(JH7100_CLK_GMAC_TOPHYREF, "gmac_tophyref", 0, 127, JH7100_CLK_GMAC_ROOT_DIV),
-       JH7100_GATE(JH7100_CLK_SPI2AHB_AHB, "spi2ahb_ahb", 0, JH7100_CLK_AHB_BUS),
-       JH7100_GDIV(JH7100_CLK_SPI2AHB_CORE, "spi2ahb_core", 0, 31, JH7100_CLK_PERH0_SRC),
-       JH7100_GATE(JH7100_CLK_EZMASTER_AHB, "ezmaster_ahb", 0, JH7100_CLK_AHB_BUS),
-       JH7100_GATE(JH7100_CLK_E24_AHB, "e24_ahb", 0, JH7100_CLK_AHB_BUS),
-       JH7100_GATE(JH7100_CLK_E24RTC_TOGGLE, "e24rtc_toggle", 0, JH7100_CLK_OSC_SYS),
-       JH7100_GATE(JH7100_CLK_QSPI_AHB, "qspi_ahb", 0, JH7100_CLK_AHB_BUS),
-       JH7100_GATE(JH7100_CLK_QSPI_APB, "qspi_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GDIV(JH7100_CLK_QSPI_REF, "qspi_refclk", 0, 31, JH7100_CLK_PERH0_SRC),
-       JH7100_GATE(JH7100_CLK_SEC_AHB, "sec_ahb", 0, JH7100_CLK_AHB_BUS),
-       JH7100_GATE(JH7100_CLK_AES, "aes_clk", 0, JH7100_CLK_SEC_AHB),
-       JH7100_GATE(JH7100_CLK_SHA, "sha_clk", 0, JH7100_CLK_SEC_AHB),
-       JH7100_GATE(JH7100_CLK_PKA, "pka_clk", 0, JH7100_CLK_SEC_AHB),
-       JH7100_GATE(JH7100_CLK_TRNG_APB, "trng_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GATE(JH7100_CLK_OTP_APB, "otp_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GATE(JH7100_CLK_UART0_APB, "uart0_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GDIV(JH7100_CLK_UART0_CORE, "uart0_core", 0, 63, JH7100_CLK_PERH1_SRC),
-       JH7100_GATE(JH7100_CLK_UART1_APB, "uart1_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GDIV(JH7100_CLK_UART1_CORE, "uart1_core", 0, 63, JH7100_CLK_PERH1_SRC),
-       JH7100_GATE(JH7100_CLK_SPI0_APB, "spi0_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GDIV(JH7100_CLK_SPI0_CORE, "spi0_core", 0, 63, JH7100_CLK_PERH1_SRC),
-       JH7100_GATE(JH7100_CLK_SPI1_APB, "spi1_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GDIV(JH7100_CLK_SPI1_CORE, "spi1_core", 0, 63, JH7100_CLK_PERH1_SRC),
-       JH7100_GATE(JH7100_CLK_I2C0_APB, "i2c0_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GDIV(JH7100_CLK_I2C0_CORE, "i2c0_core", 0, 63, JH7100_CLK_PERH1_SRC),
-       JH7100_GATE(JH7100_CLK_I2C1_APB, "i2c1_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GDIV(JH7100_CLK_I2C1_CORE, "i2c1_core", 0, 63, JH7100_CLK_PERH1_SRC),
-       JH7100_GATE(JH7100_CLK_GPIO_APB, "gpio_apb", 0, JH7100_CLK_APB1_BUS),
-       JH7100_GATE(JH7100_CLK_UART2_APB, "uart2_apb", 0, JH7100_CLK_APB2_BUS),
-       JH7100_GDIV(JH7100_CLK_UART2_CORE, "uart2_core", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GATE(JH7100_CLK_UART3_APB, "uart3_apb", 0, JH7100_CLK_APB2_BUS),
-       JH7100_GDIV(JH7100_CLK_UART3_CORE, "uart3_core", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GATE(JH7100_CLK_SPI2_APB, "spi2_apb", 0, JH7100_CLK_APB2_BUS),
-       JH7100_GDIV(JH7100_CLK_SPI2_CORE, "spi2_core", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GATE(JH7100_CLK_SPI3_APB, "spi3_apb", 0, JH7100_CLK_APB2_BUS),
-       JH7100_GDIV(JH7100_CLK_SPI3_CORE, "spi3_core", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GATE(JH7100_CLK_I2C2_APB, "i2c2_apb", 0, JH7100_CLK_APB2_BUS),
-       JH7100_GDIV(JH7100_CLK_I2C2_CORE, "i2c2_core", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GATE(JH7100_CLK_I2C3_APB, "i2c3_apb", 0, JH7100_CLK_APB2_BUS),
-       JH7100_GDIV(JH7100_CLK_I2C3_CORE, "i2c3_core", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GATE(JH7100_CLK_WDTIMER_APB, "wdtimer_apb", 0, JH7100_CLK_APB2_BUS),
-       JH7100_GDIV(JH7100_CLK_WDT_CORE, "wdt_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GDIV(JH7100_CLK_TIMER0_CORE, "timer0_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GDIV(JH7100_CLK_TIMER1_CORE, "timer1_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GDIV(JH7100_CLK_TIMER2_CORE, "timer2_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GDIV(JH7100_CLK_TIMER3_CORE, "timer3_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GDIV(JH7100_CLK_TIMER4_CORE, "timer4_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GDIV(JH7100_CLK_TIMER5_CORE, "timer5_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GDIV(JH7100_CLK_TIMER6_CORE, "timer6_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
-       JH7100_GATE(JH7100_CLK_VP6INTC_APB, "vp6intc_apb", 0, JH7100_CLK_APB2_BUS),
-       JH7100_GATE(JH7100_CLK_PWM_APB, "pwm_apb", 0, JH7100_CLK_APB2_BUS),
-       JH7100_GATE(JH7100_CLK_MSI_APB, "msi_apb", 0, JH7100_CLK_APB2_BUS),
-       JH7100_GATE(JH7100_CLK_TEMP_APB, "temp_apb", 0, JH7100_CLK_APB2_BUS),
-       JH7100_GDIV(JH7100_CLK_TEMP_SENSE, "temp_sense", 0, 31, JH7100_CLK_OSC_SYS),
-       JH7100_GATE(JH7100_CLK_SYSERR_APB, "syserr_apb", 0, JH7100_CLK_APB2_BUS),
+       JH71X0__INV(JH7100_CLK_GMAC_RX_INV, "gmac_rx_inv", JH7100_CLK_GMAC_RX_PRE),
+       JH71X0_GATE(JH7100_CLK_GMAC_RMII, "gmac_rmii", 0, JH7100_CLK_GMAC_RMII_REF),
+       JH71X0_GDIV(JH7100_CLK_GMAC_TOPHYREF, "gmac_tophyref", 0, 127, JH7100_CLK_GMAC_ROOT_DIV),
+       JH71X0_GATE(JH7100_CLK_SPI2AHB_AHB, "spi2ahb_ahb", 0, JH7100_CLK_AHB_BUS),
+       JH71X0_GDIV(JH7100_CLK_SPI2AHB_CORE, "spi2ahb_core", 0, 31, JH7100_CLK_PERH0_SRC),
+       JH71X0_GATE(JH7100_CLK_EZMASTER_AHB, "ezmaster_ahb", 0, JH7100_CLK_AHB_BUS),
+       JH71X0_GATE(JH7100_CLK_E24_AHB, "e24_ahb", 0, JH7100_CLK_AHB_BUS),
+       JH71X0_GATE(JH7100_CLK_E24RTC_TOGGLE, "e24rtc_toggle", 0, JH7100_CLK_OSC_SYS),
+       JH71X0_GATE(JH7100_CLK_QSPI_AHB, "qspi_ahb", 0, JH7100_CLK_AHB_BUS),
+       JH71X0_GATE(JH7100_CLK_QSPI_APB, "qspi_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GDIV(JH7100_CLK_QSPI_REF, "qspi_refclk", 0, 31, JH7100_CLK_PERH0_SRC),
+       JH71X0_GATE(JH7100_CLK_SEC_AHB, "sec_ahb", 0, JH7100_CLK_AHB_BUS),
+       JH71X0_GATE(JH7100_CLK_AES, "aes_clk", 0, JH7100_CLK_SEC_AHB),
+       JH71X0_GATE(JH7100_CLK_SHA, "sha_clk", 0, JH7100_CLK_SEC_AHB),
+       JH71X0_GATE(JH7100_CLK_PKA, "pka_clk", 0, JH7100_CLK_SEC_AHB),
+       JH71X0_GATE(JH7100_CLK_TRNG_APB, "trng_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GATE(JH7100_CLK_OTP_APB, "otp_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GATE(JH7100_CLK_UART0_APB, "uart0_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GDIV(JH7100_CLK_UART0_CORE, "uart0_core", 0, 63, JH7100_CLK_PERH1_SRC),
+       JH71X0_GATE(JH7100_CLK_UART1_APB, "uart1_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GDIV(JH7100_CLK_UART1_CORE, "uart1_core", 0, 63, JH7100_CLK_PERH1_SRC),
+       JH71X0_GATE(JH7100_CLK_SPI0_APB, "spi0_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GDIV(JH7100_CLK_SPI0_CORE, "spi0_core", 0, 63, JH7100_CLK_PERH1_SRC),
+       JH71X0_GATE(JH7100_CLK_SPI1_APB, "spi1_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GDIV(JH7100_CLK_SPI1_CORE, "spi1_core", 0, 63, JH7100_CLK_PERH1_SRC),
+       JH71X0_GATE(JH7100_CLK_I2C0_APB, "i2c0_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GDIV(JH7100_CLK_I2C0_CORE, "i2c0_core", 0, 63, JH7100_CLK_PERH1_SRC),
+       JH71X0_GATE(JH7100_CLK_I2C1_APB, "i2c1_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GDIV(JH7100_CLK_I2C1_CORE, "i2c1_core", 0, 63, JH7100_CLK_PERH1_SRC),
+       JH71X0_GATE(JH7100_CLK_GPIO_APB, "gpio_apb", 0, JH7100_CLK_APB1_BUS),
+       JH71X0_GATE(JH7100_CLK_UART2_APB, "uart2_apb", 0, JH7100_CLK_APB2_BUS),
+       JH71X0_GDIV(JH7100_CLK_UART2_CORE, "uart2_core", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GATE(JH7100_CLK_UART3_APB, "uart3_apb", 0, JH7100_CLK_APB2_BUS),
+       JH71X0_GDIV(JH7100_CLK_UART3_CORE, "uart3_core", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GATE(JH7100_CLK_SPI2_APB, "spi2_apb", 0, JH7100_CLK_APB2_BUS),
+       JH71X0_GDIV(JH7100_CLK_SPI2_CORE, "spi2_core", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GATE(JH7100_CLK_SPI3_APB, "spi3_apb", 0, JH7100_CLK_APB2_BUS),
+       JH71X0_GDIV(JH7100_CLK_SPI3_CORE, "spi3_core", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GATE(JH7100_CLK_I2C2_APB, "i2c2_apb", 0, JH7100_CLK_APB2_BUS),
+       JH71X0_GDIV(JH7100_CLK_I2C2_CORE, "i2c2_core", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GATE(JH7100_CLK_I2C3_APB, "i2c3_apb", 0, JH7100_CLK_APB2_BUS),
+       JH71X0_GDIV(JH7100_CLK_I2C3_CORE, "i2c3_core", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GATE(JH7100_CLK_WDTIMER_APB, "wdtimer_apb", 0, JH7100_CLK_APB2_BUS),
+       JH71X0_GDIV(JH7100_CLK_WDT_CORE, "wdt_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GDIV(JH7100_CLK_TIMER0_CORE, "timer0_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GDIV(JH7100_CLK_TIMER1_CORE, "timer1_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GDIV(JH7100_CLK_TIMER2_CORE, "timer2_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GDIV(JH7100_CLK_TIMER3_CORE, "timer3_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GDIV(JH7100_CLK_TIMER4_CORE, "timer4_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GDIV(JH7100_CLK_TIMER5_CORE, "timer5_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GDIV(JH7100_CLK_TIMER6_CORE, "timer6_coreclk", 0, 63, JH7100_CLK_PERH0_SRC),
+       JH71X0_GATE(JH7100_CLK_VP6INTC_APB, "vp6intc_apb", 0, JH7100_CLK_APB2_BUS),
+       JH71X0_GATE(JH7100_CLK_PWM_APB, "pwm_apb", 0, JH7100_CLK_APB2_BUS),
+       JH71X0_GATE(JH7100_CLK_MSI_APB, "msi_apb", 0, JH7100_CLK_APB2_BUS),
+       JH71X0_GATE(JH7100_CLK_TEMP_APB, "temp_apb", 0, JH7100_CLK_APB2_BUS),
+       JH71X0_GDIV(JH7100_CLK_TEMP_SENSE, "temp_sense", 0, 31, JH7100_CLK_OSC_SYS),
+       JH71X0_GATE(JH7100_CLK_SYSERR_APB, "syserr_apb", 0, JH7100_CLK_APB2_BUS),
 };
 
 static struct clk_hw *jh7100_clk_get(struct of_phandle_args *clkspec, void *data)
 {
-       struct jh7100_clk_priv *priv = data;
+       struct jh71x0_clk_priv *priv = data;
        unsigned int idx = clkspec->args[0];
 
        if (idx < JH7100_CLK_PLL0_OUT)
@@ -280,7 +280,7 @@ static struct clk_hw *jh7100_clk_get(struct of_phandle_args *clkspec, void *data
 
 static int __init clk_starfive_jh7100_probe(struct platform_device *pdev)
 {
-       struct jh7100_clk_priv *priv;
+       struct jh71x0_clk_priv *priv;
        unsigned int idx;
        int ret;
 
@@ -314,12 +314,12 @@ static int __init clk_starfive_jh7100_probe(struct platform_device *pdev)
                struct clk_parent_data parents[4] = {};
                struct clk_init_data init = {
                        .name = jh7100_clk_data[idx].name,
-                       .ops = starfive_jh7100_clk_ops(max),
+                       .ops = starfive_jh71x0_clk_ops(max),
                        .parent_data = parents,
-                       .num_parents = ((max & JH7100_CLK_MUX_MASK) >> JH7100_CLK_MUX_SHIFT) + 1,
+                       .num_parents = ((max & JH71X0_CLK_MUX_MASK) >> JH71X0_CLK_MUX_SHIFT) + 1,
                        .flags = jh7100_clk_data[idx].flags,
                };
-               struct jh7100_clk *clk = &priv->reg[idx];
+               struct jh71x0_clk *clk = &priv->reg[idx];
                unsigned int i;
 
                for (i = 0; i < init.num_parents; i++) {
@@ -341,7 +341,7 @@ static int __init clk_starfive_jh7100_probe(struct platform_device *pdev)
 
                clk->hw.init = &init;
                clk->idx = idx;
-               clk->max_div = max & JH7100_CLK_DIV_MASK;
+               clk->max_div = max & JH71X0_CLK_DIV_MASK;
 
                ret = devm_clk_hw_register(priv->dev, &clk->hw);
                if (ret)
drivers/clk/starfive/clk-starfive-jh7100.h deleted +0 -114
deleted file mode 100644
index a8ba6e25b5ce..000000000000
@@ -1,114 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __CLK_STARFIVE_JH7100_H
-#define __CLK_STARFIVE_JH7100_H
-
-#include <linux/bits.h>
-#include <linux/clk-provider.h>
-#include <linux/device.h>
-#include <linux/spinlock.h>
-
-/* register fields */
-#define JH7100_CLK_ENABLE      BIT(31)
-#define JH7100_CLK_INVERT      BIT(30)
-#define JH7100_CLK_MUX_MASK    GENMASK(27, 24)
-#define JH7100_CLK_MUX_SHIFT   24
-#define JH7100_CLK_DIV_MASK    GENMASK(23, 0)
-#define JH7100_CLK_FRAC_MASK   GENMASK(15, 8)
-#define JH7100_CLK_FRAC_SHIFT  8
-#define JH7100_CLK_INT_MASK    GENMASK(7, 0)
-
-/* fractional divider min/max */
-#define JH7100_CLK_FRAC_MIN    100UL
-#define JH7100_CLK_FRAC_MAX    25599UL
-
-/* clock data */
-struct jh7100_clk_data {
-       const char *name;
-       unsigned long flags;
-       u32 max;
-       u8 parents[4];
-};
-
-#define JH7100_GATE(_idx, _name, _flags, _parent) [_idx] = {                   \
-       .name = _name,                                                          \
-       .flags = CLK_SET_RATE_PARENT | (_flags),                                \
-       .max = JH7100_CLK_ENABLE,                                               \
-       .parents = { [0] = _parent },                                           \
-}
-
-#define JH7100__DIV(_idx, _name, _max, _parent) [_idx] = {                     \
-       .name = _name,                                                          \
-       .flags = 0,                                                             \
-       .max = _max,                                                            \
-       .parents = { [0] = _parent },                                           \
-}
-
-#define JH7100_GDIV(_idx, _name, _flags, _max, _parent) [_idx] = {             \
-       .name = _name,                                                          \
-       .flags = _flags,                                                        \
-       .max = JH7100_CLK_ENABLE | (_max),                                      \
-       .parents = { [0] = _parent },                                           \
-}
-
-#define JH7100_FDIV(_idx, _name, _parent) [_idx] = {                           \
-       .name = _name,                                                          \
-       .flags = 0,                                                             \
-       .max = JH7100_CLK_FRAC_MAX,                                             \
-       .parents = { [0] = _parent },                                           \
-}
-
-#define JH7100__MUX(_idx, _name, _nparents, ...) [_idx] = {                    \
-       .name = _name,                                                          \
-       .flags = 0,                                                             \
-       .max = ((_nparents) - 1) << JH7100_CLK_MUX_SHIFT,                       \
-       .parents = { __VA_ARGS__ },                                             \
-}
-
-#define JH7100_GMUX(_idx, _name, _flags, _nparents, ...) [_idx] = {            \
-       .name = _name,                                                          \
-       .flags = _flags,                                                        \
-       .max = JH7100_CLK_ENABLE |                                              \
-               (((_nparents) - 1) << JH7100_CLK_MUX_SHIFT),                    \
-       .parents = { __VA_ARGS__ },                                             \
-}
-
-#define JH7100_MDIV(_idx, _name, _max, _nparents, ...) [_idx] = {              \
-       .name = _name,                                                          \
-       .flags = 0,                                                             \
-       .max = (((_nparents) - 1) << JH7100_CLK_MUX_SHIFT) | (_max),            \
-       .parents = { __VA_ARGS__ },                                             \
-}
-
-#define JH7100__GMD(_idx, _name, _flags, _max, _nparents, ...) [_idx] = {      \
-       .name = _name,                                                          \
-       .flags = _flags,                                                        \
-       .max = JH7100_CLK_ENABLE |                                              \
-               (((_nparents) - 1) << JH7100_CLK_MUX_SHIFT) | (_max),           \
-       .parents = { __VA_ARGS__ },                                             \
-}
-
-#define JH7100__INV(_idx, _name, _parent) [_idx] = {                           \
-       .name = _name,                                                          \
-       .flags = CLK_SET_RATE_PARENT,                                           \
-       .max = JH7100_CLK_INVERT,                                               \
-       .parents = { [0] = _parent },                                           \
-}
-
-struct jh7100_clk {
-       struct clk_hw hw;
-       unsigned int idx;
-       unsigned int max_div;
-};
-
-struct jh7100_clk_priv {
-       /* protect clk enable and set rate/parent from happening at the same time */
-       spinlock_t rmw_lock;
-       struct device *dev;
-       void __iomem *base;
-       struct clk_hw *pll[3];
-       struct jh7100_clk reg[];
-};
-
-const struct clk_ops *starfive_jh7100_clk_ops(u32 max);
-
-#endif
drivers/clk/starfive/clk-starfive-jh71x0.c +142 -142
index 6c07b61b4a32..b372083d11c3 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * StarFive JH7100 Clock Generator Driver
+ * StarFive JH71X0 Clock Generator Driver
  *
  * Copyright (C) 2021-2022 Emil Renner Berthing <[email protected]>
  */
@@ -10,29 +10,29 @@
 #include <linux/device.h>
 #include <linux/io.h>
 
-#include "clk-starfive-jh7100.h"
+#include "clk-starfive-jh71x0.h"
 
-static struct jh7100_clk *jh7100_clk_from(struct clk_hw *hw)
+static struct jh71x0_clk *jh71x0_clk_from(struct clk_hw *hw)
 {
-       return container_of(hw, struct jh7100_clk, hw);
+       return container_of(hw, struct jh71x0_clk, hw);
 }
 
-static struct jh7100_clk_priv *jh7100_priv_from(struct jh7100_clk *clk)
+static struct jh71x0_clk_priv *jh71x0_priv_from(struct jh71x0_clk *clk)
 {
-       return container_of(clk, struct jh7100_clk_priv, reg[clk->idx]);
+       return container_of(clk, struct jh71x0_clk_priv, reg[clk->idx]);
 }
 
-static u32 jh7100_clk_reg_get(struct jh7100_clk *clk)
+static u32 jh71x0_clk_reg_get(struct jh71x0_clk *clk)
 {
-       struct jh7100_clk_priv *priv = jh7100_priv_from(clk);
+       struct jh71x0_clk_priv *priv = jh71x0_priv_from(clk);
        void __iomem *reg = priv->base + 4 * clk->idx;
 
        return readl_relaxed(reg);
 }
 
-static void jh7100_clk_reg_rmw(struct jh7100_clk *clk, u32 mask, u32 value)
+static void jh71x0_clk_reg_rmw(struct jh71x0_clk *clk, u32 mask, u32 value)
 {
-       struct jh7100_clk_priv *priv = jh7100_priv_from(clk);
+       struct jh71x0_clk_priv *priv = jh71x0_priv_from(clk);
        void __iomem *reg = priv->base + 4 * clk->idx;
        unsigned long flags;
 
@@ -42,41 +42,41 @@ static void jh7100_clk_reg_rmw(struct jh7100_clk *clk, u32 mask, u32 value)
        spin_unlock_irqrestore(&priv->rmw_lock, flags);
 }
 
-static int jh7100_clk_enable(struct clk_hw *hw)
+static int jh71x0_clk_enable(struct clk_hw *hw)
 {
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       struct jh71x0_clk *clk = jh71x0_clk_from(hw);
 
-       jh7100_clk_reg_rmw(clk, JH7100_CLK_ENABLE, JH7100_CLK_ENABLE);
+       jh71x0_clk_reg_rmw(clk, JH71X0_CLK_ENABLE, JH71X0_CLK_ENABLE);
        return 0;
 }
 
-static void jh7100_clk_disable(struct clk_hw *hw)
+static void jh71x0_clk_disable(struct clk_hw *hw)
 {
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       struct jh71x0_clk *clk = jh71x0_clk_from(hw);
 
-       jh7100_clk_reg_rmw(clk, JH7100_CLK_ENABLE, 0);
+       jh71x0_clk_reg_rmw(clk, JH71X0_CLK_ENABLE, 0);
 }
 
-static int jh7100_clk_is_enabled(struct clk_hw *hw)
+static int jh71x0_clk_is_enabled(struct clk_hw *hw)
 {
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       struct jh71x0_clk *clk = jh71x0_clk_from(hw);
 
-       return !!(jh7100_clk_reg_get(clk) & JH7100_CLK_ENABLE);
+       return !!(jh71x0_clk_reg_get(clk) & JH71X0_CLK_ENABLE);
 }
 
-static unsigned long jh7100_clk_recalc_rate(struct clk_hw *hw,
+static unsigned long jh71x0_clk_recalc_rate(struct clk_hw *hw,
                                            unsigned long parent_rate)
 {
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       u32 div = jh7100_clk_reg_get(clk) & JH7100_CLK_DIV_MASK;
+       struct jh71x0_clk *clk = jh71x0_clk_from(hw);
+       u32 div = jh71x0_clk_reg_get(clk) & JH71X0_CLK_DIV_MASK;
 
        return div ? parent_rate / div : 0;
 }
 
-static int jh7100_clk_determine_rate(struct clk_hw *hw,
+static int jh71x0_clk_determine_rate(struct clk_hw *hw,
                                     struct clk_rate_request *req)
 {
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       struct jh71x0_clk *clk = jh71x0_clk_from(hw);
        unsigned long parent = req->best_parent_rate;
        unsigned long rate = clamp(req->rate, req->min_rate, req->max_rate);
        unsigned long div = min_t(unsigned long, DIV_ROUND_UP(parent, rate), clk->max_div);
@@ -102,232 +102,232 @@ static int jh7100_clk_determine_rate(struct clk_hw *hw,
        return 0;
 }
 
-static int jh7100_clk_set_rate(struct clk_hw *hw,
+static int jh71x0_clk_set_rate(struct clk_hw *hw,
                               unsigned long rate,
                               unsigned long parent_rate)
 {
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       struct jh71x0_clk *clk = jh71x0_clk_from(hw);
        unsigned long div = clamp(DIV_ROUND_CLOSEST(parent_rate, rate),
                                  1UL, (unsigned long)clk->max_div);
 
-       jh7100_clk_reg_rmw(clk, JH7100_CLK_DIV_MASK, div);
+       jh71x0_clk_reg_rmw(clk, JH71X0_CLK_DIV_MASK, div);
        return 0;
 }
 
-static unsigned long jh7100_clk_frac_recalc_rate(struct clk_hw *hw,
+static unsigned long jh71x0_clk_frac_recalc_rate(struct clk_hw *hw,
                                                 unsigned long parent_rate)
 {
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       u32 reg = jh7100_clk_reg_get(clk);
-       unsigned long div100 = 100 * (reg & JH7100_CLK_INT_MASK) +
-                              ((reg & JH7100_CLK_FRAC_MASK) >> JH7100_CLK_FRAC_SHIFT);
+       struct jh71x0_clk *clk = jh71x0_clk_from(hw);
+       u32 reg = jh71x0_clk_reg_get(clk);
+       unsigned long div100 = 100 * (reg & JH71X0_CLK_INT_MASK) +
+                              ((reg & JH71X0_CLK_FRAC_MASK) >> JH71X0_CLK_FRAC_SHIFT);
 
-       return (div100 >= JH7100_CLK_FRAC_MIN) ? 100 * parent_rate / div100 : 0;
+       return (div100 >= JH71X0_CLK_FRAC_MIN) ? 100 * parent_rate / div100 : 0;
 }
 
-static int jh7100_clk_frac_determine_rate(struct clk_hw *hw,
+static int jh71x0_clk_frac_determine_rate(struct clk_hw *hw,
                                          struct clk_rate_request *req)
 {
        unsigned long parent100 = 100 * req->best_parent_rate;
        unsigned long rate = clamp(req->rate, req->min_rate, req->max_rate);
        unsigned long div100 = clamp(DIV_ROUND_CLOSEST(parent100, rate),
-                                    JH7100_CLK_FRAC_MIN, JH7100_CLK_FRAC_MAX);
+                                    JH71X0_CLK_FRAC_MIN, JH71X0_CLK_FRAC_MAX);
        unsigned long result = parent100 / div100;
 
-       /* clamp the result as in jh7100_clk_determine_rate() above */
-       if (result > req->max_rate && div100 < JH7100_CLK_FRAC_MAX)
+       /* clamp the result as in jh71x0_clk_determine_rate() above */
+       if (result > req->max_rate && div100 < JH71X0_CLK_FRAC_MAX)
                result = parent100 / (div100 + 1);
-       if (result < req->min_rate && div100 > JH7100_CLK_FRAC_MIN)
+       if (result < req->min_rate && div100 > JH71X0_CLK_FRAC_MIN)
                result = parent100 / (div100 - 1);
 
        req->rate = result;
        return 0;
 }
 
-static int jh7100_clk_frac_set_rate(struct clk_hw *hw,
+static int jh71x0_clk_frac_set_rate(struct clk_hw *hw,
                                    unsigned long rate,
                                    unsigned long parent_rate)
 {
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       struct jh71x0_clk *clk = jh71x0_clk_from(hw);
        unsigned long div100 = clamp(DIV_ROUND_CLOSEST(100 * parent_rate, rate),
-                                    JH7100_CLK_FRAC_MIN, JH7100_CLK_FRAC_MAX);
-       u32 value = ((div100 % 100) << JH7100_CLK_FRAC_SHIFT) | (div100 / 100);
+                                    JH71X0_CLK_FRAC_MIN, JH71X0_CLK_FRAC_MAX);
+       u32 value = ((div100 % 100) << JH71X0_CLK_FRAC_SHIFT) | (div100 / 100);
 
-       jh7100_clk_reg_rmw(clk, JH7100_CLK_DIV_MASK, value);
+       jh71x0_clk_reg_rmw(clk, JH71X0_CLK_DIV_MASK, value);
        return 0;
 }
 
-static u8 jh7100_clk_get_parent(struct clk_hw *hw)
+static u8 jh71x0_clk_get_parent(struct clk_hw *hw)
 {
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       u32 value = jh7100_clk_reg_get(clk);
+       struct jh71x0_clk *clk = jh71x0_clk_from(hw);
+       u32 value = jh71x0_clk_reg_get(clk);
 
-       return (value & JH7100_CLK_MUX_MASK) >> JH7100_CLK_MUX_SHIFT;
+       return (value & JH71X0_CLK_MUX_MASK) >> JH71X0_CLK_MUX_SHIFT;
 }
 
-static int jh7100_clk_set_parent(struct clk_hw *hw, u8 index)
+static int jh71x0_clk_set_parent(struct clk_hw *hw, u8 index)
 {
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       u32 value = (u32)index << JH7100_CLK_MUX_SHIFT;
+       struct jh71x0_clk *clk = jh71x0_clk_from(hw);
+       u32 value = (u32)index << JH71X0_CLK_MUX_SHIFT;
 
-       jh7100_clk_reg_rmw(clk, JH7100_CLK_MUX_MASK, value);
+       jh71x0_clk_reg_rmw(clk, JH71X0_CLK_MUX_MASK, value);
        return 0;
 }
 
-static int jh7100_clk_mux_determine_rate(struct clk_hw *hw,
+static int jh71x0_clk_mux_determine_rate(struct clk_hw *hw,
                                         struct clk_rate_request *req)
 {
        return clk_mux_determine_rate_flags(hw, req, 0);
 }
 
-static int jh7100_clk_get_phase(struct clk_hw *hw)
+static int jh71x0_clk_get_phase(struct clk_hw *hw)
 {
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       u32 value = jh7100_clk_reg_get(clk);
+       struct jh71x0_clk *clk = jh71x0_clk_from(hw);
+       u32 value = jh71x0_clk_reg_get(clk);
 
-       return (value & JH7100_CLK_INVERT) ? 180 : 0;
+       return (value & JH71X0_CLK_INVERT) ? 180 : 0;
 }
 
-static int jh7100_clk_set_phase(struct clk_hw *hw, int degrees)
+static int jh71x0_clk_set_phase(struct clk_hw *hw, int degrees)
 {
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
+       struct jh71x0_clk *clk = jh71x0_clk_from(hw);
        u32 value;
 
        if (degrees == 0)
                value = 0;
        else if (degrees == 180)
-               value = JH7100_CLK_INVERT;
+               value = JH71X0_CLK_INVERT;
        else
                return -EINVAL;
 
-       jh7100_clk_reg_rmw(clk, JH7100_CLK_INVERT, value);
+       jh71x0_clk_reg_rmw(clk, JH71X0_CLK_INVERT, value);
        return 0;
 }
 
 #ifdef CONFIG_DEBUG_FS
-static void jh7100_clk_debug_init(struct clk_hw *hw, struct dentry *dentry)
+static void jh71x0_clk_debug_init(struct clk_hw *hw, struct dentry *dentry)
 {
-       static const struct debugfs_reg32 jh7100_clk_reg = {
+       static const struct debugfs_reg32 jh71x0_clk_reg = {
                .name = "CTRL",
                .offset = 0,
        };
-       struct jh7100_clk *clk = jh7100_clk_from(hw);
-       struct jh7100_clk_priv *priv = jh7100_priv_from(clk);
+       struct jh71x0_clk *clk = jh71x0_clk_from(hw);
+       struct jh71x0_clk_priv *priv = jh71x0_priv_from(clk);
        struct debugfs_regset32 *regset;
 
        regset = devm_kzalloc(priv->dev, sizeof(*regset), GFP_KERNEL);
        if (!regset)
                return;
 
-       regset->regs = &jh7100_clk_reg;
+       regset->regs = &jh71x0_clk_reg;
        regset->nregs = 1;
        regset->base = priv->base + 4 * clk->idx;
 
        debugfs_create_regset32("registers", 0400, dentry, regset);
 }
 #else
-#define jh7100_clk_debug_init NULL
+#define jh71x0_clk_debug_init NULL
 #endif
 
-static const struct clk_ops jh7100_clk_gate_ops = {
-       .enable = jh7100_clk_enable,
-       .disable = jh7100_clk_disable,
-       .is_enabled = jh7100_clk_is_enabled,
-       .debug_init = jh7100_clk_debug_init,
+static const struct clk_ops jh71x0_clk_gate_ops = {
+       .enable = jh71x0_clk_enable,
+       .disable = jh71x0_clk_disable,
+       .is_enabled = jh71x0_clk_is_enabled,
+       .debug_init = jh71x0_clk_debug_init,
 };
 
-static const struct clk_ops jh7100_clk_div_ops = {
-       .recalc_rate = jh7100_clk_recalc_rate,
-       .determine_rate = jh7100_clk_determine_rate,
-       .set_rate = jh7100_clk_set_rate,
-       .debug_init = jh7100_clk_debug_init,
+static const struct clk_ops jh71x0_clk_div_ops = {
+       .recalc_rate = jh71x0_clk_recalc_rate,
+       .determine_rate = jh71x0_clk_determine_rate,
+       .set_rate = jh71x0_clk_set_rate,
+       .debug_init = jh71x0_clk_debug_init,
 };
 
-static const struct clk_ops jh7100_clk_fdiv_ops = {
-       .recalc_rate = jh7100_clk_frac_recalc_rate,
-       .determine_rate = jh7100_clk_frac_determine_rate,
-       .set_rate = jh7100_clk_frac_set_rate,
-       .debug_init = jh7100_clk_debug_init,
+static const struct clk_ops jh71x0_clk_fdiv_ops = {
+       .recalc_rate = jh71x0_clk_frac_recalc_rate,
+       .determine_rate = jh71x0_clk_frac_determine_rate,
+       .set_rate = jh71x0_clk_frac_set_rate,
+       .debug_init = jh71x0_clk_debug_init,
 };
 
-static const struct clk_ops jh7100_clk_gdiv_ops = {
-       .enable = jh7100_clk_enable,
-       .disable = jh7100_clk_disable,
-       .is_enabled = jh7100_clk_is_enabled,
-       .recalc_rate = jh7100_clk_recalc_rate,
-       .determine_rate = jh7100_clk_determine_rate,
-       .set_rate = jh7100_clk_set_rate,
-       .debug_init = jh7100_clk_debug_init,
+static const struct clk_ops jh71x0_clk_gdiv_ops = {
+       .enable = jh71x0_clk_enable,
+       .disable = jh71x0_clk_disable,
+       .is_enabled = jh71x0_clk_is_enabled,
+       .recalc_rate = jh71x0_clk_recalc_rate,
+       .determine_rate = jh71x0_clk_determine_rate,
+       .set_rate = jh71x0_clk_set_rate,
+       .debug_init = jh71x0_clk_debug_init,
 };
 
-static const struct clk_ops jh7100_clk_mux_ops = {
-       .determine_rate = jh7100_clk_mux_determine_rate,
-       .set_parent = jh7100_clk_set_parent,
-       .get_parent = jh7100_clk_get_parent,
-       .debug_init = jh7100_clk_debug_init,
+static const struct clk_ops jh71x0_clk_mux_ops = {
+       .determine_rate = jh71x0_clk_mux_determine_rate,
+       .set_parent = jh71x0_clk_set_parent,
+       .get_parent = jh71x0_clk_get_parent,
+       .debug_init = jh71x0_clk_debug_init,
 };
 
-static const struct clk_ops jh7100_clk_gmux_ops = {
-       .enable = jh7100_clk_enable,
-       .disable = jh7100_clk_disable,
-       .is_enabled = jh7100_clk_is_enabled,
-       .determine_rate = jh7100_clk_mux_determine_rate,
-       .set_parent = jh7100_clk_set_parent,
-       .get_parent = jh7100_clk_get_parent,
-       .debug_init = jh7100_clk_debug_init,
+static const struct clk_ops jh71x0_clk_gmux_ops = {
+       .enable = jh71x0_clk_enable,
+       .disable = jh71x0_clk_disable,
+       .is_enabled = jh71x0_clk_is_enabled,
+       .determine_rate = jh71x0_clk_mux_determine_rate,
+       .set_parent = jh71x0_clk_set_parent,
+       .get_parent = jh71x0_clk_get_parent,
+       .debug_init = jh71x0_clk_debug_init,
 };
 
-static const struct clk_ops jh7100_clk_mdiv_ops = {
-       .recalc_rate = jh7100_clk_recalc_rate,
-       .determine_rate = jh7100_clk_determine_rate,
-       .get_parent = jh7100_clk_get_parent,
-       .set_parent = jh7100_clk_set_parent,
-       .set_rate = jh7100_clk_set_rate,
-       .debug_init = jh7100_clk_debug_init,
+static const struct clk_ops jh71x0_clk_mdiv_ops = {
+       .recalc_rate = jh71x0_clk_recalc_rate,
+       .determine_rate = jh71x0_clk_determine_rate,
+       .get_parent = jh71x0_clk_get_parent,
+       .set_parent = jh71x0_clk_set_parent,
+       .set_rate = jh71x0_clk_set_rate,
+       .debug_init = jh71x0_clk_debug_init,
 };
 
-static const struct clk_ops jh7100_clk_gmd_ops = {
-       .enable = jh7100_clk_enable,
-       .disable = jh7100_clk_disable,
-       .is_enabled = jh7100_clk_is_enabled,
-       .recalc_rate = jh7100_clk_recalc_rate,
-       .determine_rate = jh7100_clk_determine_rate,
-       .get_parent = jh7100_clk_get_parent,
-       .set_parent = jh7100_clk_set_parent,
-       .set_rate = jh7100_clk_set_rate,
-       .debug_init = jh7100_clk_debug_init,
+static const struct clk_ops jh71x0_clk_gmd_ops = {
+       .enable = jh71x0_clk_enable,
+       .disable = jh71x0_clk_disable,
+       .is_enabled = jh71x0_clk_is_enabled,
+       .recalc_rate = jh71x0_clk_recalc_rate,
+       .determine_rate = jh71x0_clk_determine_rate,
+       .get_parent = jh71x0_clk_get_parent,
+       .set_parent = jh71x0_clk_set_parent,
+       .set_rate = jh71x0_clk_set_rate,
+       .debug_init = jh71x0_clk_debug_init,
 };
 
-static const struct clk_ops jh7100_clk_inv_ops = {
-       .get_phase = jh7100_clk_get_phase,
-       .set_phase = jh7100_clk_set_phase,
-       .debug_init = jh7100_clk_debug_init,
+static const struct clk_ops jh71x0_clk_inv_ops = {
+       .get_phase = jh71x0_clk_get_phase,
+       .set_phase = jh71x0_clk_set_phase,
+       .debug_init = jh71x0_clk_debug_init,
 };
 
-const struct clk_ops *starfive_jh7100_clk_ops(u32 max)
+const struct clk_ops *starfive_jh71x0_clk_ops(u32 max)
 {
-       if (max & JH7100_CLK_DIV_MASK) {
-               if (max & JH7100_CLK_MUX_MASK) {
-                       if (max & JH7100_CLK_ENABLE)
-                               return &jh7100_clk_gmd_ops;
-                       return &jh7100_clk_mdiv_ops;
+       if (max & JH71X0_CLK_DIV_MASK) {
+               if (max & JH71X0_CLK_MUX_MASK) {
+                       if (max & JH71X0_CLK_ENABLE)
+                               return &jh71x0_clk_gmd_ops;
+                       return &jh71x0_clk_mdiv_ops;
                }
-               if (max & JH7100_CLK_ENABLE)
-                       return &jh7100_clk_gdiv_ops;
-               if (max == JH7100_CLK_FRAC_MAX)
-                       return &jh7100_clk_fdiv_ops;
-               return &jh7100_clk_div_ops;
+               if (max & JH71X0_CLK_ENABLE)
+                       return &jh71x0_clk_gdiv_ops;
+               if (max == JH71X0_CLK_FRAC_MAX)
+                       return &jh71x0_clk_fdiv_ops;
+               return &jh71x0_clk_div_ops;
        }
 
-       if (max & JH7100_CLK_MUX_MASK) {
-               if (max & JH7100_CLK_ENABLE)
-                       return &jh7100_clk_gmux_ops;
-               return &jh7100_clk_mux_ops;
+       if (max & JH71X0_CLK_MUX_MASK) {
+               if (max & JH71X0_CLK_ENABLE)
+                       return &jh71x0_clk_gmux_ops;
+               return &jh71x0_clk_mux_ops;
        }
 
-       if (max & JH7100_CLK_ENABLE)
-               return &jh7100_clk_gate_ops;
+       if (max & JH71X0_CLK_ENABLE)
+               return &jh71x0_clk_gate_ops;
 
-       return &jh7100_clk_inv_ops;
+       return &jh71x0_clk_inv_ops;
 }
-EXPORT_SYMBOL_GPL(starfive_jh7100_clk_ops);
+EXPORT_SYMBOL_GPL(starfive_jh71x0_clk_ops);
drivers/clk/starfive/clk-starfive-jh71x0.h new file +114 -1
new file mode 100644
index 000000000000..baf4b5cb4b8a
@@ -0,0 +1,114 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __CLK_STARFIVE_JH71X0_H
+#define __CLK_STARFIVE_JH71X0_H
+
+#include <linux/bits.h>
+#include <linux/clk-provider.h>
+#include <linux/device.h>
+#include <linux/spinlock.h>
+
+/* register fields */
+#define JH71X0_CLK_ENABLE      BIT(31)
+#define JH71X0_CLK_INVERT      BIT(30)
+#define JH71X0_CLK_MUX_MASK    GENMASK(27, 24)
+#define JH71X0_CLK_MUX_SHIFT   24
+#define JH71X0_CLK_DIV_MASK    GENMASK(23, 0)
+#define JH71X0_CLK_FRAC_MASK   GENMASK(15, 8)
+#define JH71X0_CLK_FRAC_SHIFT  8
+#define JH71X0_CLK_INT_MASK    GENMASK(7, 0)
+
+/* fractional divider min/max */
+#define JH71X0_CLK_FRAC_MIN    100UL
+#define JH71X0_CLK_FRAC_MAX    25599UL
+
+/* clock data */
+struct jh71x0_clk_data {
+       const char *name;
+       unsigned long flags;
+       u32 max;
+       u8 parents[4];
+};
+
+#define JH71X0_GATE(_idx, _name, _flags, _parent) [_idx] = {                   \
+       .name = _name,                                                          \
+       .flags = CLK_SET_RATE_PARENT | (_flags),                                \
+       .max = JH71X0_CLK_ENABLE,                                               \
+       .parents = { [0] = _parent },                                           \
+}
+
+#define JH71X0__DIV(_idx, _name, _max, _parent) [_idx] = {                     \
+       .name = _name,                                                          \
+       .flags = 0,                                                             \
+       .max = _max,                                                            \
+       .parents = { [0] = _parent },                                           \
+}
+
+#define JH71X0_GDIV(_idx, _name, _flags, _max, _parent) [_idx] = {             \
+       .name = _name,                                                          \
+       .flags = _flags,                                                        \
+       .max = JH71X0_CLK_ENABLE | (_max),                                      \
+       .parents = { [0] = _parent },                                           \
+}
+
+#define JH71X0_FDIV(_idx, _name, _parent) [_idx] = {                           \
+       .name = _name,                                                          \
+       .flags = 0,                                                             \
+       .max = JH71X0_CLK_FRAC_MAX,                                             \
+       .parents = { [0] = _parent },                                           \
+}
+
+#define JH71X0__MUX(_idx, _name, _nparents, ...) [_idx] = {                    \
+       .name = _name,                                                          \
+       .flags = 0,                                                             \
+       .max = ((_nparents) - 1) << JH71X0_CLK_MUX_SHIFT,                       \
+       .parents = { __VA_ARGS__ },                                             \
+}
+
+#define JH71X0_GMUX(_idx, _name, _flags, _nparents, ...) [_idx] = {            \
+       .name = _name,                                                          \
+       .flags = _flags,                                                        \
+       .max = JH71X0_CLK_ENABLE |                                              \
+               (((_nparents) - 1) << JH71X0_CLK_MUX_SHIFT),                    \
+       .parents = { __VA_ARGS__ },                                             \
+}
+
+#define JH71X0_MDIV(_idx, _name, _max, _nparents, ...) [_idx] = {              \
+       .name = _name,                                                          \
+       .flags = 0,                                                             \
+       .max = (((_nparents) - 1) << JH71X0_CLK_MUX_SHIFT) | (_max),            \
+       .parents = { __VA_ARGS__ },                                             \
+}
+
+#define JH71X0__GMD(_idx, _name, _flags, _max, _nparents, ...) [_idx] = {      \
+       .name = _name,                                                          \
+       .flags = _flags,                                                        \
+       .max = JH71X0_CLK_ENABLE |                                              \
+               (((_nparents) - 1) << JH71X0_CLK_MUX_SHIFT) | (_max),           \
+       .parents = { __VA_ARGS__ },                                             \
+}
+
+#define JH71X0__INV(_idx, _name, _parent) [_idx] = {                           \
+       .name = _name,                                                          \
+       .flags = CLK_SET_RATE_PARENT,                                           \
+       .max = JH71X0_CLK_INVERT,                                               \
+       .parents = { [0] = _parent },                                           \
+}
+
+struct jh71x0_clk {
+       struct clk_hw hw;
+       unsigned int idx;
+       unsigned int max_div;
+};
+
+struct jh71x0_clk_priv {
+       /* protect clk enable and set rate/parent from happening at the same time */
+       spinlock_t rmw_lock;
+       struct device *dev;
+       void __iomem *base;
+       struct clk_hw *pll[3];
+       struct jh71x0_clk reg[];
+};
+
+const struct clk_ops *starfive_jh71x0_clk_ops(u32 max);
+
+#endif
--

2.38.1

author maintainer
#6 lore raw

Re: [PATCH v2 02/14] clk: starfive: Rename "jh7100" to "jh71x0" for the common code

Quoted 10 lines · Emil Renner Berthing
Quoted 5 lines · Hal Feng

Rename "clk-starfive-jh7100.h" to "clk-starfive-jh71x0.h" and rename some variables from "jh7100" or "JH7100" to "jh71x0" or "JH71X0".

The patch is fine, but I'm a little unsure about this Co-developed-by. This patch is taken directly from my jh7110 branch so does Hal sending it count as co-developed-by?

Your original patch merged patch 1 and patch 2. Suggested by Stephen, I split the patch into two patches, and I need to add a new commit. My previous thinking was that the Co-developed-by tag should not be added to the commit author, so I added it to you.

Best regards,
Hal

Quoted 3 lines
Quoted 3 lines
#7 lore raw

Re: [PATCH v2 02/14] clk: starfive: Rename "jh7100" to "jh71x0" for the common code

Quoted 9 lines · Hal Feng
Quoted 7 lines · Emil Renner Berthing
Quoted 5 lines · Hal Feng

Rename "clk-starfive-jh7100.h" to "clk-starfive-jh71x0.h" and rename some variables from "jh7100" or "JH7100" to "jh71x0" or "JH71X0".

Quoted 8 lines
Quoted 3 lines

The patch is fine, but I'm a little unsure about this Co-developed-by. This patch is taken directly from my jh7110 branch so does Hal sending it count as co-developed-by?

Your original patch merged patch 1 and patch 2. Suggested by Stephen, I split the patch into two patches, and I need to add a new commit. My previous thinking was that the Co-developed-by tag should not be added to the commit author, so I added it to you.

Even if you didn't just copy it[1] I still don't think splitting patches counts as "developed by". You can set the author of new commits or copy them from a previous commit with git commit -c.

[1]: https://github.com/esmil/linux/commit/df4bcbc307e97cb6a0e7b8ed5ecc66487395176d

Quoted 7 lines

Best regards,
Hal

Quoted 3 lines
Quoted 3 lines

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author maintainer
#8 lore raw

Re: [PATCH v2 02/14] clk: starfive: Rename "jh7100" to "jh71x0" for the common code

Quoted 14 lines · Emil Renner Berthing
Quoted 13 lines · Hal Feng
Quoted 10 lines · Emil Renner Berthing
Quoted 5 lines · Hal Feng

Rename "clk-starfive-jh7100.h" to "clk-starfive-jh71x0.h" and rename some variables from "jh7100" or "JH7100" to "jh71x0" or "JH71X0".

The patch is fine, but I'm a little unsure about this Co-developed-by. This patch is taken directly from my jh7110 branch so does Hal sending it count as co-developed-by?

Quoted 8 lines
Quoted 4 lines

Your original patch merged patch 1 and patch 2. Suggested by Stephen, I split the patch into two patches, and I need to add a new commit. My previous thinking was that the Co-developed-by tag should not be added to the commit author, so I added it to you.

Even if you didn't just copy it[1] I still don't think splitting patches counts as "developed by". You can set the author of new commits or copy them from a previous commit with git commit -c.

Okay, I will remove my Co-developed-by tag in patch 1, 2, 4, 5 and set the commit author as you.

Quoted 2 lines

[1]: https://github.com/esmil/linux/commit/df4bcbc307e97cb6a0e7b8ed5ecc66487395176d

Oh, I don't even know you still work on JH7110 and update on github.. All your patches were cherry-picked from your gitlab branch. There is no doubt that we did the same thing for this patch.

Best regards,
Hal

author maintainer
#9 lore raw

PATCH v2 3/14 reset: Create subdirectory for StarFive drivers

In reply to Hal Feng

From: Emil Renner Berthing <[email protected]>

This moves the StarFive JH7100 reset driver to a new subdirectory in preparation for adding more StarFive reset drivers.

---
 MAINTAINERS                                          | 4 ++--
 drivers/reset/Kconfig                                | 8 +-------
 drivers/reset/Makefile                               | 2 +-
 drivers/reset/starfive/Kconfig                       | 8 ++++++++
 drivers/reset/starfive/Makefile                      | 2 ++
 drivers/reset/{ => starfive}/reset-starfive-jh7100.c | 0
 6 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 drivers/reset/starfive/Kconfig
 create mode 100644 drivers/reset/starfive/Makefile
 rename drivers/reset/{ => starfive}/reset-starfive-jh7100.c (100%)
MAINTAINERS +2 -2
index d43daa89d5f1..e6f1060e7964 100644
@@ -19613,11 +19613,11 @@ F:	Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
 F:	drivers/pinctrl/starfive/
 F:	include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
 
-STARFIVE JH7100 RESET CONTROLLER DRIVER
+STARFIVE JH7100 RESET CONTROLLER DRIVERS
 M:	Emil Renner Berthing <[email protected]>
 S:	Maintained
 F:	Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml
-F:	drivers/reset/reset-starfive-jh7100.c
+F:	drivers/reset/starfive/
 F:	include/dt-bindings/reset/starfive-jh7100.h
 
 STATIC BRANCH/CALL
drivers/reset/Kconfig +1 -7
index de176c2fbad9..1e8e1c4954cd 100644
@@ -232,13 +232,6 @@ config RESET_SOCFPGA
 	  This enables the reset driver for the SoCFPGA ARMv7 platforms. This
 	  driver gets initialized early during platform init calls.
 
-config RESET_STARFIVE_JH7100
-	bool "StarFive JH7100 Reset Driver"
-	depends on SOC_STARFIVE || COMPILE_TEST
-	default SOC_STARFIVE
-	help
-	  This enables the reset controller driver for the StarFive JH7100 SoC.
-
 config RESET_SUNPLUS
 	bool "Sunplus SoCs Reset Driver" if COMPILE_TEST
 	default ARCH_SUNPLUS
@@ -320,6 +313,7 @@ config RESET_ZYNQ
 	help
 	  This enables the reset controller driver for Xilinx Zynq SoCs.
 
+source "drivers/reset/starfive/Kconfig"
 source "drivers/reset/sti/Kconfig"
 source "drivers/reset/hisilicon/Kconfig"
 source "drivers/reset/tegra/Kconfig"
drivers/reset/Makefile +1 -1
index 3e7e5fd633a8..fee17a0e3a16 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y += core.o
 obj-y += hisilicon/
+obj-$(CONFIG_SOC_STARFIVE) += starfive/
 obj-$(CONFIG_ARCH_STI) += sti/
 obj-$(CONFIG_ARCH_TEGRA) += tegra/
 obj-$(CONFIG_RESET_A10SR) += reset-a10sr.o
@@ -30,7 +31,6 @@ obj-$(CONFIG_RESET_RZG2L_USBPHY_CTRL) += reset-rzg2l-usbphy-ctrl.o
 obj-$(CONFIG_RESET_SCMI) += reset-scmi.o
 obj-$(CONFIG_RESET_SIMPLE) += reset-simple.o
 obj-$(CONFIG_RESET_SOCFPGA) += reset-socfpga.o
-obj-$(CONFIG_RESET_STARFIVE_JH7100) += reset-starfive-jh7100.o
 obj-$(CONFIG_RESET_SUNPLUS) += reset-sunplus.o
 obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
 obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o
drivers/reset/starfive/Kconfig new file +8 -0
new file mode 100644
index 000000000000..cddebdba7177
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config RESET_STARFIVE_JH7100
+	bool "StarFive JH7100 Reset Driver"
+	depends on SOC_STARFIVE || COMPILE_TEST
+	default SOC_STARFIVE
+	help
+	  This enables the reset controller driver for the StarFive JH7100 SoC.
drivers/reset/starfive/Makefile new file +2 -0
new file mode 100644
index 000000000000..670d049423f5
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_RESET_STARFIVE_JH7100)		+= reset-starfive-jh7100.o
drivers/reset/starfive/reset-starfive-jh7100.c renamed from drivers/reset/reset-starfive-jh7100.c +0 -0
similarity index 100%
rename from drivers/reset/reset-starfive-jh7100.c
rename to drivers/reset/starfive/reset-starfive-jh7100.c
Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#10 lore raw

Re: [PATCH v2 03/14] reset: Create subdirectory for StarFive drivers

Quoted 25 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

This moves the StarFive JH7100 reset driver to a new subdirectory in preparation for adding more StarFive reset drivers.

---
 MAINTAINERS                                          | 4 ++--
 drivers/reset/Kconfig                                | 8 +-------
 drivers/reset/Makefile                               | 2 +-
 drivers/reset/starfive/Kconfig                       | 8 ++++++++
 drivers/reset/starfive/Makefile                      | 2 ++
 drivers/reset/{ => starfive}/reset-starfive-jh7100.c | 0
 6 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 drivers/reset/starfive/Kconfig
 create mode 100644 drivers/reset/starfive/Makefile
 rename drivers/reset/{ => starfive}/reset-starfive-jh7100.c (100%)
MAINTAINERS +0 -0
index d43daa89d5f1..e6f1060e7964 100644

MAINTAINERS F: Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml · line 19620

Quoted 10 lines
MAINTAINERS +2 -2
@@ -19613,11 +19613,11 @@ F:    Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
 F:     drivers/pinctrl/starfive/
 F:     include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
 
-STARFIVE JH7100 RESET CONTROLLER DRIVER
+STARFIVE JH7100 RESET CONTROLLER DRIVERS
 M:     Emil Renner Berthing <[email protected]>
 S:     Maintained
 F:     Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml
-F:     drivers/reset/reset-starfive-jh7100.c
+F:     drivers/reset/starfive/

When this entry covers all StarFive reset drivers the header should also match. Eg.
STARFIVE RESET CONTROLLER DRIVERS

Quoted 78 lines
MAINTAINERS +0 -0
 F:     include/dt-bindings/reset/starfive-jh7100.h
 
 STATIC BRANCH/CALL
drivers/reset/Kconfig +1 -7
index de176c2fbad9..1e8e1c4954cd 100644
@@ -232,13 +232,6 @@ config RESET_SOCFPGA
          This enables the reset driver for the SoCFPGA ARMv7 platforms. This
          driver gets initialized early during platform init calls.
 
-config RESET_STARFIVE_JH7100
-       bool "StarFive JH7100 Reset Driver"
-       depends on SOC_STARFIVE || COMPILE_TEST
-       default SOC_STARFIVE
-       help
-         This enables the reset controller driver for the StarFive JH7100 SoC.
-
 config RESET_SUNPLUS
        bool "Sunplus SoCs Reset Driver" if COMPILE_TEST
        default ARCH_SUNPLUS
@@ -320,6 +313,7 @@ config RESET_ZYNQ
        help
          This enables the reset controller driver for Xilinx Zynq SoCs.
 
+source "drivers/reset/starfive/Kconfig"
 source "drivers/reset/sti/Kconfig"
 source "drivers/reset/hisilicon/Kconfig"
 source "drivers/reset/tegra/Kconfig"
drivers/reset/Makefile +1 -1
index 3e7e5fd633a8..fee17a0e3a16 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y += core.o
 obj-y += hisilicon/
+obj-$(CONFIG_SOC_STARFIVE) += starfive/
 obj-$(CONFIG_ARCH_STI) += sti/
 obj-$(CONFIG_ARCH_TEGRA) += tegra/
 obj-$(CONFIG_RESET_A10SR) += reset-a10sr.o
@@ -30,7 +31,6 @@ obj-$(CONFIG_RESET_RZG2L_USBPHY_CTRL) += reset-rzg2l-usbphy-ctrl.o
 obj-$(CONFIG_RESET_SCMI) += reset-scmi.o
 obj-$(CONFIG_RESET_SIMPLE) += reset-simple.o
 obj-$(CONFIG_RESET_SOCFPGA) += reset-socfpga.o
-obj-$(CONFIG_RESET_STARFIVE_JH7100) += reset-starfive-jh7100.o
 obj-$(CONFIG_RESET_SUNPLUS) += reset-sunplus.o
 obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
 obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o
drivers/reset/starfive/Kconfig new file +8 -0
new file mode 100644
index 000000000000..cddebdba7177
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config RESET_STARFIVE_JH7100
+       bool "StarFive JH7100 Reset Driver"
+       depends on SOC_STARFIVE || COMPILE_TEST
+       default SOC_STARFIVE
+       help
+         This enables the reset controller driver for the StarFive JH7100 SoC.
drivers/reset/starfive/Makefile new file +2 -0
new file mode 100644
index 000000000000..670d049423f5
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_RESET_STARFIVE_JH7100)            += reset-starfive-jh7100.o
drivers/reset/starfive/reset-starfive-jh7100.c renamed from drivers/reset/reset-starfive-jh7100.c +0 -1
similarity index 100%
rename from drivers/reset/reset-starfive-jh7100.c
rename to drivers/reset/starfive/reset-starfive-jh7100.c
--

2.38.1

author maintainer
#11 lore raw

PATCH v2 4/14 reset: starfive: Factor out common JH71X0 reset code

In reply to Hal Feng

From: Emil Renner Berthing <[email protected]>

The StarFive JH7100 SoC has additional reset controllers for audio and video, but the registers follow the same structure. On the JH7110 the reset registers don't get their own memory range, but instead follow the clock control registers. The registers still follow the same structure though, so let's factor out the common code to handle all these cases.

---
 drivers/reset/starfive/Kconfig                |   4 +
 drivers/reset/starfive/Makefile               |   2 +
 .../reset/starfive/reset-starfive-jh7100.c    | 121 ++----------------
 ...rfive-jh7100.c => reset-starfive-jh71x0.c} |  92 ++++---------
 .../reset/starfive/reset-starfive-jh71x0.h    |  14 ++
 5 files changed, 56 insertions(+), 177 deletions(-)
 copy drivers/reset/starfive/{reset-starfive-jh7100.c => reset-starfive-jh71x0.c} (50%)
 create mode 100644 drivers/reset/starfive/reset-starfive-jh71x0.h
drivers/reset/starfive/Kconfig +4 -0
index cddebdba7177..9d15c4110e40 100644
@@ -1,8 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+config RESET_STARFIVE_JH71X0
+	bool
+
 config RESET_STARFIVE_JH7100
 	bool "StarFive JH7100 Reset Driver"
 	depends on SOC_STARFIVE || COMPILE_TEST
+	select RESET_STARFIVE_JH71X0
 	default SOC_STARFIVE
 	help
 	  This enables the reset controller driver for the StarFive JH7100 SoC.
drivers/reset/starfive/Makefile +2 -0
index 670d049423f5..f6aa12466fad 100644
@@ -1,2 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_RESET_STARFIVE_JH71X0)		+= reset-starfive-jh71x0.o
+
 obj-$(CONFIG_RESET_STARFIVE_JH7100)		+= reset-starfive-jh7100.o
drivers/reset/starfive/reset-starfive-jh7100.c +11 -110

139 lines not on this page · raw message

drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +25 -67

135 lines not on this page · raw message

drivers/reset/starfive/reset-starfive-jh71x0.h new file +14 -0
new file mode 100644
index 000000000000..10770c55ab0e
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2021 Emil Renner Berthing <[email protected]>
+ */
+
+#ifndef __RESET_STARFIVE_JH71X0_H
+#define __RESET_STARFIVE_JH71X0_H
+
+int reset_starfive_jh7100_register(struct device *dev, struct device_node *of_node,
+				   void __iomem *assert, void __iomem *status,
+				   const u64 *asserted, unsigned int nr_resets,
+				   bool is_module);
+
+#endif /* __RESET_STARFIVE_JH71X0_H */
Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#12 lore raw

Re: [PATCH v2 04/14] reset: starfive: Factor out common JH71X0 reset code

Quoted 302 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

The StarFive JH7100 SoC has additional reset controllers for audio and video, but the registers follow the same structure. On the JH7110 the reset registers don't get their own memory range, but instead follow the clock control registers. The registers still follow the same structure though, so let's factor out the common code to handle all these cases.

---
 drivers/reset/starfive/Kconfig                |   4 +
 drivers/reset/starfive/Makefile               |   2 +
 .../reset/starfive/reset-starfive-jh7100.c    | 121 ++----------------
 ...rfive-jh7100.c => reset-starfive-jh71x0.c} |  92 ++++---------
 .../reset/starfive/reset-starfive-jh71x0.h    |  14 ++
 5 files changed, 56 insertions(+), 177 deletions(-)
 copy drivers/reset/starfive/{reset-starfive-jh7100.c => reset-starfive-jh71x0.c} (50%)
 create mode 100644 drivers/reset/starfive/reset-starfive-jh71x0.h
drivers/reset/starfive/Kconfig +4 -0
index cddebdba7177..9d15c4110e40 100644
@@ -1,8 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+config RESET_STARFIVE_JH71X0
+       bool
+
 config RESET_STARFIVE_JH7100
        bool "StarFive JH7100 Reset Driver"
        depends on SOC_STARFIVE || COMPILE_TEST
+       select RESET_STARFIVE_JH71X0
        default SOC_STARFIVE
        help
          This enables the reset controller driver for the StarFive JH7100 SoC.
drivers/reset/starfive/Makefile +2 -0
index 670d049423f5..f6aa12466fad 100644
@@ -1,2 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_RESET_STARFIVE_JH71X0)            += reset-starfive-jh71x0.o
+
 obj-$(CONFIG_RESET_STARFIVE_JH7100)            += reset-starfive-jh7100.o
drivers/reset/starfive/reset-starfive-jh7100.c +11 -110
index fc44b2fb3e03..43248e8135fd 100644
@@ -5,14 +5,10 @@
  * Copyright (C) 2021 Emil Renner Berthing <[email protected]>
  */
 
-#include <linux/bitmap.h>
-#include <linux/io.h>
-#include <linux/io-64-nonatomic-lo-hi.h>
-#include <linux/iopoll.h>
 #include <linux/mod_devicetable.h>
 #include <linux/platform_device.h>
-#include <linux/reset-controller.h>
-#include <linux/spinlock.h>
+
+#include "reset-starfive-jh71x0.h"
 
 #include <dt-bindings/reset/starfive-jh7100.h>
 
@@ -48,114 +44,19 @@ static const u64 jh7100_reset_asserted[2] = {
        0,
 };
 
-struct jh7100_reset {
-       struct reset_controller_dev rcdev;
-       /* protect registers against concurrent read-modify-write */
-       spinlock_t lock;
-       void __iomem *base;
-};
-
-static inline struct jh7100_reset *
-jh7100_reset_from(struct reset_controller_dev *rcdev)
-{
-       return container_of(rcdev, struct jh7100_reset, rcdev);
-}
-
-static int jh7100_reset_update(struct reset_controller_dev *rcdev,
-                              unsigned long id, bool assert)
-{
-       struct jh7100_reset *data = jh7100_reset_from(rcdev);
-       unsigned long offset = BIT_ULL_WORD(id);
-       u64 mask = BIT_ULL_MASK(id);
-       void __iomem *reg_assert = data->base + JH7100_RESET_ASSERT0 + offset * sizeof(u64);
-       void __iomem *reg_status = data->base + JH7100_RESET_STATUS0 + offset * sizeof(u64);
-       u64 done = jh7100_reset_asserted[offset] & mask;
-       u64 value;
-       unsigned long flags;
-       int ret;
-
-       if (!assert)
-               done ^= mask;
-
-       spin_lock_irqsave(&data->lock, flags);
-
-       value = readq(reg_assert);
-       if (assert)
-               value |= mask;
-       else
-               value &= ~mask;
-       writeq(value, reg_assert);
-
-       /* if the associated clock is gated, deasserting might otherwise hang forever */
-       ret = readq_poll_timeout_atomic(reg_status, value, (value & mask) == done, 0, 1000);
-
-       spin_unlock_irqrestore(&data->lock, flags);
-       return ret;
-}
-
-static int jh7100_reset_assert(struct reset_controller_dev *rcdev,
-                              unsigned long id)
-{
-       return jh7100_reset_update(rcdev, id, true);
-}
-
-static int jh7100_reset_deassert(struct reset_controller_dev *rcdev,
-                                unsigned long id)
-{
-       return jh7100_reset_update(rcdev, id, false);
-}
-
-static int jh7100_reset_reset(struct reset_controller_dev *rcdev,
-                             unsigned long id)
-{
-       int ret;
-
-       ret = jh7100_reset_assert(rcdev, id);
-       if (ret)
-               return ret;
-
-       return jh7100_reset_deassert(rcdev, id);
-}
-
-static int jh7100_reset_status(struct reset_controller_dev *rcdev,
-                              unsigned long id)
-{
-       struct jh7100_reset *data = jh7100_reset_from(rcdev);
-       unsigned long offset = BIT_ULL_WORD(id);
-       u64 mask = BIT_ULL_MASK(id);
-       void __iomem *reg_status = data->base + JH7100_RESET_STATUS0 + offset * sizeof(u64);
-       u64 value = readq(reg_status);
-
-       return !((value ^ jh7100_reset_asserted[offset]) & mask);
-}
-
-static const struct reset_control_ops jh7100_reset_ops = {
-       .assert         = jh7100_reset_assert,
-       .deassert       = jh7100_reset_deassert,
-       .reset          = jh7100_reset_reset,
-       .status         = jh7100_reset_status,
-};
-
 static int __init jh7100_reset_probe(struct platform_device *pdev)
 {
-       struct jh7100_reset *data;
-
-       data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
-       if (!data)
-               return -ENOMEM;
-
-       data->base = devm_platform_ioremap_resource(pdev, 0);
-       if (IS_ERR(data->base))
-               return PTR_ERR(data->base);
+       void __iomem *base = devm_platform_ioremap_resource(pdev, 0);
 
-       data->rcdev.ops = &jh7100_reset_ops;
-       data->rcdev.owner = THIS_MODULE;
-       data->rcdev.nr_resets = JH7100_RSTN_END;
-       data->rcdev.dev = &pdev->dev;
-       data->rcdev.of_node = pdev->dev.of_node;
-       spin_lock_init(&data->lock);
+       if (IS_ERR(base))
+               return PTR_ERR(base);
 
-       return devm_reset_controller_register(&pdev->dev, &data->rcdev);
+       return reset_starfive_jh7100_register(&pdev->dev, pdev->dev.of_node,
+                                             base + JH7100_RESET_ASSERT0,
+                                             base + JH7100_RESET_STATUS0,
+                                             jh7100_reset_asserted,
+                                             JH7100_RSTN_END,
+                                             true);
 }
 
 static const struct of_device_id jh7100_reset_dt_ids[] = {
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +14 -45
similarity index 50%
copy from drivers/reset/starfive/reset-starfive-jh7100.c
copy to drivers/reset/starfive/reset-starfive-jh71x0.c
index fc44b2fb3e03..1e230f3f9841 100644
@@ -6,53 +6,20 @@
  */
 
 #include <linux/bitmap.h>
+#include <linux/device.h>
 #include <linux/io.h>
 #include <linux/io-64-nonatomic-lo-hi.h>
 #include <linux/iopoll.h>
-#include <linux/mod_devicetable.h>
-#include <linux/platform_device.h>
 #include <linux/reset-controller.h>
 #include <linux/spinlock.h>
 
-#include <dt-bindings/reset/starfive-jh7100.h>
-
-/* register offsets */
-#define JH7100_RESET_ASSERT0   0x00
-#define JH7100_RESET_ASSERT1   0x04
-#define JH7100_RESET_ASSERT2   0x08
-#define JH7100_RESET_ASSERT3   0x0c
-#define JH7100_RESET_STATUS0   0x10
-#define JH7100_RESET_STATUS1   0x14
-#define JH7100_RESET_STATUS2   0x18
-#define JH7100_RESET_STATUS3   0x1c
-
-/*
- * Writing a 1 to the n'th bit of the m'th ASSERT register asserts
- * line 32m + n, and writing a 0 deasserts the same line.
- * Most reset lines have their status inverted so a 0 bit in the STATUS
- * register means the line is asserted and a 1 means it's deasserted. A few
- * lines don't though, so store the expected value of the status registers when
- * all lines are asserted.
- */
-static const u64 jh7100_reset_asserted[2] = {
-       /* STATUS0 */
-       BIT_ULL_MASK(JH7100_RST_U74) |
-       BIT_ULL_MASK(JH7100_RST_VP6_DRESET) |
-       BIT_ULL_MASK(JH7100_RST_VP6_BRESET) |
-       /* STATUS1 */
-       BIT_ULL_MASK(JH7100_RST_HIFI4_DRESET) |
-       BIT_ULL_MASK(JH7100_RST_HIFI4_BRESET),
-       /* STATUS2 */
-       BIT_ULL_MASK(JH7100_RST_E24) |
-       /* STATUS3 */
-       0,
-};
-
 struct jh7100_reset {
        struct reset_controller_dev rcdev;
        /* protect registers against concurrent read-modify-write */
        spinlock_t lock;
-       void __iomem *base;
+       void __iomem *assert;
+       void __iomem *status;
+       const u64 *asserted;
 };
 
 static inline struct jh7100_reset *
@@ -67,9 +34,9 @@ static int jh7100_reset_update(struct reset_controller_dev *rcdev,
        struct jh7100_reset *data = jh7100_reset_from(rcdev);
        unsigned long offset = BIT_ULL_WORD(id);
        u64 mask = BIT_ULL_MASK(id);
-       void __iomem *reg_assert = data->base + JH7100_RESET_ASSERT0 + offset * sizeof(u64);
-       void __iomem *reg_status = data->base + JH7100_RESET_STATUS0 + offset * sizeof(u64);
-       u64 done = jh7100_reset_asserted[offset] & mask;
+       void __iomem *reg_assert = data->assert + offset * sizeof(u64);
+       void __iomem *reg_status = data->status + offset * sizeof(u64);
+       u64 done = data->asserted ? data->asserted[offset] & mask : 0;
        u64 value;
        unsigned long flags;
        int ret;
@@ -123,10 +90,10 @@ static int jh7100_reset_status(struct reset_controller_dev *rcdev,
        struct jh7100_reset *data = jh7100_reset_from(rcdev);
        unsigned long offset = BIT_ULL_WORD(id);
        u64 mask = BIT_ULL_MASK(id);
-       void __iomem *reg_status = data->base + JH7100_RESET_STATUS0 + offset * sizeof(u64);
+       void __iomem *reg_status = data->status + offset * sizeof(u64);
        u64 value = readq(reg_status);
 
-       return !((value ^ jh7100_reset_asserted[offset]) & mask);
+       return !((value ^ data->asserted[offset]) & mask);
 }
 
 static const struct reset_control_ops jh7100_reset_ops = {
@@ -136,38 +103,29 @@ static const struct reset_control_ops jh7100_reset_ops = {
        .status         = jh7100_reset_status,
 };
 
-static int __init jh7100_reset_probe(struct platform_device *pdev)
+int reset_starfive_jh7100_register(struct device *dev, struct device_node *of_node,
+                                  void __iomem *assert, void __iomem *status,
+                                  const u64 *asserted, unsigned int nr_resets,
+                                  bool is_module)
 {
        struct jh7100_reset *data;
 
-       data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+       data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
-       data->base = devm_platform_ioremap_resource(pdev, 0);

drivers/reset/starfive/reset-starfive-jh71x0.c static const struct reset_control_ops jh7100_reset_ops = { · line 119

Quoted 10 lines
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +2 -7
-       if (IS_ERR(data->base))
-               return PTR_ERR(data->base);
-
        data->rcdev.ops = &jh7100_reset_ops;
-       data->rcdev.owner = THIS_MODULE;
-       data->rcdev.nr_resets = JH7100_RSTN_END;
-       data->rcdev.dev = &pdev->dev;
-       data->rcdev.of_node = pdev->dev.of_node;
+       if (is_module)
+               data->rcdev.owner = THIS_MODULE;

nit: consider just passing the owner directly, so this would just be data->rcdev.owner = owner;

..and callers that used false can just pass NULL.

drivers/reset/starfive/reset-starfive-jh71x0.c static const struct reset_control_ops jh7100_reset_ops = { · line 122

Quoted 3 lines
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +3 -0
+       data->rcdev.nr_resets = nr_resets;
+       data->rcdev.dev = dev;
+       data->rcdev.of_node = of_node;

Is it important to register this with the auxiliary device and not just use the parent device?
If not you can just always pass the device that has the right of_node and have this be

data->rcdev.of_node = dev->of_node;

Quoted 47 lines
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +6 -15
+
        spin_lock_init(&data->lock);
+       data->assert = assert;
+       data->status = status;
+       data->asserted = asserted;
 
-       return devm_reset_controller_register(&pdev->dev, &data->rcdev);
+       return devm_reset_controller_register(dev, &data->rcdev);
 }
-
-static const struct of_device_id jh7100_reset_dt_ids[] = {
-       { .compatible = "starfive,jh7100-reset" },
-       { /* sentinel */ }
-};
-
-static struct platform_driver jh7100_reset_driver = {
-       .driver = {
-               .name = "jh7100-reset",
-               .of_match_table = jh7100_reset_dt_ids,
-               .suppress_bind_attrs = true,
-       },
-};
-builtin_platform_driver_probe(jh7100_reset_driver, jh7100_reset_probe);
+EXPORT_SYMBOL_GPL(reset_starfive_jh7100_register);
drivers/reset/starfive/reset-starfive-jh71x0.h new file +14 -1
new file mode 100644
index 000000000000..10770c55ab0e
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2021 Emil Renner Berthing <[email protected]>
+ */
+
+#ifndef __RESET_STARFIVE_JH71X0_H
+#define __RESET_STARFIVE_JH71X0_H
+
+int reset_starfive_jh7100_register(struct device *dev, struct device_node *of_node,
+                                  void __iomem *assert, void __iomem *status,
+                                  const u64 *asserted, unsigned int nr_resets,
+                                  bool is_module);
+
+#endif /* __RESET_STARFIVE_JH71X0_H */
--

2.38.1

author maintainer
#13 lore raw

Re: [PATCH v2 04/14] reset: starfive: Factor out common JH71X0 reset code

Quoted 8 lines · Emil Renner Berthing
Quoted 7 lines · Hal Feng
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +0 -0
similarity index 50%
copy from drivers/reset/starfive/reset-starfive-jh7100.c
copy to drivers/reset/starfive/reset-starfive-jh71x0.c
index fc44b2fb3e03..1e230f3f9841 100644

[...]

Quoted 28 lines
Quoted 14 lines
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +5 -3
-static int __init jh7100_reset_probe(struct platform_device *pdev)
+int reset_starfive_jh7100_register(struct device *dev, struct device_node *of_node,
+                                  void __iomem *assert, void __iomem *status,
+                                  const u64 *asserted, unsigned int nr_resets,
+                                  bool is_module)
 {
        struct jh7100_reset *data;
 
-       data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+       data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
-       data->base = devm_platform_ioremap_resource(pdev, 0);

drivers/reset/starfive/reset-starfive-jh71x0.c static const struct reset_control_ops jh7100_reset_ops = { · line 119

Quoted 10 lines
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +2 -7
-       if (IS_ERR(data->base))
-               return PTR_ERR(data->base);
-
        data->rcdev.ops = &jh7100_reset_ops;
-       data->rcdev.owner = THIS_MODULE;
-       data->rcdev.nr_resets = JH7100_RSTN_END;
-       data->rcdev.dev = &pdev->dev;
-       data->rcdev.of_node = pdev->dev.of_node;
+       if (is_module)
+               data->rcdev.owner = THIS_MODULE;

nit: consider just passing the owner directly, so this would just be data->rcdev.owner = owner;

Quoted 1 line

..and callers that used false can just pass NULL.

Yeah, will fix it.

Quoted 7 lines

drivers/reset/starfive/reset-starfive-jh71x0.c static const struct reset_control_ops jh7100_reset_ops = { · line 122

Quoted 4 lines
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +3 -0
+       data->rcdev.nr_resets = nr_resets;
+       data->rcdev.dev = dev;
+       data->rcdev.of_node = of_node;

Is it important to register this with the auxiliary device and not just use the parent device?

I'm not sure whether it still works if we use the same device, but it's general to separate the devices of clock and reset. They have different device names and different drivers.

Best regards,
Hal

Quoted 14 lines

If not you can just always pass the device that has the right of_node and have this be

data->rcdev.of_node = dev->of_node;

Quoted 9 lines
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +5 -1
+
        spin_lock_init(&data->lock);
+       data->assert = assert;
+       data->status = status;
+       data->asserted = asserted;
 
-       return devm_reset_controller_register(&pdev->dev, &data->rcdev);
+       return devm_reset_controller_register(dev, &data->rcdev);
 }
#14 lore raw

Re: [PATCH v2 04/14] reset: starfive: Factor out common JH71X0 reset code

Quoted 46 lines · Hal Feng
Quoted 8 lines · Emil Renner Berthing
Quoted 7 lines · Hal Feng
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +0 -0
similarity index 50%
copy from drivers/reset/starfive/reset-starfive-jh7100.c
copy to drivers/reset/starfive/reset-starfive-jh71x0.c
index fc44b2fb3e03..1e230f3f9841 100644

[...]

Quoted 28 lines
Quoted 14 lines
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +5 -3
-static int __init jh7100_reset_probe(struct platform_device *pdev)
+int reset_starfive_jh7100_register(struct device *dev, struct device_node *of_node,
+                                  void __iomem *assert, void __iomem *status,
+                                  const u64 *asserted, unsigned int nr_resets,
+                                  bool is_module)
 {
        struct jh7100_reset *data;
 
-       data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+       data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
-       data->base = devm_platform_ioremap_resource(pdev, 0);

drivers/reset/starfive/reset-starfive-jh71x0.c static const struct reset_control_ops jh7100_reset_ops = { · line 119

Quoted 10 lines
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +2 -7
-       if (IS_ERR(data->base))
-               return PTR_ERR(data->base);
-
        data->rcdev.ops = &jh7100_reset_ops;
-       data->rcdev.owner = THIS_MODULE;
-       data->rcdev.nr_resets = JH7100_RSTN_END;
-       data->rcdev.dev = &pdev->dev;
-       data->rcdev.of_node = pdev->dev.of_node;
+       if (is_module)
+               data->rcdev.owner = THIS_MODULE;

nit: consider just passing the owner directly, so this would just be data->rcdev.owner = owner;

Quoted 1 line

..and callers that used false can just pass NULL.

Yeah, will fix it.

Quoted 1 line
Quoted 8 lines
Quoted 6 lines

drivers/reset/starfive/reset-starfive-jh71x0.c static const struct reset_control_ops jh7100_reset_ops = { · line 122

Quoted 3 lines
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +3 -0
+       data->rcdev.nr_resets = nr_resets;
+       data->rcdev.dev = dev;
+       data->rcdev.of_node = of_node;

Is it important to register this with the auxiliary device and not just use the parent device?

I'm not sure whether it still works if we use the same device,

Try it.

Quoted 4 lines

but
it's general to separate the devices of clock and reset. They have different device names and different drivers.

Quoted 18 lines

Best regards,
Hal

Quoted 14 lines

If not you can just always pass the device that has the right of_node and have this be

data->rcdev.of_node = dev->of_node;

Quoted 9 lines
drivers/reset/starfive/reset-starfive-jh71x0.c renamed from drivers/reset/starfive/reset-starfive-jh7100.c +5 -1
+
        spin_lock_init(&data->lock);
+       data->assert = assert;
+       data->status = status;
+       data->asserted = asserted;
 
-       return devm_reset_controller_register(&pdev->dev, &data->rcdev);
+       return devm_reset_controller_register(dev, &data->rcdev);
 }

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author maintainer
#15 lore raw

PATCH v2 5/14 reset: starfive: Rename "jh7100" to "jh71x0" for the common code

In reply to Hal Feng

For the common code will be shared with the StarFive JH7110 SoC.

---
 .../reset/starfive/reset-starfive-jh7100.c    |  2 +-
 .../reset/starfive/reset-starfive-jh71x0.c    | 50 +++++++++----------
 .../reset/starfive/reset-starfive-jh71x0.h    |  2 +-
 3 files changed, 27 insertions(+), 27 deletions(-)
drivers/reset/starfive/reset-starfive-jh7100.c +1 -1
index 43248e8135fd..4be8510f1dd9 100644
@@ -51,7 +51,7 @@ static int __init jh7100_reset_probe(struct platform_device *pdev)
 	if (IS_ERR(base))
 		return PTR_ERR(base);
 
-	return reset_starfive_jh7100_register(&pdev->dev, pdev->dev.of_node,
+	return reset_starfive_jh71x0_register(&pdev->dev, pdev->dev.of_node,
 					      base + JH7100_RESET_ASSERT0,
 					      base + JH7100_RESET_STATUS0,
 					      jh7100_reset_asserted,
drivers/reset/starfive/reset-starfive-jh71x0.c +25 -25

117 lines not on this page · raw message

drivers/reset/starfive/reset-starfive-jh71x0.h +1 -1
index 10770c55ab0e..3c70982dd56e 100644
@@ -6,7 +6,7 @@
 #ifndef __RESET_STARFIVE_JH71X0_H
 #define __RESET_STARFIVE_JH71X0_H
 
-int reset_starfive_jh7100_register(struct device *dev, struct device_node *of_node,
+int reset_starfive_jh71x0_register(struct device *dev, struct device_node *of_node,
 				   void __iomem *assert, void __iomem *status,
 				   const u64 *asserted, unsigned int nr_resets,
 				   bool is_module);
Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
author maintainer
#16 lore raw

PATCH v2 6/14 reset: starfive: jh71x0: Use 32bit I/O on 32bit registers

In reply to Hal Feng

From: Emil Renner Berthing <[email protected]>

We currently use 64bit I/O on the 32bit registers. This works because there are an even number of assert and status registers, so they're only ever accessed in pairs on 64bit boundaries.

There are however other reset controllers for audio and video on the JH7100 SoC with only one status register that isn't 64bit aligned so 64bit I/O results in an unaligned access exception.

Switch to 32bit I/O in preparation for supporting these resets too.

---
 .../reset/starfive/reset-starfive-jh7100.c    | 14 ++++-----
 .../reset/starfive/reset-starfive-jh71x0.c    | 31 +++++++++----------
 .../reset/starfive/reset-starfive-jh71x0.h    |  2 +-
 3 files changed, 23 insertions(+), 24 deletions(-)
drivers/reset/starfive/reset-starfive-jh7100.c +7 -7
index 4be8510f1dd9..42c0034d0b37 100644
@@ -30,16 +30,16 @@
  * lines don't though, so store the expected value of the status registers when
  * all lines are asserted.
  */
-static const u64 jh7100_reset_asserted[2] = {
+static const u32 jh7100_reset_asserted[4] = {
 	/* STATUS0 */
-	BIT_ULL_MASK(JH7100_RST_U74) |
-	BIT_ULL_MASK(JH7100_RST_VP6_DRESET) |
-	BIT_ULL_MASK(JH7100_RST_VP6_BRESET) |
+	BIT(JH7100_RST_U74 % 32) |
+	BIT(JH7100_RST_VP6_DRESET % 32) |
+	BIT(JH7100_RST_VP6_BRESET % 32),
 	/* STATUS1 */
-	BIT_ULL_MASK(JH7100_RST_HIFI4_DRESET) |
-	BIT_ULL_MASK(JH7100_RST_HIFI4_BRESET),
+	BIT(JH7100_RST_HIFI4_DRESET % 32) |
+	BIT(JH7100_RST_HIFI4_BRESET % 32),
 	/* STATUS2 */
-	BIT_ULL_MASK(JH7100_RST_E24) |
+	BIT(JH7100_RST_E24 % 32),
 	/* STATUS3 */
 	0,
 };
drivers/reset/starfive/reset-starfive-jh71x0.c +15 -16
index fa80912ef08e..8f3204273a0b 100644
@@ -8,7 +8,6 @@
 #include <linux/bitmap.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/io-64-nonatomic-lo-hi.h>
 #include <linux/iopoll.h>
 #include <linux/reset-controller.h>
 #include <linux/spinlock.h>
@@ -19,7 +18,7 @@ struct jh71x0_reset {
 	spinlock_t lock;
 	void __iomem *assert;
 	void __iomem *status;
-	const u64 *asserted;
+	const u32 *asserted;
 };
 
 static inline struct jh71x0_reset *
@@ -32,12 +31,12 @@ static int jh71x0_reset_update(struct reset_controller_dev *rcdev,
 			       unsigned long id, bool assert)
 {
 	struct jh71x0_reset *data = jh71x0_reset_from(rcdev);
-	unsigned long offset = BIT_ULL_WORD(id);
-	u64 mask = BIT_ULL_MASK(id);
-	void __iomem *reg_assert = data->assert + offset * sizeof(u64);
-	void __iomem *reg_status = data->status + offset * sizeof(u64);
-	u64 done = data->asserted ? data->asserted[offset] & mask : 0;
-	u64 value;
+	unsigned long offset = id / 32;
+	u32 mask = BIT(id % 32);
+	void __iomem *reg_assert = data->assert + offset * sizeof(u32);
+	void __iomem *reg_status = data->status + offset * sizeof(u32);
+	u32 done = data->asserted ? data->asserted[offset] & mask : 0;
+	u32 value;
 	unsigned long flags;
 	int ret;
 
@@ -46,15 +45,15 @@ static int jh71x0_reset_update(struct reset_controller_dev *rcdev,
 
 	spin_lock_irqsave(&data->lock, flags);
 
-	value = readq(reg_assert);
+	value = readl(reg_assert);
 	if (assert)
 		value |= mask;
 	else
 		value &= ~mask;
-	writeq(value, reg_assert);
+	writel(value, reg_assert);
 
 	/* if the associated clock is gated, deasserting might otherwise hang forever */
-	ret = readq_poll_timeout_atomic(reg_status, value, (value & mask) == done, 0, 1000);
+	ret = readl_poll_timeout_atomic(reg_status, value, (value & mask) == done, 0, 1000);
 
 	spin_unlock_irqrestore(&data->lock, flags);
 	return ret;
@@ -88,10 +87,10 @@ static int jh71x0_reset_status(struct reset_controller_dev *rcdev,
 			       unsigned long id)
 {
 	struct jh71x0_reset *data = jh71x0_reset_from(rcdev);
-	unsigned long offset = BIT_ULL_WORD(id);
-	u64 mask = BIT_ULL_MASK(id);
-	void __iomem *reg_status = data->status + offset * sizeof(u64);
-	u64 value = readq(reg_status);
+	unsigned long offset = id / 32;
+	u32 mask = BIT(id % 32);
+	void __iomem *reg_status = data->status + offset * sizeof(u32);
+	u32 value = readl(reg_status);
 
 	return !((value ^ data->asserted[offset]) & mask);
 }
@@ -105,7 +104,7 @@ static const struct reset_control_ops jh71x0_reset_ops = {
 
 int reset_starfive_jh71x0_register(struct device *dev, struct device_node *of_node,
 				   void __iomem *assert, void __iomem *status,
-				   const u64 *asserted, unsigned int nr_resets,
+				   const u32 *asserted, unsigned int nr_resets,
 				   bool is_module)
 {
 	struct jh71x0_reset *data;
drivers/reset/starfive/reset-starfive-jh71x0.h +1 -1
index 3c70982dd56e..e6b27110de48 100644
@@ -8,7 +8,7 @@
 
 int reset_starfive_jh71x0_register(struct device *dev, struct device_node *of_node,
 				   void __iomem *assert, void __iomem *status,
-				   const u64 *asserted, unsigned int nr_resets,
+				   const u32 *asserted, unsigned int nr_resets,
 				   bool is_module);
 
 #endif /* __RESET_STARFIVE_JH71X0_H */
Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
author maintainer
#17 lore raw

PATCH v2 7/14 dt-bindings: clock: Add StarFive JH7110 system and always-on clock definitions

In reply to Hal Feng

From: Emil Renner Berthing <[email protected]>

Add all clock outputs for the StarFive JH7110 system (SYS) and always-on (AON) clock generator.

---
 MAINTAINERS                                 |   5 +-
 include/dt-bindings/clock/starfive-jh7110.h | 234 ++++++++++++++++++++
 2 files changed, 237 insertions(+), 2 deletions(-)
 create mode 100644 include/dt-bindings/clock/starfive-jh7110.h
MAINTAINERS +3 -2
index e6f1060e7964..e97dac9c0ee4 100644
@@ -19598,12 +19598,13 @@ M:	Ion Badulescu <[email protected]>
 S:	Odd Fixes
 F:	drivers/net/ethernet/adaptec/starfire*
 
-STARFIVE JH7100 CLOCK DRIVERS
+STARFIVE CLOCK DRIVERS
 M:	Emil Renner Berthing <[email protected]>
+M:	Hal Feng <[email protected]>
 S:	Maintained
 F:	Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
 F:	drivers/clk/starfive/
-F:	include/dt-bindings/clock/starfive-jh7100*.h
+F:	include/dt-bindings/clock/starfive*
 
 STARFIVE JH7100 PINCTRL DRIVER
 M:	Emil Renner Berthing <[email protected]>
include/dt-bindings/clock/starfive-jh7110.h new file +234 -0

234 lines not on this page · raw message

Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#18 lore raw

Re: [PATCH v2 07/14] dt-bindings: clock: Add StarFive JH7110 system and always-on clock definitions

include/dt-bindings/clock/starfive-jh7110.h

Quoted 34 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add all clock outputs for the StarFive JH7110 system (SYS) and always-on (AON) clock generator.

---
 MAINTAINERS                                 |   5 +-
 include/dt-bindings/clock/starfive-jh7110.h | 234 ++++++++++++++++++++
 2 files changed, 237 insertions(+), 2 deletions(-)
 create mode 100644 include/dt-bindings/clock/starfive-jh7110.h
MAINTAINERS +3 -2
index e6f1060e7964..e97dac9c0ee4 100644
@@ -19598,12 +19598,13 @@ M:	Ion Badulescu <[email protected]>
 S:	Odd Fixes
 F:	drivers/net/ethernet/adaptec/starfire*
 
-STARFIVE JH7100 CLOCK DRIVERS
+STARFIVE CLOCK DRIVERS
 M:	Emil Renner Berthing <[email protected]>
+M:	Hal Feng <[email protected]>
 S:	Maintained
 F:	Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
 F:	drivers/clk/starfive/
-F:	include/dt-bindings/clock/starfive-jh7100*.h
+F:	include/dt-bindings/clock/starfive*
 
 STARFIVE JH7100 PINCTRL DRIVER
 M:	Emil Renner Berthing <[email protected]>
include/dt-bindings/clock/starfive-jh7110.h +0 -0

Filename based / the same as compatible (or bindings filename).

Best regards,
Krzysztof

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author maintainer
#19 lore raw

Re: [PATCH v2 07/14] dt-bindings: clock: Add StarFive JH7110 system and always-on clock definitions

Quoted 32 lines · Krzysztof Kozlowski
Quoted 31 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add all clock outputs for the StarFive JH7110 system (SYS) and always-on (AON) clock generator.

---
 MAINTAINERS                                 |   5 +-
 include/dt-bindings/clock/starfive-jh7110.h | 234 ++++++++++++++++++++
 2 files changed, 237 insertions(+), 2 deletions(-)
 create mode 100644 include/dt-bindings/clock/starfive-jh7110.h
MAINTAINERS +3 -2
index e6f1060e7964..e97dac9c0ee4 100644
@@ -19598,12 +19598,13 @@ M:	Ion Badulescu <[email protected]>
 S:	Odd Fixes
 F:	drivers/net/ethernet/adaptec/starfire*
 
-STARFIVE JH7100 CLOCK DRIVERS
+STARFIVE CLOCK DRIVERS
 M:	Emil Renner Berthing <[email protected]>
+M:	Hal Feng <[email protected]>
 S:	Maintained
 F:	Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
 F:	drivers/clk/starfive/
-F:	include/dt-bindings/clock/starfive-jh7100*.h
+F:	include/dt-bindings/clock/starfive*
 
Quoted 5 lines

include/dt-bindings/clock/starfive-jh7110.h

Quoted 3 lines
MAINTAINERS +0 -0
 STARFIVE JH7100 PINCTRL DRIVER
 M:	Emil Renner Berthing <[email protected]>
include/dt-bindings/clock/starfive-jh7110.h +0 -0

Filename based / the same as compatible (or bindings filename).

Should I split this file into two files for "SYSCRG" and "AONCRG", which maybe named as "starfive-jh7110-sys.h" and "starfive-jh7110-aon.h". Ditto for the patch 8.

Best regards,
Hal

#20 lore raw

Re: [PATCH v2 07/14] dt-bindings: clock: Add StarFive JH7110 system and always-on clock definitions

Quoted 39 lines · Hal Feng
Quoted 32 lines · Krzysztof Kozlowski
Quoted 31 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add all clock outputs for the StarFive JH7110 system (SYS) and always-on (AON) clock generator.

---
 MAINTAINERS                                 |   5 +-
 include/dt-bindings/clock/starfive-jh7110.h | 234 ++++++++++++++++++++
 2 files changed, 237 insertions(+), 2 deletions(-)
 create mode 100644 include/dt-bindings/clock/starfive-jh7110.h
MAINTAINERS +3 -2
index e6f1060e7964..e97dac9c0ee4 100644
@@ -19598,12 +19598,13 @@ M:	Ion Badulescu <[email protected]>
 S:	Odd Fixes
 F:	drivers/net/ethernet/adaptec/starfire*
 
-STARFIVE JH7100 CLOCK DRIVERS
+STARFIVE CLOCK DRIVERS
 M:	Emil Renner Berthing <[email protected]>
+M:	Hal Feng <[email protected]>
 S:	Maintained
 F:	Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
 F:	drivers/clk/starfive/
-F:	include/dt-bindings/clock/starfive-jh7100*.h
+F:	include/dt-bindings/clock/starfive*
 
Quoted 5 lines

include/dt-bindings/clock/starfive-jh7110.h

Quoted 3 lines
MAINTAINERS +0 -0
 STARFIVE JH7100 PINCTRL DRIVER
 M:	Emil Renner Berthing <[email protected]>
include/dt-bindings/clock/starfive-jh7110.h +0 -0

Filename based / the same as compatible (or bindings filename).

Quoted 3 lines

Should I split this file into two files for "SYSCRG" and "AONCRG", which maybe named as "starfive-jh7110-sys.h" and "starfive-jh7110-aon.h". Ditto for the patch 8.

Does not have to be, but anyway naming must follow compatible naming, so vendor,soc-device.

Best regards,
Krzysztof

author maintainer
#21 lore raw

Re: [PATCH v2 07/14] dt-bindings: clock: Add StarFive JH7110 system and always-on clock definitions

Quoted 40 lines · Krzysztof Kozlowski
Quoted 39 lines · Hal Feng
Quoted 37 lines · Krzysztof Kozlowski

include/dt-bindings/clock/starfive-jh7110.h

Quoted 34 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add all clock outputs for the StarFive JH7110 system (SYS) and always-on (AON) clock generator.

---
 MAINTAINERS                                 |   5 +-
 include/dt-bindings/clock/starfive-jh7110.h | 234 ++++++++++++++++++++
 2 files changed, 237 insertions(+), 2 deletions(-)
 create mode 100644 include/dt-bindings/clock/starfive-jh7110.h
MAINTAINERS +3 -2
index e6f1060e7964..e97dac9c0ee4 100644
@@ -19598,12 +19598,13 @@ M:	Ion Badulescu <[email protected]>
 S:	Odd Fixes
 F:	drivers/net/ethernet/adaptec/starfire*
 
-STARFIVE JH7100 CLOCK DRIVERS
+STARFIVE CLOCK DRIVERS
 M:	Emil Renner Berthing <[email protected]>
+M:	Hal Feng <[email protected]>
 S:	Maintained
 F:	Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
 F:	drivers/clk/starfive/
-F:	include/dt-bindings/clock/starfive-jh7100*.h
+F:	include/dt-bindings/clock/starfive*
 
 STARFIVE JH7100 PINCTRL DRIVER
 M:	Emil Renner Berthing <[email protected]>
include/dt-bindings/clock/starfive-jh7110.h +0 -0

Filename based / the same as compatible (or bindings filename).

Quoted 6 lines
Quoted 3 lines

Should I split this file into two files for "SYSCRG" and "AONCRG", which maybe named as "starfive-jh7110-sys.h" and "starfive-jh7110-aon.h". Ditto for the patch 8.

Does not have to be, but anyway naming must follow compatible naming, so vendor,soc-device.

Can I name it "starfive,jh7110-crg.h"? This file is included in starfive,jh7110-syscrg.yaml and starfive,jh7110-aoncrg.yaml.

Best regards,
Hal

#22 lore raw

Re: [PATCH v2 07/14] dt-bindings: clock: Add StarFive JH7110 system and always-on clock definitions

Quoted 11 lines · Hal Feng
Quoted 8 lines
Quoted 5 lines
Quoted 1 line

Filename based / the same as compatible (or bindings filename).

Should I split this file into two files for "SYSCRG" and "AONCRG", which maybe named as "starfive-jh7110-sys.h" and "starfive-jh7110-aon.h". Ditto for the patch 8.

Does not have to be, but anyway naming must follow compatible naming, so vendor,soc-device.

Can I name it "starfive,jh7110-crg.h"? This file is included in starfive,jh7110-syscrg.yaml and starfive,jh7110-aoncrg.yaml.

Sounds ok.

Best regards,
Krzysztof

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author maintainer
#23 lore raw

PATCH v2 8/14 dt-bindings: reset: Add StarFive JH7110 system and always-on reset definitions

In reply to Hal Feng

From: Emil Renner Berthing <[email protected]>

Add resets for the StarFive JH7110 system (SYS) and always-on (AON) reset controller.

---
 MAINTAINERS                                 |   5 +-
 include/dt-bindings/reset/starfive-jh7110.h | 154 ++++++++++++++++++++
 2 files changed, 157 insertions(+), 2 deletions(-)
 create mode 100644 include/dt-bindings/reset/starfive-jh7110.h
MAINTAINERS +3 -2
index e97dac9c0ee4..eeab26f5597c 100644
@@ -19614,12 +19614,13 @@ F:	Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
 F:	drivers/pinctrl/starfive/
 F:	include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
 
-STARFIVE JH7100 RESET CONTROLLER DRIVERS
+STARFIVE RESET CONTROLLER DRIVERS
 M:	Emil Renner Berthing <[email protected]>
+M:	Hal Feng <[email protected]>
 S:	Maintained
 F:	Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml
 F:	drivers/reset/starfive/
-F:	include/dt-bindings/reset/starfive-jh7100.h
+F:	include/dt-bindings/reset/starfive*
 
 STATIC BRANCH/CALL
 M:	Peter Zijlstra <[email protected]>
include/dt-bindings/reset/starfive-jh7110.h new file +154 -0

154 lines not on this page · raw message

Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#24 lore raw

Re: [PATCH v2 08/14] dt-bindings: reset: Add StarFive JH7110 system and always-on reset definitions

Quoted 40 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add resets for the StarFive JH7110 system (SYS) and always-on (AON) reset controller.

---
 MAINTAINERS                                 |   5 +-
 include/dt-bindings/reset/starfive-jh7110.h | 154 ++++++++++++++++++++
 2 files changed, 157 insertions(+), 2 deletions(-)
 create mode 100644 include/dt-bindings/reset/starfive-jh7110.h
MAINTAINERS +3 -2
index e97dac9c0ee4..eeab26f5597c 100644
@@ -19614,12 +19614,13 @@ F:    Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
 F:     drivers/pinctrl/starfive/
 F:     include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
 
-STARFIVE JH7100 RESET CONTROLLER DRIVERS
+STARFIVE RESET CONTROLLER DRIVERS
 M:     Emil Renner Berthing <[email protected]>
+M:     Hal Feng <[email protected]>
 S:     Maintained
 F:     Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml
 F:     drivers/reset/starfive/
-F:     include/dt-bindings/reset/starfive-jh7100.h
+F:     include/dt-bindings/reset/starfive*
 
 STATIC BRANCH/CALL
 M:     Peter Zijlstra <[email protected]>
include/dt-bindings/reset/starfive-jh7110.h new file +0 -0
new file mode 100644
index 000000000000..1a5bab671161

include/dt-bindings/reset/starfive-jh7110.h line 3

Quoted 3 lines
include/dt-bindings/reset/starfive-jh7110.h new file +3 -0
@@ -0,0 +1,154 @@
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/*
+ * Copyright (C) 2021-2022 Emil Renner Berthing <[email protected]>

I'm not sure how this ended up here, but I definitely didn't start working on this before 2022.

Quoted 154 lines
include/dt-bindings/reset/starfive-jh7110.h new file +151 -1
+ */
+
+#ifndef __DT_BINDINGS_RESET_STARFIVE_JH7110_H__
+#define __DT_BINDINGS_RESET_STARFIVE_JH7110_H__
+
+/* SYSCRG resets */
+#define JH7110_SYSRST_JTAG2APB                 0
+#define JH7110_SYSRST_SYSCON                   1
+#define JH7110_SYSRST_IOMUX                    2
+#define JH7110_SYSRST_BUS                      3
+#define JH7110_SYSRST_DEBUG                    4
+#define JH7110_SYSRST_CORE0                    5
+#define JH7110_SYSRST_CORE1                    6
+#define JH7110_SYSRST_CORE2                    7
+#define JH7110_SYSRST_CORE3                    8
+#define JH7110_SYSRST_CORE4                    9
+#define JH7110_SYSRST_CORE0_ST                 10
+#define JH7110_SYSRST_CORE1_ST                 11
+#define JH7110_SYSRST_CORE2_ST                 12
+#define JH7110_SYSRST_CORE3_ST                 13
+#define JH7110_SYSRST_CORE4_ST                 14
+#define JH7110_SYSRST_TRACE0                   15
+#define JH7110_SYSRST_TRACE1                   16
+#define JH7110_SYSRST_TRACE2                   17
+#define JH7110_SYSRST_TRACE3                   18
+#define JH7110_SYSRST_TRACE4                   19
+#define JH7110_SYSRST_TRACE_COM                        20
+#define JH7110_SYSRST_GPU_APB                  21
+#define JH7110_SYSRST_GPU_DOMA                 22
+#define JH7110_SYSRST_NOC_BUS_APB_BUS          23
+#define JH7110_SYSRST_NOC_BUS_AXICFG0_AXI      24
+#define JH7110_SYSRST_NOC_BUS_CPU_AXI          25
+#define JH7110_SYSRST_NOC_BUS_DISP_AXI         26
+#define JH7110_SYSRST_NOC_BUS_GPU_AXI          27
+#define JH7110_SYSRST_NOC_BUS_ISP_AXI          28
+#define JH7110_SYSRST_NOC_BUS_DDRC             29
+#define JH7110_SYSRST_NOC_BUS_STG_AXI          30
+#define JH7110_SYSRST_NOC_BUS_VDEC_AXI         31
+
+#define JH7110_SYSRST_NOC_BUS_VENC_AXI         32
+#define JH7110_SYSRST_AXI_CFG1_DEC_AHB         33
+#define JH7110_SYSRST_AXI_CFG1_DEC_MAIN                34
+#define JH7110_SYSRST_AXI_CFG0_DEC_MAIN                35
+#define JH7110_SYSRST_AXI_CFG0_DEC_MAIN_DIV    36
+#define JH7110_SYSRST_AXI_CFG0_DEC_HIFI4       37
+#define JH7110_SYSRST_DDR_AXI                  38
+#define JH7110_SYSRST_DDR_OSC                  39
+#define JH7110_SYSRST_DDR_APB                  40
+#define JH7110_SYSRST_DOM_ISP_TOP_N            41
+#define JH7110_SYSRST_DOM_ISP_TOP_AXI          42
+#define JH7110_SYSRST_DOM_VOUT_TOP_SRC         43
+#define JH7110_SYSRST_CODAJ12_AXI              44
+#define JH7110_SYSRST_CODAJ12_CORE             45
+#define JH7110_SYSRST_CODAJ12_APB              46
+#define JH7110_SYSRST_WAVE511_AXI              47
+#define JH7110_SYSRST_WAVE511_BPU              48
+#define JH7110_SYSRST_WAVE511_VCE              49
+#define JH7110_SYSRST_WAVE511_APB              50
+#define JH7110_SYSRST_VDEC_JPG_ARB_JPG         51
+#define JH7110_SYSRST_VDEC_JPG_ARB_MAIN                52
+#define JH7110_SYSRST_AXIMEM0_AXI              53
+#define JH7110_SYSRST_WAVE420L_AXI             54
+#define JH7110_SYSRST_WAVE420L_BPU             55
+#define JH7110_SYSRST_WAVE420L_VCE             56
+#define JH7110_SYSRST_WAVE420L_APB             57
+#define JH7110_SYSRST_AXIMEM1_AXI              58
+#define JH7110_SYSRST_AXIMEM2_AXI              59
+#define JH7110_SYSRST_INTMEM                   60
+#define JH7110_SYSRST_QSPI_AHB                 61
+#define JH7110_SYSRST_QSPI_APB                 62
+#define JH7110_SYSRST_QSPI_REF                 63
+
+#define JH7110_SYSRST_SDIO0_AHB                        64
+#define JH7110_SYSRST_SDIO1_AHB                        65
+#define JH7110_SYSRST_GMAC1_AXI                        66
+#define JH7110_SYSRST_GMAC1_AHB                        67
+#define JH7110_SYSRST_MAILBOX                  68
+#define JH7110_SYSRST_SPI0_APB                 69
+#define JH7110_SYSRST_SPI1_APB                 70
+#define JH7110_SYSRST_SPI2_APB                 71
+#define JH7110_SYSRST_SPI3_APB                 72
+#define JH7110_SYSRST_SPI4_APB                 73
+#define JH7110_SYSRST_SPI5_APB                 74
+#define JH7110_SYSRST_SPI6_APB                 75
+#define JH7110_SYSRST_I2C0_APB                 76
+#define JH7110_SYSRST_I2C1_APB                 77
+#define JH7110_SYSRST_I2C2_APB                 78
+#define JH7110_SYSRST_I2C3_APB                 79
+#define JH7110_SYSRST_I2C4_APB                 80
+#define JH7110_SYSRST_I2C5_APB                 81
+#define JH7110_SYSRST_I2C6_APB                 82
+#define JH7110_SYSRST_UART0_APB                        83
+#define JH7110_SYSRST_UART0_CORE               84
+#define JH7110_SYSRST_UART1_APB                        85
+#define JH7110_SYSRST_UART1_CORE               86
+#define JH7110_SYSRST_UART2_APB                        87
+#define JH7110_SYSRST_UART2_CORE               88
+#define JH7110_SYSRST_UART3_APB                        89
+#define JH7110_SYSRST_UART3_CORE               90
+#define JH7110_SYSRST_UART4_APB                        91
+#define JH7110_SYSRST_UART4_CORE               92
+#define JH7110_SYSRST_UART5_APB                        93
+#define JH7110_SYSRST_UART5_CORE               94
+#define JH7110_SYSRST_SPDIF_APB                        95
+
+#define JH7110_SYSRST_PWMDAC_APB               96
+#define JH7110_SYSRST_PDM_DMIC                 97
+#define JH7110_SYSRST_PDM_APB                  98
+#define JH7110_SYSRST_I2SRX_APB                        99
+#define JH7110_SYSRST_I2SRX_BCLK               100
+#define JH7110_SYSRST_I2STX0_APB               101
+#define JH7110_SYSRST_I2STX0_BCLK              102
+#define JH7110_SYSRST_I2STX1_APB               103
+#define JH7110_SYSRST_I2STX1_BCLK              104
+#define JH7110_SYSRST_TDM_AHB                  105
+#define JH7110_SYSRST_TDM_CORE                 106
+#define JH7110_SYSRST_TDM_APB                  107
+#define JH7110_SYSRST_PWM_APB                  108
+#define JH7110_SYSRST_WDT_APB                  109
+#define JH7110_SYSRST_WDT_CORE                 110
+#define JH7110_SYSRST_CAN0_APB                 111
+#define JH7110_SYSRST_CAN0_CORE                        112
+#define JH7110_SYSRST_CAN0_TIMER               113
+#define JH7110_SYSRST_CAN1_APB                 114
+#define JH7110_SYSRST_CAN1_CORE                        115
+#define JH7110_SYSRST_CAN1_TIMER               116
+#define JH7110_SYSRST_TIMER_APB                        117
+#define JH7110_SYSRST_TIMER0                   118
+#define JH7110_SYSRST_TIMER1                   119
+#define JH7110_SYSRST_TIMER2                   120
+#define JH7110_SYSRST_TIMER3                   121
+#define JH7110_SYSRST_INT_CTRL_APB             122
+#define JH7110_SYSRST_TEMP_APB                 123
+#define JH7110_SYSRST_TEMP_CORE                        124
+#define JH7110_SYSRST_JTAG_CERTIFICATION       125
+
+#define        JH7110_SYSRST_END                       126
+
+/* AONCRG resets */
+#define JH7110_AONRST_GMAC0_AXI                        0
+#define JH7110_AONRST_GMAC0_AHB                        1
+#define JH7110_AONRST_AON_IOMUX                        2
+#define JH7110_AONRST_PMU_APB                  3
+#define JH7110_AONRST_PMU_WKUP                 4
+#define JH7110_AONRST_RTC_APB                  5
+#define JH7110_AONRST_RTC_CAL                  6
+#define JH7110_AONRST_RTC_32K                  7
+
+#define        JH7110_AONRST_END                       8
+
+#endif /* __DT_BINDINGS_RESET_STARFIVE_JH7110_H__ */
--

2.38.1

author maintainer
#25 lore raw

Re: [PATCH v2 08/14] dt-bindings: reset: Add StarFive JH7110 system and always-on reset definitions

Quoted 13 lines · Emil Renner Berthing

include/dt-bindings/reset/starfive-jh7110.h line 3

Quoted 9 lines · Hal Feng
include/dt-bindings/reset/starfive-jh7110.h new file +3 -0
new file mode 100644
index 000000000000..1a5bab671161
@@ -0,0 +1,154 @@
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/*
+ * Copyright (C) 2021-2022 Emil Renner Berthing <[email protected]>

I'm not sure how this ended up here, but I definitely didn't start working on this before 2022.

I just cherry-picked your commit. And I found the same problem in your latest branch. Anyway, I will fix it.

Best regards,
Hal

#26 lore raw

Re: [PATCH v2 08/14] dt-bindings: reset: Add StarFive JH7110 system and always-on reset definitions

In reply to Hal Feng

include/dt-bindings/reset/starfive-jh7110.h

Quoted 34 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add resets for the StarFive JH7110 system (SYS) and always-on (AON) reset controller.

---
 MAINTAINERS                                 |   5 +-
 include/dt-bindings/reset/starfive-jh7110.h | 154 ++++++++++++++++++++
 2 files changed, 157 insertions(+), 2 deletions(-)
 create mode 100644 include/dt-bindings/reset/starfive-jh7110.h
MAINTAINERS +3 -2
index e97dac9c0ee4..eeab26f5597c 100644
@@ -19614,12 +19614,13 @@ F:	Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
 F:	drivers/pinctrl/starfive/
 F:	include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
 
-STARFIVE JH7100 RESET CONTROLLER DRIVERS
+STARFIVE RESET CONTROLLER DRIVERS
 M:	Emil Renner Berthing <[email protected]>
+M:	Hal Feng <[email protected]>
 S:	Maintained
 F:	Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml
 F:	drivers/reset/starfive/
-F:	include/dt-bindings/reset/starfive-jh7100.h
+F:	include/dt-bindings/reset/starfive*
 
 STATIC BRANCH/CALL
 M:	Peter Zijlstra <[email protected]>
include/dt-bindings/reset/starfive-jh7110.h +0 -0

Filename based / the same as compatible (or bindings filename).

Best regards,
Krzysztof

#27 lore raw

Re: [PATCH v2 08/14] dt-bindings: reset: Add StarFive JH7110 system and always-on reset definitions

In reply to Hal Feng
Quoted 5 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add resets for the StarFive JH7110 system (SYS) and always-on (AON) reset controller.

Quoted 8 lines
---
 MAINTAINERS                                 |   5 +-
 include/dt-bindings/reset/starfive-jh7110.h | 154 ++++++++++++++++++++
 2 files changed, 157 insertions(+), 2 deletions(-)
 create mode 100644 include/dt-bindings/reset/starfive-jh7110.h

Thank you for your patch. There is something to discuss/improve.

include/dt-bindings/reset/starfive-jh7110.h line 140

Quoted 10 lines
include/dt-bindings/reset/starfive-jh7110.h new file +10 -0
+#define JH7110_SYSRST_TIMER0			118
+#define JH7110_SYSRST_TIMER1			119
+#define JH7110_SYSRST_TIMER2			120
+#define JH7110_SYSRST_TIMER3			121
+#define JH7110_SYSRST_INT_CTRL_APB		122
+#define JH7110_SYSRST_TEMP_APB			123
+#define JH7110_SYSRST_TEMP_CORE			124
+#define JH7110_SYSRST_JTAG_CERTIFICATION	125
+
+#define	JH7110_SYSRST_END			126

Drop weird indentation in the middle of syntax.

include/dt-bindings/reset/starfive-jh7110.h line 152

Quoted 12 lines
include/dt-bindings/reset/starfive-jh7110.h new file +12 -0
+
+/* AONCRG resets */
+#define JH7110_AONRST_GMAC0_AXI			0
+#define JH7110_AONRST_GMAC0_AHB			1
+#define JH7110_AONRST_AON_IOMUX			2
+#define JH7110_AONRST_PMU_APB			3
+#define JH7110_AONRST_PMU_WKUP			4
+#define JH7110_AONRST_RTC_APB			5
+#define JH7110_AONRST_RTC_CAL			6
+#define JH7110_AONRST_RTC_32K			7
+
+#define	JH7110_AONRST_END			8

Ditto

Review

Quoted 2 lines
(quoted diff) +2 -0
+
+#endif /* __DT_BINDINGS_RESET_STARFIVE_JH7110_H__ */

Best regards,
Krzysztof

author maintainer
#28 lore raw

Re: [PATCH v2 08/14] dt-bindings: reset: Add StarFive JH7110 system and always-on reset definitions

Quoted 17 lines · Krzysztof Kozlowski
Quoted 5 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add resets for the StarFive JH7110 system (SYS) and always-on (AON) reset controller.

Quoted 8 lines
---
 MAINTAINERS                                 |   5 +-
 include/dt-bindings/reset/starfive-jh7110.h | 154 ++++++++++++++++++++
 2 files changed, 157 insertions(+), 2 deletions(-)
 create mode 100644 include/dt-bindings/reset/starfive-jh7110.h

Thank you for your patch. There is something to discuss/improve.

Quoted 12 lines

include/dt-bindings/reset/starfive-jh7110.h line 140

Quoted 10 lines
include/dt-bindings/reset/starfive-jh7110.h new file +10 -0
+#define JH7110_SYSRST_TIMER0			118
+#define JH7110_SYSRST_TIMER1			119
+#define JH7110_SYSRST_TIMER2			120
+#define JH7110_SYSRST_TIMER3			121
+#define JH7110_SYSRST_INT_CTRL_APB		122
+#define JH7110_SYSRST_TEMP_APB			123
+#define JH7110_SYSRST_TEMP_CORE			124
+#define JH7110_SYSRST_JTAG_CERTIFICATION	125
+
+#define	JH7110_SYSRST_END			126

Drop weird indentation in the middle of syntax.

Will fix it.

Quoted 15 lines

include/dt-bindings/reset/starfive-jh7110.h line 152

Quoted 13 lines
include/dt-bindings/reset/starfive-jh7110.h new file +12 -0
+
+/* AONCRG resets */
+#define JH7110_AONRST_GMAC0_AXI			0
+#define JH7110_AONRST_GMAC0_AHB			1
+#define JH7110_AONRST_AON_IOMUX			2
+#define JH7110_AONRST_PMU_APB			3
+#define JH7110_AONRST_PMU_WKUP			4
+#define JH7110_AONRST_RTC_APB			5
+#define JH7110_AONRST_RTC_CAL			6
+#define JH7110_AONRST_RTC_32K			7
+
+#define	JH7110_AONRST_END			8

Ditto

Will fix it. Thanks.

Best regards,
Hal

author maintainer
#29 lore raw

PATCH v2 9/14 dt-bindings: clock: Add StarFive JH7110 system clock and reset generator

In reply to Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the system clock and reset generator (SYSCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

---
 .../clock/starfive,jh7110-syscrg.yaml         | 80 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml
Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml new file +80 -0
new file mode 100644
index 000000000000..a8cafbc0afe2
@@ -0,0 +1,80 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/starfive,jh7110-syscrg.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: StarFive JH7110 System Clock and Reset Generator
+
+maintainers:
+  - Emil Renner Berthing <[email protected]>
+
+properties:
+  compatible:
+    const: starfive,jh7110-syscrg
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: Main Oscillator (24 MHz)
+      - description: RMII reference clock
+      - description: RGMII RX clock
+      - description: I2S TX bit clock
+      - description: I2S TX left/right clock
+      - description: I2S RX bit clock
+      - description: I2S RX left/right clock
+      - description: TDM
+      - description: mclk
+
+  clock-names:
+    items:
+      - const: osc
+      - const: gmac1_rmii_refin
+      - const: gmac1_rgmii_rxin
+      - const: i2stx_bclk_ext
+      - const: i2stx_lrck_ext
+      - const: i2srx_bclk_ext
+      - const: i2srx_lrck_ext
+      - const: tdm_ext
+      - const: mclk_ext
+
+  '#clock-cells':
+    const: 1
+    description:
+      See <dt-bindings/clock/starfive-jh7110.h> for valid indices.
+
+  '#reset-cells':
+    const: 1
+    description:
+      See <dt-bindings/reset/starfive-jh7110.h> for valid indices.
+
+required:
+  - compatible
+  - reg
+  - clocks
+  - clock-names
+  - '#clock-cells'
+  - '#reset-cells'
+
+additionalProperties: false
+
+examples:
+  - |
+    clock-controller@13020000 {
+        compatible = "starfive,jh7110-syscrg";
+        reg = <0x13020000 0x10000>;
+        clocks = <&osc>, <&gmac1_rmii_refin>,
+                 <&gmac1_rgmii_rxin>,
+                 <&i2stx_bclk_ext>, <&i2stx_lrck_ext>,
+                 <&i2srx_bclk_ext>, <&i2srx_lrck_ext>,
+                 <&tdm_ext>, <&mclk_ext>;
+        clock-names = "osc", "gmac1_rmii_refin",
+                      "gmac1_rgmii_rxin",
+                      "i2stx_bclk_ext", "i2stx_lrck_ext",
+                      "i2srx_bclk_ext", "i2srx_lrck_ext",
+                      "tdm_ext", "mclk_ext";
+        #clock-cells = <1>;
+        #reset-cells = <1>;
+    };
MAINTAINERS +1 -1
index eeab26f5597c..ec6647e2772f 100644
@@ -19602,7 +19602,7 @@ STARFIVE CLOCK DRIVERS
 M:	Emil Renner Berthing <[email protected]>
 M:	Hal Feng <[email protected]>
 S:	Maintained
-F:	Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
+F:	Documentation/devicetree/bindings/clock/starfive*
 F:	drivers/clk/starfive/
 F:	include/dt-bindings/clock/starfive*
 
Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#30 lore raw

Re: [PATCH v2 09/14] dt-bindings: clock: Add StarFive JH7110 system clock and reset generator

Quoted 39 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the system clock and reset generator (SYSCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

---
 .../clock/starfive,jh7110-syscrg.yaml         | 80 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml
Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml new file +19 -0
new file mode 100644
index 000000000000..a8cafbc0afe2
@@ -0,0 +1,80 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/starfive,jh7110-syscrg.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: StarFive JH7110 System Clock and Reset Generator
+
+maintainers:
+  - Emil Renner Berthing <[email protected]>
+
+properties:
+  compatible:
+    const: starfive,jh7110-syscrg
+
+  reg:
+    maxItems: 1
+
+  clocks:

Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml line 29

Quoted 10 lines
Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml new file +10 -0
+    items:
+      - description: Main Oscillator (24 MHz)
+      - description: RMII reference clock
+      - description: RGMII RX clock
+      - description: I2S TX bit clock
+      - description: I2S TX left/right clock
+      - description: I2S RX bit clock
+      - description: I2S RX left/right clock
+      - description: TDM
+      - description: mclk

Maybe you could ask your colleagues for a better description of these clocks.

Quoted 67 lines
Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml new file +51 -0
+
+  clock-names:
+    items:
+      - const: osc
+      - const: gmac1_rmii_refin
+      - const: gmac1_rgmii_rxin
+      - const: i2stx_bclk_ext
+      - const: i2stx_lrck_ext
+      - const: i2srx_bclk_ext
+      - const: i2srx_lrck_ext
+      - const: tdm_ext
+      - const: mclk_ext
+
+  '#clock-cells':
+    const: 1
+    description:
+      See <dt-bindings/clock/starfive-jh7110.h> for valid indices.
+
+  '#reset-cells':
+    const: 1
+    description:
+      See <dt-bindings/reset/starfive-jh7110.h> for valid indices.
+
+required:
+  - compatible
+  - reg
+  - clocks
+  - clock-names
+  - '#clock-cells'
+  - '#reset-cells'
+
+additionalProperties: false
+
+examples:
+  - |
+    clock-controller@13020000 {
+        compatible = "starfive,jh7110-syscrg";
+        reg = <0x13020000 0x10000>;
+        clocks = <&osc>, <&gmac1_rmii_refin>,
+                 <&gmac1_rgmii_rxin>,
+                 <&i2stx_bclk_ext>, <&i2stx_lrck_ext>,
+                 <&i2srx_bclk_ext>, <&i2srx_lrck_ext>,
+                 <&tdm_ext>, <&mclk_ext>;
+        clock-names = "osc", "gmac1_rmii_refin",
+                      "gmac1_rgmii_rxin",
+                      "i2stx_bclk_ext", "i2stx_lrck_ext",
+                      "i2srx_bclk_ext", "i2srx_lrck_ext",
+                      "tdm_ext", "mclk_ext";
+        #clock-cells = <1>;
+        #reset-cells = <1>;
+    };
MAINTAINERS +1 -2
index eeab26f5597c..ec6647e2772f 100644
@@ -19602,7 +19602,7 @@ STARFIVE CLOCK DRIVERS
 M:     Emil Renner Berthing <[email protected]>
 M:     Hal Feng <[email protected]>
 S:     Maintained
-F:     Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
+F:     Documentation/devicetree/bindings/clock/starfive*
 F:     drivers/clk/starfive/
 F:     include/dt-bindings/clock/starfive*
 
--

2.38.1

#31 lore raw

Re: [PATCH v2 09/14] dt-bindings: clock: Add StarFive JH7110 system clock and reset generator

Quoted 44 lines · Emil Renner Berthing
Quoted 43 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the system clock and reset generator (SYSCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

---
 .../clock/starfive,jh7110-syscrg.yaml         | 80 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml
Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml new file +23 -0
new file mode 100644
index 000000000000..a8cafbc0afe2
@@ -0,0 +1,80 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/starfive,jh7110-syscrg.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: StarFive JH7110 System Clock and Reset Generator
+
+maintainers:
+  - Emil Renner Berthing <[email protected]>
+
+properties:
+  compatible:
+    const: starfive,jh7110-syscrg
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: Main Oscillator (24 MHz)
+      - description: RMII reference clock
+      - description: RGMII RX clock
Quoted 8 lines

Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml line 29

Quoted 6 lines
Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml new file +6 -0
+      - description: I2S TX bit clock
+      - description: I2S TX left/right clock
+      - description: I2S RX bit clock
+      - description: I2S RX left/right clock
+      - description: TDM
+      - description: mclk

Maybe you could ask your colleagues for a better description of these clocks.

And drop "clock" from previous descriptions. All these are clocks, so no need to repeat it.

Best regards,
Krzysztof

author maintainer
#32 lore raw

Re: [PATCH v2 09/14] dt-bindings: clock: Add StarFive JH7110 system clock and reset generator

In reply to Emil Renner Berthing
Quoted 30 lines · Emil Renner Berthing
Quoted 29 lines · Hal Feng
Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml new file +23 -0
new file mode 100644
index 000000000000..a8cafbc0afe2
@@ -0,0 +1,80 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/starfive,jh7110-syscrg.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: StarFive JH7110 System Clock and Reset Generator
+
+maintainers:
+  - Emil Renner Berthing <[email protected]>
+
+properties:
+  compatible:
+    const: starfive,jh7110-syscrg
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: Main Oscillator (24 MHz)
+      - description: RMII reference clock
+      - description: RGMII RX clock
Quoted 8 lines

Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml line 29

Quoted 6 lines
Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml new file +6 -0
+      - description: I2S TX bit clock
+      - description: I2S TX left/right clock
+      - description: I2S RX bit clock
+      - description: I2S RX left/right clock
+      - description: TDM
+      - description: mclk

Maybe you could ask your colleagues for a better description of these clocks.

OK, I will improve the description.

Best regards,
Hal

#33 lore raw

Re: [PATCH v2 09/14] dt-bindings: clock: Add StarFive JH7110 system clock and reset generator

In reply to Hal Feng
Quoted 7 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the system clock and reset generator (SYSCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

Binding headers are coming with the file bringing bindings for the device, so you need to squash patches.

Quoted 48 lines
---
 .../clock/starfive,jh7110-syscrg.yaml         | 80 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml
Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml new file +36 -0
new file mode 100644
index 000000000000..a8cafbc0afe2
@@ -0,0 +1,80 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/starfive,jh7110-syscrg.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: StarFive JH7110 System Clock and Reset Generator
+
+maintainers:
+  - Emil Renner Berthing <[email protected]>
+
+properties:
+  compatible:
+    const: starfive,jh7110-syscrg
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: Main Oscillator (24 MHz)
+      - description: RMII reference clock
+      - description: RGMII RX clock
+      - description: I2S TX bit clock
+      - description: I2S TX left/right clock
+      - description: I2S RX bit clock
+      - description: I2S RX left/right clock
+      - description: TDM
+      - description: mclk
+
+  clock-names:
+    items:
+      - const: osc
+      - const: gmac1_rmii_refin
+      - const: gmac1_rgmii_rxin
+      - const: i2stx_bclk_ext

Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml line 46

Quoted 10 lines
Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml new file +10 -0
+      - const: i2stx_lrck_ext
+      - const: i2srx_bclk_ext
+      - const: i2srx_lrck_ext
+      - const: tdm_ext
+      - const: mclk_ext
+
+  '#clock-cells':
+    const: 1
+    description:
+      See <dt-bindings/clock/starfive-jh7110.h> for valid indices.

Fix filename.

Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml line 51

Quoted 5 lines
Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml new file +5 -0
+
+  '#reset-cells':
+    const: 1
+    description:
+      See <dt-bindings/reset/starfive-jh7110.h> for valid indices.

Fix filename.

Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml line 60

Quoted 9 lines
Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml new file +9 -0
+
+required:
+  - compatible
+  - reg
+  - clocks
+  - clock-names
+  - '#clock-cells'
+  - '#reset-cells'
+

Best regards,
Krzysztof

author maintainer
#34 lore raw

Re: [PATCH v2 09/14] dt-bindings: clock: Add StarFive JH7110 system clock and reset generator

Quoted 11 lines · Krzysztof Kozlowski
Quoted 7 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the system clock and reset generator (SYSCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

Binding headers are coming with the file bringing bindings for the device, so you need to squash patches.

As we discussed in patch 7, could I merge patch 7, 8, 9, 10 and add the following files in one commit?

include/dt-bindings/clock/starfive,jh7110-crg.h include/dt-bindings/reset/starfive,jh7110-crg.h Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml

Best regards,
Hal

Quoted 6 lines
Quoted 6 lines
---
 .../clock/starfive,jh7110-syscrg.yaml         | 80 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author maintainer
#35 lore raw

Re: [PATCH v2 09/14] dt-bindings: clock: Add StarFive JH7110 system clock and reset generator

Quoted 13 lines · Hal Feng
Quoted 11 lines · Krzysztof Kozlowski
Quoted 7 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the system clock and reset generator (SYSCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

Binding headers are coming with the file bringing bindings for the device, so you need to squash patches.

Quoted 7 lines

As we discussed in patch 7, could I merge patch 7, 8, 9, 10 and add the following files in one commit?

include/dt-bindings/clock/starfive,jh7110-crg.h include/dt-bindings/reset/starfive,jh7110-crg.h Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml

Hi, Krzysztof,

Could you please give me some suggestions?

Best regards,
Hal

Quoted 8 lines
Quoted 7 lines
Quoted 7 lines

---
 .../clock/starfive,jh7110-syscrg.yaml         | 80 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml
#36 lore raw

Re: [PATCH v2 09/14] dt-bindings: clock: Add StarFive JH7110 system clock and reset generator

Quoted 17 lines · Hal Feng
Quoted 16 lines · Hal Feng
Quoted 11 lines · Krzysztof Kozlowski
Quoted 7 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the system clock and reset generator (SYSCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

Binding headers are coming with the file bringing bindings for the device, so you need to squash patches.

As we discussed in patch 7, could I merge patch 7, 8, 9, 10 and add the following files in one commit?

Quoted 8 lines
Quoted 4 lines

include/dt-bindings/clock/starfive,jh7110-crg.h include/dt-bindings/reset/starfive,jh7110-crg.h Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml

Hi, Krzysztof,

Could you please give me some suggestions?

You can keep aon and sys split. First add one of them with their own headers. Then add second with their own defines.

Best regards,
Krzysztof

author maintainer
#37 lore raw

Re: [PATCH v2 09/14] dt-bindings: clock: Add StarFive JH7110 system clock and reset generator

Quoted 23 lines · Krzysztof Kozlowski
Quoted 22 lines · Hal Feng
Quoted 20 lines · Hal Feng
Quoted 11 lines · Krzysztof Kozlowski
Quoted 7 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the system clock and reset generator (SYSCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

Binding headers are coming with the file bringing bindings for the device, so you need to squash patches.

As we discussed in patch 7, could I merge patch 7, 8, 9, 10 and add the following files in one commit?

include/dt-bindings/clock/starfive,jh7110-crg.h include/dt-bindings/reset/starfive,jh7110-crg.h Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml

Quoted 6 lines
Quoted 3 lines

Hi, Krzysztof,

Could you please give me some suggestions?

You can keep aon and sys split. First add one of them with their own headers. Then add second with their own defines.

You mean split patch 7 and patch 8 into sys part and aon part respectively? There are totally five regions (sys/aon/stg/isp/vout) for clocks and resets in JH7110. If we do that, there will be 5 headers for JH7110 in either clock or reset directory finally. Is that OK if there are too many headers for just one SoC?

Best regards,
Hal

#38 lore raw

Re: [PATCH v2 09/14] dt-bindings: clock: Add StarFive JH7110 system clock and reset generator

Quoted 28 lines · Hal Feng
Quoted 27 lines · Krzysztof Kozlowski
Quoted 25 lines · Hal Feng
Quoted 13 lines · Hal Feng
Quoted 11 lines · Krzysztof Kozlowski
Quoted 7 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the system clock and reset generator (SYSCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

Binding headers are coming with the file bringing bindings for the device, so you need to squash patches.

Quoted 7 lines

As we discussed in patch 7, could I merge patch 7, 8, 9, 10 and add the following files in one commit?

include/dt-bindings/clock/starfive,jh7110-crg.h include/dt-bindings/reset/starfive,jh7110-crg.h Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml

Hi, Krzysztof,

Could you please give me some suggestions?

Quoted 8 lines
Quoted 2 lines

You can keep aon and sys split. First add one of them with their own headers. Then add second with their own defines.

You mean split patch 7 and patch 8 into sys part and aon part respectively? There are totally five regions (sys/aon/stg/isp/vout) for clocks and resets in JH7110. If we do that, there will be 5 headers for JH7110 in either clock or reset directory finally. Is that OK if there are too many headers for just one SoC?

Sorry, I lost the track of what patches you have. The comment was - bindings include both the doc and headers. You want to split some, some merge, sorry, no clue. I did not propose splitting headers...

Best regards,
Krzysztof

author maintainer
#39 lore raw

Re: [PATCH v2 09/14] dt-bindings: clock: Add StarFive JH7110 system clock and reset generator

Quoted 39 lines · Krzysztof Kozlowski
Quoted 28 lines · Hal Feng
Quoted 27 lines · Krzysztof Kozlowski
Quoted 25 lines · Hal Feng
Quoted 13 lines · Hal Feng
Quoted 11 lines · Krzysztof Kozlowski
Quoted 7 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the system clock and reset generator (SYSCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

Binding headers are coming with the file bringing bindings for the device, so you need to squash patches.

Quoted 7 lines

As we discussed in patch 7, could I merge patch 7, 8, 9, 10 and add the following files in one commit?

include/dt-bindings/clock/starfive,jh7110-crg.h include/dt-bindings/reset/starfive,jh7110-crg.h Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml

Hi, Krzysztof,

Could you please give me some suggestions?

Quoted 8 lines
Quoted 2 lines

You can keep aon and sys split. First add one of them with their own headers. Then add second with their own defines.

You mean split patch 7 and patch 8 into sys part and aon part respectively? There are totally five regions (sys/aon/stg/isp/vout) for clocks and resets in JH7110. If we do that, there will be 5 headers for JH7110 in either clock or reset directory finally. Is that OK if there are too many headers for just one SoC?

Quoted 3 lines

Sorry, I lost the track of what patches you have. The comment was - bindings include both the doc and headers. You want to split some, some merge, sorry, no clue. I did not propose splitting headers...

It's ok. The problem was that the header

include/dt-bindings/clock/starfive,jh7110-crg.h

was used in both

Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml

and

Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml.

The same for include/dt-bindings/reset/starfive,jh7110-crg.h. So should I add these four files in one patch?

Best regards,
Hal

#40 lore raw

Re: [PATCH v2 09/14] dt-bindings: clock: Add StarFive JH7110 system clock and reset generator

Quoted 50 lines · Hal Feng
Quoted 39 lines · Krzysztof Kozlowski
Quoted 28 lines · Hal Feng
Quoted 27 lines · Krzysztof Kozlowski
Quoted 25 lines · Hal Feng
Quoted 13 lines · Hal Feng
Quoted 11 lines · Krzysztof Kozlowski
Quoted 7 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the system clock and reset generator (SYSCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

Binding headers are coming with the file bringing bindings for the device, so you need to squash patches.

Quoted 7 lines

As we discussed in patch 7, could I merge patch 7, 8, 9, 10 and add the following files in one commit?

include/dt-bindings/clock/starfive,jh7110-crg.h include/dt-bindings/reset/starfive,jh7110-crg.h Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml

Hi, Krzysztof,

Could you please give me some suggestions?

Quoted 8 lines
Quoted 2 lines

You can keep aon and sys split. First add one of them with their own headers. Then add second with their own defines.

You mean split patch 7 and patch 8 into sys part and aon part respectively? There are totally five regions (sys/aon/stg/isp/vout) for clocks and resets in JH7110. If we do that, there will be 5 headers for JH7110 in either clock or reset directory finally. Is that OK if there are too many headers for just one SoC?

Quoted 3 lines

Sorry, I lost the track of what patches you have. The comment was - bindings include both the doc and headers. You want to split some, some merge, sorry, no clue. I did not propose splitting headers...

It's ok. The problem was that the header

include/dt-bindings/clock/starfive,jh7110-crg.h

was used in both

Quoted 8 lines

Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml

and

Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml.

The same for include/dt-bindings/reset/starfive,jh7110-crg.h. So should I add these four files in one patch?

No. I think I wrote proposed flow of patches:
1. syscrg bindings with header
2. aoncrg bindings with changes to header

Why do you need to merge anything?

Best regards,
Krzysztof

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author maintainer
#41 lore raw

Re: [PATCH v2 09/14] dt-bindings: clock: Add StarFive JH7110 system clock and reset generator

Quoted 55 lines · Krzysztof Kozlowski
Quoted 54 lines · Hal Feng
Quoted 39 lines · Krzysztof Kozlowski
Quoted 28 lines · Hal Feng
Quoted 27 lines · Krzysztof Kozlowski
Quoted 25 lines · Hal Feng
Quoted 13 lines · Hal Feng
Quoted 11 lines · Krzysztof Kozlowski
Quoted 7 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the system clock and reset generator (SYSCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

Binding headers are coming with the file bringing bindings for the device, so you need to squash patches.

Quoted 7 lines

As we discussed in patch 7, could I merge patch 7, 8, 9, 10 and add the following files in one commit?

include/dt-bindings/clock/starfive,jh7110-crg.h include/dt-bindings/reset/starfive,jh7110-crg.h Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml

Hi, Krzysztof,

Could you please give me some suggestions?

Quoted 8 lines
Quoted 2 lines

You can keep aon and sys split. First add one of them with their own headers. Then add second with their own defines.

You mean split patch 7 and patch 8 into sys part and aon part respectively? There are totally five regions (sys/aon/stg/isp/vout) for clocks and resets in JH7110. If we do that, there will be 5 headers for JH7110 in either clock or reset directory finally. Is that OK if there are too many headers for just one SoC?

Quoted 3 lines

Sorry, I lost the track of what patches you have. The comment was - bindings include both the doc and headers. You want to split some, some merge, sorry, no clue. I did not propose splitting headers...

It's ok. The problem was that the header

include/dt-bindings/clock/starfive,jh7110-crg.h

was used in both

Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml

and

Quoted 8 lines
Quoted 4 lines

Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml.

The same for include/dt-bindings/reset/starfive,jh7110-crg.h. So should I add these four files in one patch?

No. I think I wrote proposed flow of patches:
1. syscrg bindings with header
2. aoncrg bindings with changes to header

Great. Got it. Thanks a lot!

Best regards,
Hal

Quoted 2 lines

Why do you need to merge anything?

author maintainer
#42 lore raw

PATCH v2 10/14 dt-bindings: clock: Add StarFive JH7110 always-on clock and reset generator

In reply to Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the always-on clock and reset generator (AONCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

---
 .../clock/starfive,jh7110-aoncrg.yaml         | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml
Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml new file +76 -0
new file mode 100644
index 000000000000..afbb205e294f
@@ -0,0 +1,76 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/starfive,jh7110-aoncrg.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: StarFive JH7110 Always-On Clock and Reset Generator
+
+maintainers:
+  - Emil Renner Berthing <[email protected]>
+
+properties:
+  compatible:
+    const: starfive,jh7110-aoncrg
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: Main Oscillator
+      - description: RTC clock
+      - description: RMII reference clock
+      - description: RGMII RX clock
+      - description: STG AXI/AHB clock
+      - description: APB Bus clock
+      - description: GMAC0 GTX clock
+
+  clock-names:
+    items:
+      - const: osc
+      - const: clk_rtc
+      - const: gmac0_rmii_refin
+      - const: gmac0_rgmii_rxin
+      - const: stg_axiahb
+      - const: apb_bus_func
+      - const: gmac0_gtxclk
+
+  '#clock-cells':
+    const: 1
+    description:
+      See <dt-bindings/clock/starfive-jh7110.h> for valid indices.
+
+  '#reset-cells':
+    const: 1
+    description:
+      See <dt-bindings/reset/starfive-jh7110.h> for valid indices.
+
+required:
+  - compatible
+  - reg
+  - clocks
+  - clock-names
+  - '#clock-cells'
+  - '#reset-cells'
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/clock/starfive-jh7110.h>
+
+    clock-controller@17000000 {
+        compatible = "starfive,jh7110-aoncrg";
+        reg = <0x17000000 0x10000>;
+        clocks = <&osc>, <&clk_rtc>,
+                 <&gmac0_rmii_refin>, <&gmac0_rgmii_rxin>,
+                 <&syscrg JH7110_SYSCLK_STG_AXIAHB>,
+                 <&syscrg JH7110_SYSCLK_APB_BUS_FUNC>,
+                 <&syscrg JH7110_SYSCLK_GMAC0_GTXCLK>;
+        clock-names = "osc", "clk_rtc", "gmac0_rmii_refin",
+                      "gmac0_rgmii_rxin", "stg_axiahb",
+                      "apb_bus_func", "gmac0_gtxclk";
+        #clock-cells = <1>;
+        #reset-cells = <1>;
+    };
Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#43 lore raw

Re: [PATCH v2 10/14] dt-bindings: clock: Add StarFive JH7110 always-on clock and reset generator

Quoted 30 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the always-on clock and reset generator (AONCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

---
 .../clock/starfive,jh7110-aoncrg.yaml         | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml
Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml new file +12 -0
new file mode 100644
index 000000000000..afbb205e294f
@@ -0,0 +1,76 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/starfive,jh7110-aoncrg.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: StarFive JH7110 Always-On Clock and Reset Generator
+
+maintainers:
+  - Emil Renner Berthing <[email protected]>
+
+properties:

Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml line 22

Quoted 10 lines
Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml new file +10 -0
+  compatible:
+    const: starfive,jh7110-aoncrg
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: Main Oscillator
+      - description: RTC clock

Real Time Clock clock? :) I don't think the input to clock controller is the output of RTC...

Best regards,
Krzysztof

#44 lore raw

Re: [PATCH v2 10/14] dt-bindings: clock: Add StarFive JH7110 always-on clock and reset generator

Quoted 37 lines · Krzysztof Kozlowski
Quoted 35 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the always-on clock and reset generator (AONCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

---
 .../clock/starfive,jh7110-aoncrg.yaml         | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml
Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml new file +17 -0
new file mode 100644
index 000000000000..afbb205e294f
@@ -0,0 +1,76 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/starfive,jh7110-aoncrg.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: StarFive JH7110 Always-On Clock and Reset Generator
+
+maintainers:
+  - Emil Renner Berthing <[email protected]>
+
+properties:
+  compatible:
+    const: starfive,jh7110-aoncrg
+
+  reg:
+    maxItems: 1
Quoted 8 lines

Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml line 22

Quoted 5 lines
Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml new file +5 -0
+
+  clocks:
+    items:
+      - description: Main Oscillator
+      - description: RTC clock

Real Time Clock clock? :) I don't think the input to clock controller is the output of RTC...

The description is bad, but even the documentation calls it "clk_rtc" even though it's really an optional input from a 32k oscillator.

Quoted 3 lines

Best regards,
Krzysztof

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

#45 lore raw

Re: [PATCH v2 10/14] dt-bindings: clock: Add StarFive JH7110 always-on clock and reset generator

Quoted 48 lines · Emil Renner Berthing
Quoted 37 lines · Krzysztof Kozlowski
Quoted 35 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add bindings for the always-on clock and reset generator (AONCRG) on the JH7110 RISC-V SoC by StarFive Ltd.

---
 .../clock/starfive,jh7110-aoncrg.yaml         | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml
Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml new file +17 -0
new file mode 100644
index 000000000000..afbb205e294f
@@ -0,0 +1,76 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/starfive,jh7110-aoncrg.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: StarFive JH7110 Always-On Clock and Reset Generator
+
+maintainers:
+  - Emil Renner Berthing <[email protected]>
+
+properties:
+  compatible:
+    const: starfive,jh7110-aoncrg
+
+  reg:
+    maxItems: 1
Quoted 8 lines

Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml line 22

Quoted 5 lines
Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml new file +5 -0
+
+  clocks:
+    items:
+      - description: Main Oscillator
+      - description: RTC clock

Real Time Clock clock? :) I don't think the input to clock controller is the output of RTC...

Quoted 2 lines

The description is bad, but even the documentation calls it "clk_rtc" even though it's really an optional input from a 32k oscillator.

Then description should match reality, not documentation. Documentation is often poor, so if possible better to extend it.

Best regards,
Krzysztof

author maintainer
#46 lore raw

PATCH v2 11/14 clk: starfive: Add StarFive JH7110 system clock driver

In reply to Hal Feng

From: Emil Renner Berthing <[email protected]>

Add driver for the StarFive JH7110 system clock controller and register an auxiliary device for system reset controller which is named as "reset-sys".

---
 drivers/clk/starfive/Kconfig                  |  10 +
 drivers/clk/starfive/Makefile                 |   2 +
 .../clk/starfive/clk-starfive-jh7110-sys.c    | 650 ++++++++++++++++++
 drivers/clk/starfive/clk-starfive-jh71x0.c    |  54 ++
 drivers/clk/starfive/clk-starfive-jh71x0.h    |  10 +-
 5 files changed, 725 insertions(+), 1 deletion(-)
 create mode 100644 drivers/clk/starfive/clk-starfive-jh7110-sys.c
drivers/clk/starfive/Kconfig +10 -0
index 594d516dcb38..7a6ff6614c74 100644
@@ -20,3 +20,13 @@ config CLK_STARFIVE_JH7100_AUDIO
 	help
 	  Say Y or M here to support the audio clocks on the StarFive JH7100
 	  SoC.
+
+config CLK_STARFIVE_JH7110_SYS
+	bool "StarFive JH7110 system clock support"
+	depends on SOC_STARFIVE || COMPILE_TEST
+	select AUXILIARY_BUS
+	select CLK_STARFIVE_JH71X0
+	default SOC_STARFIVE
+	help
+	  Say yes here to support the system clock controller on the
+	  StarFive JH7110 SoC.
drivers/clk/starfive/Makefile +2 -0
index 82edfa9f9cb8..5ca4e887fb9c 100644
@@ -3,3 +3,5 @@ obj-$(CONFIG_CLK_STARFIVE_JH71X0)	+= clk-starfive-jh71x0.o
 
 obj-$(CONFIG_CLK_STARFIVE_JH7100)	+= clk-starfive-jh7100.o
 obj-$(CONFIG_CLK_STARFIVE_JH7100_AUDIO)	+= clk-starfive-jh7100-audio.o
+
+obj-$(CONFIG_CLK_STARFIVE_JH7110_SYS)	+= clk-starfive-jh7110-sys.o
drivers/clk/starfive/clk-starfive-jh7110-sys.c new file +650 -0

650 lines not on this page · raw message

drivers/clk/starfive/clk-starfive-jh71x0.c +54 -0

63 lines not on this page · raw message

drivers/clk/starfive/clk-starfive-jh71x0.h +9 -1
index baf4b5cb4b8a..7a52e46eb6db 100644
@@ -105,10 +105,18 @@ struct jh71x0_clk_priv {
 	spinlock_t rmw_lock;
 	struct device *dev;
 	void __iomem *base;
-	struct clk_hw *pll[3];
+	struct clk_hw *pll[12];
 	struct jh71x0_clk reg[];
 };
 
 const struct clk_ops *starfive_jh71x0_clk_ops(u32 max);
 
+#if IS_ENABLED(CONFIG_CLK_STARFIVE_JH7110_SYS)
+
+int jh7110_reset_controller_register(struct jh71x0_clk_priv *priv,
+				     const char *adev_name,
+				     u32 adev_id);
+
+#endif
+
 #endif
Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#47 lore raw

Re: [PATCH v2 11/14] clk: starfive: Add StarFive JH7110 system clock driver

Quoted 157 lines · Hal Feng

From: Emil Renner Berthing <[email protected]>

Add driver for the StarFive JH7110 system clock controller and register an auxiliary device for system reset controller which is named as "reset-sys".

---
 drivers/clk/starfive/Kconfig                  |  10 +
 drivers/clk/starfive/Makefile                 |   2 +
 .../clk/starfive/clk-starfive-jh7110-sys.c    | 650 ++++++++++++++++++
 drivers/clk/starfive/clk-starfive-jh71x0.c    |  54 ++
 drivers/clk/starfive/clk-starfive-jh71x0.h    |  10 +-
 5 files changed, 725 insertions(+), 1 deletion(-)
 create mode 100644 drivers/clk/starfive/clk-starfive-jh7110-sys.c
drivers/clk/starfive/Kconfig +10 -0
index 594d516dcb38..7a6ff6614c74 100644
@@ -20,3 +20,13 @@ config CLK_STARFIVE_JH7100_AUDIO
        help
          Say Y or M here to support the audio clocks on the StarFive JH7100
          SoC.
+
+config CLK_STARFIVE_JH7110_SYS
+       bool "StarFive JH7110 system clock support"
+       depends on SOC_STARFIVE || COMPILE_TEST
+       select AUXILIARY_BUS
+       select CLK_STARFIVE_JH71X0
+       default SOC_STARFIVE
+       help
+         Say yes here to support the system clock controller on the
+         StarFive JH7110 SoC.
drivers/clk/starfive/Makefile +2 -0
index 82edfa9f9cb8..5ca4e887fb9c 100644
@@ -3,3 +3,5 @@ obj-$(CONFIG_CLK_STARFIVE_JH71X0)       += clk-starfive-jh71x0.o
 
 obj-$(CONFIG_CLK_STARFIVE_JH7100)      += clk-starfive-jh7100.o
 obj-$(CONFIG_CLK_STARFIVE_JH7100_AUDIO)        += clk-starfive-jh7100-audio.o
+
+obj-$(CONFIG_CLK_STARFIVE_JH7110_SYS)  += clk-starfive-jh7110-sys.o
drivers/clk/starfive/clk-starfive-jh7110-sys.c new file +104 -0
new file mode 100644
index 000000000000..3c1afd691210
@@ -0,0 +1,650 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * StarFive JH7110 System Clock Driver
+ *
+ * Copyright (C) 2022 Emil Renner Berthing <[email protected]>
+ * Copyright (C) 2022 StarFive Technology Co., Ltd.
+ */
+
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+
+#include <dt-bindings/clock/starfive-jh7110.h>
+
+#include "clk-starfive-jh71x0.h"
+
+/* external clocks */
+#define JH7110_SYSCLK_OSC                      (JH7110_SYSCLK_END + 0)
+#define JH7110_SYSCLK_GMAC1_RMII_REFIN         (JH7110_SYSCLK_END + 1)
+#define JH7110_SYSCLK_GMAC1_RGMII_RXIN         (JH7110_SYSCLK_END + 2)
+#define JH7110_SYSCLK_I2STX_BCLK_EXT           (JH7110_SYSCLK_END + 3)
+#define JH7110_SYSCLK_I2STX_LRCK_EXT           (JH7110_SYSCLK_END + 4)
+#define JH7110_SYSCLK_I2SRX_BCLK_EXT           (JH7110_SYSCLK_END + 5)
+#define JH7110_SYSCLK_I2SRX_LRCK_EXT           (JH7110_SYSCLK_END + 6)
+#define JH7110_SYSCLK_TDM_EXT                  (JH7110_SYSCLK_END + 7)
+#define JH7110_SYSCLK_MCLK_EXT                 (JH7110_SYSCLK_END + 8)
+
+static const struct jh71x0_clk_data jh7110_sysclk_data[] __initconst = {
+       /* root */
+       JH71X0__MUX(JH7110_SYSCLK_CPU_ROOT, "cpu_root", 2,
+                   JH7110_SYSCLK_OSC,
+                   JH7110_SYSCLK_PLL0_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_CPU_CORE, "cpu_core", 7,
+                   JH7110_SYSCLK_CPU_ROOT),
+       JH71X0__DIV(JH7110_SYSCLK_CPU_BUS, "cpu_bus", 2,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0__MUX(JH7110_SYSCLK_GPU_ROOT, "gpu_root", 2,
+                   JH7110_SYSCLK_PLL2_OUT,
+                   JH7110_SYSCLK_PLL1_OUT),
+       JH71X0_MDIV(JH7110_SYSCLK_PERH_ROOT, "perh_root", 2, 2,
+                   JH7110_SYSCLK_PLL0_OUT,
+                   JH7110_SYSCLK_PLL2_OUT),
+       JH71X0__MUX(JH7110_SYSCLK_BUS_ROOT, "bus_root", 2,
+                   JH7110_SYSCLK_OSC,
+                   JH7110_SYSCLK_PLL2_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_NOCSTG_BUS, "nocstg_bus", 3,
+                   JH7110_SYSCLK_BUS_ROOT),
+       JH71X0__DIV(JH7110_SYSCLK_AXI_CFG0, "axi_cfg0", 3,
+                   JH7110_SYSCLK_BUS_ROOT),
+       JH71X0__DIV(JH7110_SYSCLK_STG_AXIAHB, "stg_axiahb", 2,
+                   JH7110_SYSCLK_AXI_CFG0),
+       JH71X0_GATE(JH7110_SYSCLK_AHB0, "ahb0", CLK_IS_CRITICAL,
+                   JH7110_SYSCLK_STG_AXIAHB),
+       JH71X0_GATE(JH7110_SYSCLK_AHB1, "ahb1", CLK_IS_CRITICAL,
+                   JH7110_SYSCLK_STG_AXIAHB),
+       JH71X0__DIV(JH7110_SYSCLK_APB_BUS_FUNC, "apb_bus_func", 8,
+                   JH7110_SYSCLK_STG_AXIAHB),
+       JH71X0_GATE(JH7110_SYSCLK_APB0, "apb0", CLK_IS_CRITICAL,
+                   JH7110_SYSCLK_APB_BUS),
+       JH71X0__DIV(JH7110_SYSCLK_PLL0_DIV2, "pll0_div2", 2,
+                   JH7110_SYSCLK_PLL0_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_PLL1_DIV2, "pll1_div2", 2,
+                   JH7110_SYSCLK_PLL1_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_PLL2_DIV2, "pll2_div2", 2,
+                   JH7110_SYSCLK_PLL2_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_AUDIO_ROOT, "audio_root", 8,
+                   JH7110_SYSCLK_PLL2_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_MCLK_INNER, "mclk_inner", 64,
+                   JH7110_SYSCLK_AUDIO_ROOT),
+       JH71X0__MUX(JH7110_SYSCLK_MCLK, "mclk", 2,
+                   JH7110_SYSCLK_MCLK_INNER,
+                   JH7110_SYSCLK_MCLK_EXT),
+       JH71X0_GATE(JH7110_SYSCLK_MCLK_OUT, "mclk_out", 0,
+                   JH7110_SYSCLK_MCLK_INNER),
+       JH71X0_MDIV(JH7110_SYSCLK_ISP_2X, "isp_2x", 8, 2,
+                   JH7110_SYSCLK_PLL2_OUT,
+                   JH7110_SYSCLK_PLL1_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_ISP_AXI, "isp_axi", 4,
+                   JH7110_SYSCLK_ISP_2X),
+       JH71X0_GDIV(JH7110_SYSCLK_GCLK0, "gclk0", 0, 62,
+                   JH7110_SYSCLK_PLL0_DIV2),
+       JH71X0_GDIV(JH7110_SYSCLK_GCLK1, "gclk1", 0, 62,
+                   JH7110_SYSCLK_PLL1_DIV2),
+       JH71X0_GDIV(JH7110_SYSCLK_GCLK2, "gclk2", 0, 62,
+                   JH7110_SYSCLK_PLL2_DIV2),
+       /* cores */
+       JH71X0_GATE(JH7110_SYSCLK_CORE, "core_clk", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_CORE1, "core_clk1", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_CORE2, "core_clk2", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_CORE3, "core_clk3", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_CORE4, "core_clk4", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_DEBUG, "debug_clk", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_BUS),
+       JH71X0__DIV(JH7110_SYSCLK_RTC_TOGGLE, "rtc_toggle", 6,
+                   JH7110_SYSCLK_OSC),
+       JH71X0_GATE(JH7110_SYSCLK_TRACE0, "trace_clk0", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),

drivers/clk/starfive/clk-starfive-jh7110-sys.c line 114

Quoted 10 lines
drivers/clk/starfive/clk-starfive-jh7110-sys.c new file +10 -0
+       JH71X0_GATE(JH7110_SYSCLK_TRACE1, "trace_clk1", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_TRACE2, "trace_clk2", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_TRACE3, "trace_clk3", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_TRACE4, "trace_clk4", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_TRACE_COM, "trace_com", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_BUS),

Why should these clocks not be turned off if they're not critical like the clocks above?

My guess would be that the clocks for core 1-4 are critical, but maybe not the trace and debug clocks.

Quoted 409 lines
drivers/clk/starfive/clk-starfive-jh7110-sys.c new file +409 -0
+       /* noc */
+       JH71X0_GATE(JH7110_SYSCLK_NOC_BUS_CPU_AXI, "noc_bus_cpu_axi",
+                   CLK_IS_CRITICAL,
+                   JH7110_SYSCLK_CPU_BUS),
+       JH71X0_GATE(JH7110_SYSCLK_NOC_BUS_AXICFG0_AXI, "noc_bus_axicfg0_axi",
+                   CLK_IS_CRITICAL,
+                   JH7110_SYSCLK_AXI_CFG0),
+       /* ddr */
+       JH71X0__DIV(JH7110_SYSCLK_OSC_DIV2, "osc_div2", 2,
+                   JH7110_SYSCLK_OSC),
+       JH71X0__DIV(JH7110_SYSCLK_PLL1_DIV4, "pll1_div4", 2,
+                   JH7110_SYSCLK_PLL1_DIV2),
+       JH71X0__DIV(JH7110_SYSCLK_PLL1_DIV8, "pll1_div8", 2,
+                   JH7110_SYSCLK_PLL1_DIV4),
+       JH71X0__MUX(JH7110_SYSCLK_DDR_BUS, "ddr_bus", 4,
+                   JH7110_SYSCLK_OSC_DIV2,
+                   JH7110_SYSCLK_PLL1_DIV2,
+                   JH7110_SYSCLK_PLL1_DIV4,
+                   JH7110_SYSCLK_PLL1_DIV8),
+       JH71X0_GATE(JH7110_SYSCLK_DDR_AXI, "ddr_axi", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_DDR_BUS),
+       /* gpu */
+       JH71X0__DIV(JH7110_SYSCLK_GPU_CORE, "gpu_core", 7,
+                   JH7110_SYSCLK_GPU_ROOT),
+       JH71X0_GATE(JH7110_SYSCLK_GPU_CORE_CLK, "gpu_core_clk", 0,
+                   JH7110_SYSCLK_GPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_GPU_SYS_CLK, "gpu_sys_clk", 0,
+                   JH7110_SYSCLK_AXI_CFG1),
+       JH71X0_GATE(JH7110_SYSCLK_GPU_APB, "gpu_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GDIV(JH7110_SYSCLK_GPU_RTC_TOGGLE, "gpu_rtc_toggle", 0, 12,
+                   JH7110_SYSCLK_OSC),
+       JH71X0_GATE(JH7110_SYSCLK_NOC_BUS_GPU_AXI, "noc_bus_gpu_axi", 0,
+                   JH7110_SYSCLK_GPU_CORE),
+       /* isp */
+       JH71X0_GATE(JH7110_SYSCLK_ISP_TOP_ISPCORE_2X,
+                   "isp_top_ispcore_2x", 0,
+                   JH7110_SYSCLK_ISP_2X),
+       JH71X0_GATE(JH7110_SYSCLK_ISP_TOP_ISP_AXI, "isp_top_isp_axi", 0,
+                   JH7110_SYSCLK_ISP_AXI),
+       JH71X0_GATE(JH7110_SYSCLK_NOC_BUS_ISP_AXI, "noc_bus_isp_axi",
+                   CLK_IS_CRITICAL,
+                   JH7110_SYSCLK_ISP_AXI),
+       /* hifi4 */
+       JH71X0__DIV(JH7110_SYSCLK_HIFI4_CORE, "hifi4_core", 15,
+                   JH7110_SYSCLK_BUS_ROOT),
+       JH71X0__DIV(JH7110_SYSCLK_HIFI4_AXI, "hifi4_axi", 2,
+                   JH7110_SYSCLK_HIFI4_CORE),
+       /* axi_cfg1_dec */
+       JH71X0_GATE(JH7110_SYSCLK_AXI_CFG1_DEC_MAIN, "axi_cfg1_dec_main",
+                   CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_AXI_CFG1),
+       JH71X0_GATE(JH7110_SYSCLK_AXI_CFG1_DEC_AHB, "cfg1_dec_ahb",
+                   CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_AHB0),
+       /* vout */
+       JH71X0_GATE(JH7110_SYSCLK_VOUT_SRC, "vout_src", 0,
+                   JH7110_SYSCLK_VOUT_ROOT),
+       JH71X0__DIV(JH7110_SYSCLK_VOUT_AXI, "vout_axi", 7,
+                   JH7110_SYSCLK_VOUT_ROOT),
+       JH71X0_GATE(JH7110_SYSCLK_NOC_BUS_DISP_AXI, "noc_bus_disp_axi", 0,
+                   JH7110_SYSCLK_VOUT_AXI),
+       JH71X0_GATE(JH7110_SYSCLK_VOUT_TOP_VOUT_AHB, "vout_top_vout_ahb", 0,
+                   JH7110_SYSCLK_AHB1),
+       JH71X0_GATE(JH7110_SYSCLK_VOUT_TOP_VOUT_AXI, "vout_top_vout_axi", 0,
+                   JH7110_SYSCLK_VOUT_AXI),
+       JH71X0_GATE(JH7110_SYSCLK_VOUT_TOP_HDMITX0_MCLK,
+                   "vout_top_hdmitx0_mclk", 0,
+                   JH7110_SYSCLK_MCLK),
+       JH71X0__DIV(JH7110_SYSCLK_VOUT_TOP_MIPIPHY_REF,
+                   "vout_top_mipiphy_ref", 2,
+                   JH7110_SYSCLK_OSC),
+       /* jpegc */
+       JH71X0__DIV(JH7110_SYSCLK_JPEGC_AXI, "jpegc_axi", 16,
+                   JH7110_SYSCLK_VENC_ROOT),
+       JH71X0_GATE(JH7110_SYSCLK_CODAJ12_AXI, "codaj12_axi", 0,
+                   JH7110_SYSCLK_JPEGC_AXI),
+       JH71X0_GDIV(JH7110_SYSCLK_CODAJ12_CORE, "codaj12_core", 0, 16,
+                   JH7110_SYSCLK_VENC_ROOT),
+       JH71X0_GATE(JH7110_SYSCLK_CODAJ12_APB, "codaj12_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       /* vdec */
+       JH71X0__DIV(JH7110_SYSCLK_VDEC_AXI, "vdec_axi", 7,
+                   JH7110_SYSCLK_BUS_ROOT),
+       JH71X0_GATE(JH7110_SYSCLK_WAVE511_AXI, "wave511_axi", 0,
+                   JH7110_SYSCLK_VDEC_AXI),
+       JH71X0_GDIV(JH7110_SYSCLK_WAVE511_BPU, "wave511_bpu", 0, 7,
+                   JH7110_SYSCLK_BUS_ROOT),
+       JH71X0_GDIV(JH7110_SYSCLK_WAVE511_VCE, "wave511_vce", 0, 7,
+                   JH7110_SYSCLK_VDEC_ROOT),
+       JH71X0_GATE(JH7110_SYSCLK_WAVE511_APB, "wave511_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GATE(JH7110_SYSCLK_VDEC_JPG_ARB_JPG, "vdec_jpg_arb_jpg",
+                   CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_JPEGC_AXI),
+       JH71X0_GATE(JH7110_SYSCLK_VDEC_JPG_ARB_MAIN, "vdec_jpg_arb_main",
+                   CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_VDEC_AXI),
+       JH71X0_GATE(JH7110_SYSCLK_NOC_BUS_VDEC_AXI, "noc_bus_vdec_axi", 0,
+                   JH7110_SYSCLK_VDEC_AXI),
+       /* venc */
+       JH71X0__DIV(JH7110_SYSCLK_VENC_AXI, "venc_axi", 15,
+                   JH7110_SYSCLK_VENC_ROOT),
+       JH71X0_GATE(JH7110_SYSCLK_WAVE420L_AXI, "wave420l_axi", 0,
+                   JH7110_SYSCLK_VENC_AXI),
+       JH71X0_GDIV(JH7110_SYSCLK_WAVE420L_BPU, "wave420l_bpu", 0, 15,
+                   JH7110_SYSCLK_VENC_ROOT),
+       JH71X0_GDIV(JH7110_SYSCLK_WAVE420L_VCE, "wave420l_vce", 0, 15,
+                   JH7110_SYSCLK_VENC_ROOT),
+       JH71X0_GATE(JH7110_SYSCLK_WAVE420L_APB, "wave420l_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GATE(JH7110_SYSCLK_NOC_BUS_VENC_AXI, "noc_bus_venc_axi", 0,
+                   JH7110_SYSCLK_VENC_AXI),
+       /* intmem */
+       JH71X0_GATE(JH7110_SYSCLK_AXI_CFG0_DEC_MAIN_DIV,
+                   "axi_cfg0_dec_main_div", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_AHB1),
+       JH71X0_GATE(JH7110_SYSCLK_AXI_CFG0_DEC_MAIN, "axi_cfg0_dec_main",
+                   CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_AXI_CFG0),
+       JH71X0_GATE(JH7110_SYSCLK_AXI_CFG0_DEC_HIFI4, "axi_cfg0_dec_hifi4",
+                   CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_HIFI4_AXI),
+       JH71X0_GATE(JH7110_SYSCLK_AXIMEM2_128B_AXI, "aximem2_128b_axi",
+                   CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_AXI_CFG0),
+       /* qspi */
+       JH71X0_GATE(JH7110_SYSCLK_QSPI_AHB, "qspi_ahb", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_AHB1),
+       JH71X0_GATE(JH7110_SYSCLK_QSPI_APB, "qspi_apb", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_APB12),
+       JH71X0__DIV(JH7110_SYSCLK_QSPI_REF_SRC, "qspi_ref_src", 16,
+                   JH7110_SYSCLK_GMACUSB_ROOT),
+       JH71X0_GMUX(JH7110_SYSCLK_QSPI_REF, "qspi_ref", CLK_IGNORE_UNUSED, 2,
+                   JH7110_SYSCLK_OSC,
+                   JH7110_SYSCLK_QSPI_REF_SRC),
+       /* sdio */
+       JH71X0_GATE(JH7110_SYSCLK_SDIO0_AHB, "sdio0_ahb", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_AHB0),
+       JH71X0_GATE(JH7110_SYSCLK_SDIO1_AHB, "sdio1_ahb", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_AHB0),
+       JH71X0_GDIV(JH7110_SYSCLK_SDIO0_SDCARD, "sdio0_sdcard",
+                   CLK_IGNORE_UNUSED, 15,
+                   JH7110_SYSCLK_AXI_CFG0),
+       JH71X0_GDIV(JH7110_SYSCLK_SDIO1_SDCARD, "sdio1_sdcard",
+                   CLK_IGNORE_UNUSED, 15,
+                   JH7110_SYSCLK_AXI_CFG0),
+       /* stg */
+       JH71X0__DIV(JH7110_SYSCLK_USB_125M, "usb_125m", 15,
+                   JH7110_SYSCLK_GMACUSB_ROOT),
+       JH71X0_GATE(JH7110_SYSCLK_NOC_BUS_STG_AXI, "noc_bus_stg_axi",
+                   CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_NOCSTG_BUS),
+       /* gmac1 */
+       JH71X0_GATE(JH7110_SYSCLK_GMAC1_AHB, "gmac1_ahb", 0,
+                   JH7110_SYSCLK_AHB0),
+       JH71X0_GATE(JH7110_SYSCLK_GMAC1_AXI, "gmac1_axi", 0,
+                   JH7110_SYSCLK_STG_AXIAHB),
+       JH71X0__DIV(JH7110_SYSCLK_GMAC_SRC, "gmac_src", 7,
+                   JH7110_SYSCLK_GMACUSB_ROOT),
+       JH71X0__DIV(JH7110_SYSCLK_GMAC1_GTXCLK, "gmac1_gtxclk", 15,
+                   JH7110_SYSCLK_GMACUSB_ROOT),
+       JH71X0__DIV(JH7110_SYSCLK_GMAC1_RMII_RTX, "gmac1_rmii_rtx", 30,
+                   JH7110_SYSCLK_GMAC1_RMII_REFIN),
+       JH71X0_GDIV(JH7110_SYSCLK_GMAC1_PTP, "gmac1_ptp", 0, 31,
+                   JH7110_SYSCLK_GMAC_SRC),
+       JH71X0__MUX(JH7110_SYSCLK_GMAC1_RX, "gmac1_rx", 2,
+                   JH7110_SYSCLK_GMAC1_RGMII_RXIN,
+                   JH7110_SYSCLK_GMAC1_RMII_RTX),
+       JH71X0__INV(JH7110_SYSCLK_GMAC1_RX_INV, "gmac1_rx_inv",
+                   JH7110_SYSCLK_GMAC1_RX),
+       JH71X0_GMUX(JH7110_SYSCLK_GMAC1_TX, "gmac1_tx", 0, 2,
+                   JH7110_SYSCLK_GMAC1_GTXCLK,
+                   JH7110_SYSCLK_GMAC1_RMII_RTX),
+       JH71X0__INV(JH7110_SYSCLK_GMAC1_TX_INV, "gmac1_tx_inv",
+                   JH7110_SYSCLK_GMAC1_TX),
+       JH71X0_GATE(JH7110_SYSCLK_GMAC1_GTXC, "gmac1_gtxc", 0,
+                   JH7110_SYSCLK_GMAC1_GTXCLK),
+       /* gmac0 */
+       JH71X0_GDIV(JH7110_SYSCLK_GMAC0_GTXCLK, "gmac0_gtxclk", 0, 15,
+                   JH7110_SYSCLK_GMACUSB_ROOT),
+       JH71X0_GDIV(JH7110_SYSCLK_GMAC0_PTP, "gmac0_ptp", 0, 31,
+                   JH7110_SYSCLK_GMAC_SRC),
+       JH71X0_GDIV(JH7110_SYSCLK_GMAC_PHY, "gmac_phy", 0, 31,
+                   JH7110_SYSCLK_GMAC_SRC),
+       JH71X0_GATE(JH7110_SYSCLK_GMAC0_GTXC, "gmac0_gtxc", 0,
+                   JH7110_SYSCLK_GMAC0_GTXCLK),
+       /* sys misc */
+       JH71X0_GATE(JH7110_SYSCLK_IOMUX, "iomux_pclk", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GATE(JH7110_SYSCLK_MAILBOX, "mailbox_apb", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GATE(JH7110_SYSCLK_INT_CTRL_APB, "int_ctrl_apb",
+                   CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_APB12),
+       /* can0 */
+       JH71X0_GATE(JH7110_SYSCLK_CAN0_APB, "can0_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GDIV(JH7110_SYSCLK_CAN0_TIMER, "can0_timer", 0, 24,
+                   JH7110_SYSCLK_OSC),
+       JH71X0_GDIV(JH7110_SYSCLK_CAN0_CAN, "can0_can", 0, 63,
+                   JH7110_SYSCLK_PERH_ROOT),
+       /* can1 */
+       JH71X0_GATE(JH7110_SYSCLK_CAN1_APB, "can1_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GDIV(JH7110_SYSCLK_CAN1_TIMER, "can1_timer", 0, 24,
+                   JH7110_SYSCLK_OSC),
+       JH71X0_GDIV(JH7110_SYSCLK_CAN1_CAN, "can1_can", 0, 63,
+                   JH7110_SYSCLK_PERH_ROOT),
+       /* pwm */
+       JH71X0_GATE(JH7110_SYSCLK_PWM_APB, "pwm_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       /* wdt */
+       JH71X0_GATE(JH7110_SYSCLK_WDT_APB, "wdt_apb", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GATE(JH7110_SYSCLK_WDT_CORE, "wdt_core", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_OSC),
+       /* timer */
+       JH71X0_GATE(JH7110_SYSCLK_TIMER_APB, "timer_apb", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GATE(JH7110_SYSCLK_TIMER0, "timer0_clk", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_OSC),
+       JH71X0_GATE(JH7110_SYSCLK_TIMER1, "timer1_clk", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_OSC),
+       JH71X0_GATE(JH7110_SYSCLK_TIMER2, "timer2_clk", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_OSC),
+       JH71X0_GATE(JH7110_SYSCLK_TIMER3, "timer3_clk", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_OSC),
+       /* temp sensor */
+       JH71X0_GATE(JH7110_SYSCLK_TEMP_APB, "temp_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GDIV(JH7110_SYSCLK_TEMP_CORE, "temp_core", 0, 24,
+                   JH7110_SYSCLK_OSC),
+       /* spi */
+       JH71X0_GATE(JH7110_SYSCLK_SPI0_APB, "spi0_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GATE(JH7110_SYSCLK_SPI1_APB, "spi1_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GATE(JH7110_SYSCLK_SPI2_APB, "spi2_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GATE(JH7110_SYSCLK_SPI3_APB, "spi3_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GATE(JH7110_SYSCLK_SPI4_APB, "spi4_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GATE(JH7110_SYSCLK_SPI5_APB, "spi5_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GATE(JH7110_SYSCLK_SPI6_APB, "spi6_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       /* i2c */
+       JH71X0_GATE(JH7110_SYSCLK_I2C0_APB, "i2c0_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GATE(JH7110_SYSCLK_I2C1_APB, "i2c1_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GATE(JH7110_SYSCLK_I2C2_APB, "i2c2_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GATE(JH7110_SYSCLK_I2C3_APB, "i2c3_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GATE(JH7110_SYSCLK_I2C4_APB, "i2c4_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GATE(JH7110_SYSCLK_I2C5_APB, "i2c5_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       JH71X0_GATE(JH7110_SYSCLK_I2C6_APB, "i2c6_apb", 0,
+                   JH7110_SYSCLK_APB12),
+       /* uart */
+       JH71X0_GATE(JH7110_SYSCLK_UART0_APB, "uart0_apb", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GATE(JH7110_SYSCLK_UART0_CORE, "uart0_core",
+                   CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_OSC),
+       JH71X0_GATE(JH7110_SYSCLK_UART1_APB, "uart1_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GATE(JH7110_SYSCLK_UART1_CORE, "uart1_core", 0,
+                   JH7110_SYSCLK_OSC),
+       JH71X0_GATE(JH7110_SYSCLK_UART2_APB, "uart2_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GATE(JH7110_SYSCLK_UART2_CORE, "uart2_core", 0,
+                   JH7110_SYSCLK_OSC),
+       JH71X0_GATE(JH7110_SYSCLK_UART3_APB, "uart3_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GDIV(JH7110_SYSCLK_UART3_CORE, "uart3_core", 0, 10,
+                   JH7110_SYSCLK_PERH_ROOT),
+       JH71X0_GATE(JH7110_SYSCLK_UART4_APB, "uart4_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GDIV(JH7110_SYSCLK_UART4_CORE, "uart4_core", 0, 10,
+                   JH7110_SYSCLK_PERH_ROOT),
+       JH71X0_GATE(JH7110_SYSCLK_UART5_APB, "uart5_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GDIV(JH7110_SYSCLK_UART5_CORE, "uart5_core", 0, 10,
+                   JH7110_SYSCLK_PERH_ROOT),
+       /* pwmdac */
+       JH71X0_GATE(JH7110_SYSCLK_PWMDAC_APB, "pwmdac_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GDIV(JH7110_SYSCLK_PWMDAC_CORE, "pwmdac_core", 0, 256,
+                   JH7110_SYSCLK_AUDIO_ROOT),
+       /* spdif */
+       JH71X0_GATE(JH7110_SYSCLK_SPDIF_APB, "spdif_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GATE(JH7110_SYSCLK_SPDIF_CORE, "spdif_core", 0,
+                   JH7110_SYSCLK_MCLK),
+       /* i2stx0 */
+       JH71X0_GATE(JH7110_SYSCLK_I2STX0_APB, "i2stx0_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GDIV(JH7110_SYSCLK_I2STX0_BCLK_MST, "i2stx0_bclk_mst", 0, 32,
+                   JH7110_SYSCLK_MCLK),
+       JH71X0__INV(JH7110_SYSCLK_I2STX0_BCLK_MST_INV, "i2stx0_bclk_mst_inv",
+                   JH7110_SYSCLK_I2STX0_BCLK_MST),
+       JH71X0_MDIV(JH7110_SYSCLK_I2STX0_LRCK_MST, "i2stx0_lrck_mst", 64, 2,
+                   JH7110_SYSCLK_I2STX0_BCLK_MST_INV,
+                   JH7110_SYSCLK_I2STX0_BCLK_MST),
+       JH71X0__MUX(JH7110_SYSCLK_I2STX0_BCLK, "i2stx0_bclk",   2,
+                   JH7110_SYSCLK_I2STX0_BCLK_MST,
+                   JH7110_SYSCLK_I2STX_BCLK_EXT),
+       JH71X0__INV(JH7110_SYSCLK_I2STX0_BCLK_INV, "i2stx0_bclk_inv",
+                   JH7110_SYSCLK_I2STX0_BCLK),
+       JH71X0__MUX(JH7110_SYSCLK_I2STX0_LRCK, "i2stx0_lrck", 2,
+                   JH7110_SYSCLK_I2STX0_LRCK_MST,
+                   JH7110_SYSCLK_I2STX_LRCK_EXT),
+       /* i2stx1 */
+       JH71X0_GATE(JH7110_SYSCLK_I2STX1_APB, "i2stx1_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GDIV(JH7110_SYSCLK_I2STX1_BCLK_MST, "i2stx1_bclk_mst", 0, 32,
+                   JH7110_SYSCLK_MCLK),
+       JH71X0__INV(JH7110_SYSCLK_I2STX1_BCLK_MST_INV, "i2stx1_bclk_mst_inv",
+                   JH7110_SYSCLK_I2STX1_BCLK_MST),
+       JH71X0_MDIV(JH7110_SYSCLK_I2STX1_LRCK_MST, "i2stx1_lrck_mst", 64, 2,
+                   JH7110_SYSCLK_I2STX1_BCLK_MST_INV,
+                   JH7110_SYSCLK_I2STX1_BCLK_MST),
+       JH71X0__MUX(JH7110_SYSCLK_I2STX1_BCLK, "i2stx1_bclk", 2,
+                   JH7110_SYSCLK_I2STX1_BCLK_MST,
+                   JH7110_SYSCLK_I2STX_BCLK_EXT),
+       JH71X0__INV(JH7110_SYSCLK_I2STX1_BCLK_INV, "i2stx1_bclk_inv",
+                   JH7110_SYSCLK_I2STX1_BCLK),
+       JH71X0__MUX(JH7110_SYSCLK_I2STX1_LRCK, "i2stx1_lrck", 2,
+                   JH7110_SYSCLK_I2STX1_LRCK_MST,
+                   JH7110_SYSCLK_I2STX_LRCK_EXT),
+       /* i2srx */
+       JH71X0_GATE(JH7110_SYSCLK_I2SRX_APB, "i2srx_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GDIV(JH7110_SYSCLK_I2SRX_BCLK_MST, "i2srx_bclk_mst", 0, 32,
+                   JH7110_SYSCLK_MCLK),
+       JH71X0__INV(JH7110_SYSCLK_I2SRX_BCLK_MST_INV, "i2srx_bclk_mst_inv",
+                   JH7110_SYSCLK_I2SRX_BCLK_MST),
+       JH71X0_MDIV(JH7110_SYSCLK_I2SRX_LRCK_MST, "i2srx_lrck_mst", 64, 2,
+                   JH7110_SYSCLK_I2SRX_BCLK_MST_INV,
+                   JH7110_SYSCLK_I2SRX_BCLK_MST),
+       JH71X0__MUX(JH7110_SYSCLK_I2SRX_BCLK, "i2srx_bclk", 2,
+                   JH7110_SYSCLK_I2SRX_BCLK_MST,
+                   JH7110_SYSCLK_I2SRX_BCLK_EXT),
+       JH71X0__INV(JH7110_SYSCLK_I2SRX_BCLK_INV, "i2srx_bclk_inv",
+                   JH7110_SYSCLK_I2SRX_BCLK),
+       JH71X0__MUX(JH7110_SYSCLK_I2SRX_LRCK, "i2srx_lrck", 2,
+                   JH7110_SYSCLK_I2SRX_LRCK_MST,
+                   JH7110_SYSCLK_I2SRX_LRCK_EXT),
+       /* pdm */
+       JH71X0_GDIV(JH7110_SYSCLK_PDM_DMIC, "pdm_dmic", 0, 64,
+                   JH7110_SYSCLK_MCLK),
+       JH71X0_GATE(JH7110_SYSCLK_PDM_APB, "pdm_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       /* tdm */
+       JH71X0_GATE(JH7110_SYSCLK_TDM_AHB, "tdm_ahb", 0,
+                   JH7110_SYSCLK_AHB0),
+       JH71X0_GATE(JH7110_SYSCLK_TDM_APB, "tdm_apb", 0,
+                   JH7110_SYSCLK_APB0),
+       JH71X0_GDIV(JH7110_SYSCLK_TDM_INTERNAL, "tdm_internal", 0, 64,
+                   JH7110_SYSCLK_MCLK),
+       JH71X0__MUX(JH7110_SYSCLK_TDM_CLK_TDM, "tdm_clk_tdm", 2,
+                   JH7110_SYSCLK_TDM_INTERNAL,
+                   JH7110_SYSCLK_TDM_EXT),
+       JH71X0__INV(JH7110_SYSCLK_TDM_CLK_TDM_N, "tdm_clk_tdm_n",
+                   JH7110_SYSCLK_TDM_CLK_TDM),
+       /* jtag */
+       JH71X0__DIV(JH7110_SYSCLK_JTAG_CERTIFICATION_TRNG,
+                   "jtag_certification_trng", 4,
+                   JH7110_SYSCLK_OSC),
+};
+
+static const struct {
+       const char *name;
+       const char *parent;
+       unsigned int mul;
+       unsigned int div;
+} jh7110_fixed_factor_clocks[JH7110_SYSCLK_END - JH7110_SYSCLK_PLL0_OUT] __initconst = {
+       [JH7110_SYSCLK_PLL0_OUT - JH7110_SYSCLK_PLL0_OUT] = {
+               "pll0_out", "osc", 625, 12 /* 24MHz -> 1250.0MHz */
+       },
+       [JH7110_SYSCLK_PLL1_OUT - JH7110_SYSCLK_PLL0_OUT] = {
+               "pll1_out", "osc", 533, 12 /* 24MHz -> 1066.0MHz */
+       },
+       [JH7110_SYSCLK_PLL2_OUT - JH7110_SYSCLK_PLL0_OUT] = {
+               "pll2_out", "osc", 99, 2 /* 24MHz -> 1188.0MHz */
+       },
+       [JH7110_SYSCLK_PCLK2_MUX_FUNC - JH7110_SYSCLK_PLL0_OUT] = {
+               "pclk2_mux_func", "apb_bus_func", 1, 1
+       },
+       [JH7110_SYSCLK_PCLK2_MUX - JH7110_SYSCLK_PLL0_OUT] = {
+               "pclk2_mux", "pclk2_mux_func", 1, 1
+       },
+       [JH7110_SYSCLK_APB_BUS - JH7110_SYSCLK_PLL0_OUT] = {
+               "apb_bus", "pclk2_mux", 1, 1
+       },
+       [JH7110_SYSCLK_AXI_CFG1 - JH7110_SYSCLK_PLL0_OUT] = {
+               "axi_cfg1", "isp_axi", 1, 1
+       },
+       [JH7110_SYSCLK_APB12 - JH7110_SYSCLK_PLL0_OUT] = {
+               "apb12", "apb_bus", 1, 1
+       },
+       [JH7110_SYSCLK_VOUT_ROOT - JH7110_SYSCLK_PLL0_OUT] = {
+               "vout_root", "pll2_out", 1, 1
+       },

drivers/clk/starfive/clk-starfive-jh7110-sys.c line 533

Quoted 10 lines
drivers/clk/starfive/clk-starfive-jh7110-sys.c new file +10 -0
+       [JH7110_SYSCLK_VENC_ROOT - JH7110_SYSCLK_PLL0_OUT] = {
+               "venc_root", "pll2_out", 1, 1
+       },
+       [JH7110_SYSCLK_VDEC_ROOT - JH7110_SYSCLK_PLL0_OUT] = {
+               "vdec_root", "pll0_out", 1, 1
+       },
+       [JH7110_SYSCLK_GMACUSB_ROOT - JH7110_SYSCLK_PLL0_OUT] = {
+               "gmacusb_root", "pll0_out", 1, 1
+       },
+};

Having these extra 1-1 clocks that can't be controlled anyway seems unnecessary. Consider sync'ing with my latest jh7110 branch at
https://github.com/esmil/linux/tree/jh7110

Quoted 192 lines
drivers/clk/starfive/clk-starfive-jh7110-sys.c new file +117 -0
+
+static struct clk_hw *jh7110_sysclk_get(struct of_phandle_args *clkspec, void *data)
+{
+       struct jh71x0_clk_priv *priv = data;
+       unsigned int idx = clkspec->args[0];
+
+       if (idx < JH7110_SYSCLK_PLL0_OUT)
+               return &priv->reg[idx].hw;
+
+       if (idx < JH7110_SYSCLK_END)
+               return priv->pll[idx - JH7110_SYSCLK_PLL0_OUT];
+
+       return ERR_PTR(-EINVAL);
+}
+
+static int __init jh7110_syscrg_probe(struct platform_device *pdev)
+{
+       struct jh71x0_clk_priv *priv;
+       unsigned int idx;
+       int i, ret;
+
+       priv = devm_kzalloc(&pdev->dev,
+                           struct_size(priv, reg, JH7110_SYSCLK_PLL0_OUT),
+                           GFP_KERNEL);
+       if (!priv)
+               return -ENOMEM;
+
+       spin_lock_init(&priv->rmw_lock);
+       priv->dev = &pdev->dev;
+       priv->base = devm_platform_ioremap_resource(pdev, 0);
+       if (IS_ERR(priv->base))
+               return PTR_ERR(priv->base);
+
+       dev_set_drvdata(priv->dev, priv->base);
+
+       for (i = 0; i < ARRAY_SIZE(jh7110_fixed_factor_clocks); i++) {
+               priv->pll[i] =
+                       devm_clk_hw_register_fixed_factor(&pdev->dev,
+                                                         jh7110_fixed_factor_clocks[i].name,
+                                                         jh7110_fixed_factor_clocks[i].parent,
+                                                         0,
+                                                         jh7110_fixed_factor_clocks[i].mul,
+                                                         jh7110_fixed_factor_clocks[i].div);
+               if (IS_ERR(priv->pll[i]))
+                       return PTR_ERR(priv->pll[i]);
+       }
+
+       for (idx = 0; idx < JH7110_SYSCLK_PLL0_OUT; idx++) {
+               u32 max = jh7110_sysclk_data[idx].max;
+               struct clk_parent_data parents[4] = {};
+               struct clk_init_data init = {
+                       .name = jh7110_sysclk_data[idx].name,
+                       .ops = starfive_jh71x0_clk_ops(max),
+                       .parent_data = parents,
+                       .num_parents =
+                               ((max & JH71X0_CLK_MUX_MASK) >> JH71X0_CLK_MUX_SHIFT) + 1,
+                       .flags = jh7110_sysclk_data[idx].flags,
+               };
+               struct jh71x0_clk *clk = &priv->reg[idx];
+               unsigned int i;
+
+               for (i = 0; i < init.num_parents; i++) {
+                       unsigned int pidx = jh7110_sysclk_data[idx].parents[i];
+
+                       if (pidx < JH7110_SYSCLK_PLL0_OUT)
+                               parents[i].hw = &priv->reg[pidx].hw;
+                       else if (pidx < JH7110_SYSCLK_END)
+                               parents[i].hw = priv->pll[pidx - JH7110_SYSCLK_PLL0_OUT];
+                       else if (pidx == JH7110_SYSCLK_OSC)
+                               parents[i].fw_name = "osc";
+                       else if (pidx == JH7110_SYSCLK_GMAC1_RMII_REFIN)
+                               parents[i].fw_name = "gmac1_rmii_refin";
+                       else if (pidx == JH7110_SYSCLK_GMAC1_RGMII_RXIN)
+                               parents[i].fw_name = "gmac1_rgmii_rxin";
+                       else if (pidx == JH7110_SYSCLK_I2STX_BCLK_EXT)
+                               parents[i].fw_name = "i2stx_bclk_ext";
+                       else if (pidx == JH7110_SYSCLK_I2STX_LRCK_EXT)
+                               parents[i].fw_name = "i2stx_lrck_ext";
+                       else if (pidx == JH7110_SYSCLK_I2SRX_BCLK_EXT)
+                               parents[i].fw_name = "i2srx_bclk_ext";
+                       else if (pidx == JH7110_SYSCLK_I2SRX_LRCK_EXT)
+                               parents[i].fw_name = "i2srx_lrck_ext";
+                       else if (pidx == JH7110_SYSCLK_TDM_EXT)
+                               parents[i].fw_name = "tdm_ext";
+                       else if (pidx == JH7110_SYSCLK_MCLK_EXT)
+                               parents[i].fw_name = "mclk_ext";
+               }
+
+               clk->hw.init = &init;
+               clk->idx = idx;
+               clk->max_div = max & JH71X0_CLK_DIV_MASK;
+
+               ret = devm_clk_hw_register(&pdev->dev, &clk->hw);
+               if (ret)
+                       return ret;
+       }
+
+       ret = devm_of_clk_add_hw_provider(&pdev->dev, jh7110_sysclk_get, priv);
+       if (ret)
+               return ret;
+
+       return jh7110_reset_controller_register(priv, "reset-sys", 0);
+}
+
+static const struct of_device_id jh7110_syscrg_match[] = {
+       { .compatible = "starfive,jh7110-syscrg" },
+       { /* sentinel */ }
+};
+
+static struct platform_driver jh7110_syscrg_driver = {
+       .driver = {
+               .name = "clk-starfive-jh7110-sys",
+               .of_match_table = jh7110_syscrg_match,
+               .suppress_bind_attrs = true,
+       },
+};
+builtin_platform_driver_probe(jh7110_syscrg_driver, jh7110_syscrg_probe);
drivers/clk/starfive/clk-starfive-jh71x0.c +54 -0
index b372083d11c3..dda19c6937cb 100644
@@ -5,6 +5,7 @@
  * Copyright (C) 2021-2022 Emil Renner Berthing <[email protected]>
  */
 
+#include <linux/auxiliary_bus.h>
 #include <linux/clk-provider.h>
 #include <linux/debugfs.h>
 #include <linux/device.h>
@@ -331,3 +332,56 @@ const struct clk_ops *starfive_jh71x0_clk_ops(u32 max)
        return &jh71x0_clk_inv_ops;
 }
 EXPORT_SYMBOL_GPL(starfive_jh71x0_clk_ops);
+
+#if IS_ENABLED(CONFIG_CLK_STARFIVE_JH7110_SYS)
+
+static void jh7110_reset_unregister_adev(void *_adev)
+{
+       struct auxiliary_device *adev = _adev;
+
+       auxiliary_device_delete(adev);
+}
+
+static void jh7110_reset_adev_release(struct device *dev)
+{
+       struct auxiliary_device *adev = to_auxiliary_dev(dev);
+
+       auxiliary_device_uninit(adev);
+
+       kfree(adev);
+}
+
+int jh7110_reset_controller_register(struct jh71x0_clk_priv *priv,
+                                    const char *adev_name,
+                                    u32 adev_id)
+{
+       struct auxiliary_device *adev;
+       int ret;
+
+       adev = kzalloc(sizeof(*adev), GFP_KERNEL);
+       if (!adev)
+               return -ENOMEM;
+
+       adev->name = adev_name;
+       adev->dev.parent = priv->dev;
+       adev->dev.release = jh7110_reset_adev_release;
+       adev->id = adev_id;
+
+       ret = auxiliary_device_init(adev);
+       if (ret) {
+               kfree(adev);
+               return ret;
+       }
+
+       ret = auxiliary_device_add(adev);
+       if (ret) {
+               auxiliary_device_uninit(adev);
+               return ret;
+       }
+
+       return devm_add_action_or_reset(priv->dev,
+                                       jh7110_reset_unregister_adev, adev);
+}
+EXPORT_SYMBOL_GPL(jh7110_reset_controller_register);
+
+#endif
drivers/clk/starfive/clk-starfive-jh71x0.h +0 -0
index baf4b5cb4b8a..7a52e46eb6db 100644
@@ -105,10 +105,18 @@ struct jh71x0_clk_priv {
        spinlock_t rmw_lock;

drivers/clk/starfive/clk-starfive-jh71x0.h struct jh71x0_clk_priv { · line 114

Quoted 10 lines
drivers/clk/starfive/clk-starfive-jh71x0.h +2 -1
        struct device *dev;
        void __iomem *base;
-       struct clk_hw *pll[3];
+       struct clk_hw *pll[12];
        struct jh71x0_clk reg[];
 };
 
 const struct clk_ops *starfive_jh71x0_clk_ops(u32 max);
 
+#if IS_ENABLED(CONFIG_CLK_STARFIVE_JH7110_SYS)

The function below is used both in the syscrg driver and the aoncrg driver, so why guard it like this?

Quoted 10 lines
drivers/clk/starfive/clk-starfive-jh71x0.h +6 -1
+int jh7110_reset_controller_register(struct jh71x0_clk_priv *priv,
+                                    const char *adev_name,
+                                    u32 adev_id);
+
+#endif
+
 #endif
--

2.38.1

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author maintainer
#48 lore raw

Re: [PATCH v2 11/14] clk: starfive: Add StarFive JH7110 system clock driver

Quoted 125 lines · Emil Renner Berthing
Quoted 110 lines · Hal Feng
drivers/clk/starfive/clk-starfive-jh7110-sys.c new file +104 -0
new file mode 100644
index 000000000000..3c1afd691210
@@ -0,0 +1,650 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * StarFive JH7110 System Clock Driver
+ *
+ * Copyright (C) 2022 Emil Renner Berthing <[email protected]>
+ * Copyright (C) 2022 StarFive Technology Co., Ltd.
+ */
+
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+
+#include <dt-bindings/clock/starfive-jh7110.h>
+
+#include "clk-starfive-jh71x0.h"
+
+/* external clocks */
+#define JH7110_SYSCLK_OSC                      (JH7110_SYSCLK_END + 0)
+#define JH7110_SYSCLK_GMAC1_RMII_REFIN         (JH7110_SYSCLK_END + 1)
+#define JH7110_SYSCLK_GMAC1_RGMII_RXIN         (JH7110_SYSCLK_END + 2)
+#define JH7110_SYSCLK_I2STX_BCLK_EXT           (JH7110_SYSCLK_END + 3)
+#define JH7110_SYSCLK_I2STX_LRCK_EXT           (JH7110_SYSCLK_END + 4)
+#define JH7110_SYSCLK_I2SRX_BCLK_EXT           (JH7110_SYSCLK_END + 5)
+#define JH7110_SYSCLK_I2SRX_LRCK_EXT           (JH7110_SYSCLK_END + 6)
+#define JH7110_SYSCLK_TDM_EXT                  (JH7110_SYSCLK_END + 7)
+#define JH7110_SYSCLK_MCLK_EXT                 (JH7110_SYSCLK_END + 8)
+
+static const struct jh71x0_clk_data jh7110_sysclk_data[] __initconst = {
+       /* root */
+       JH71X0__MUX(JH7110_SYSCLK_CPU_ROOT, "cpu_root", 2,
+                   JH7110_SYSCLK_OSC,
+                   JH7110_SYSCLK_PLL0_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_CPU_CORE, "cpu_core", 7,
+                   JH7110_SYSCLK_CPU_ROOT),
+       JH71X0__DIV(JH7110_SYSCLK_CPU_BUS, "cpu_bus", 2,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0__MUX(JH7110_SYSCLK_GPU_ROOT, "gpu_root", 2,
+                   JH7110_SYSCLK_PLL2_OUT,
+                   JH7110_SYSCLK_PLL1_OUT),
+       JH71X0_MDIV(JH7110_SYSCLK_PERH_ROOT, "perh_root", 2, 2,
+                   JH7110_SYSCLK_PLL0_OUT,
+                   JH7110_SYSCLK_PLL2_OUT),
+       JH71X0__MUX(JH7110_SYSCLK_BUS_ROOT, "bus_root", 2,
+                   JH7110_SYSCLK_OSC,
+                   JH7110_SYSCLK_PLL2_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_NOCSTG_BUS, "nocstg_bus", 3,
+                   JH7110_SYSCLK_BUS_ROOT),
+       JH71X0__DIV(JH7110_SYSCLK_AXI_CFG0, "axi_cfg0", 3,
+                   JH7110_SYSCLK_BUS_ROOT),
+       JH71X0__DIV(JH7110_SYSCLK_STG_AXIAHB, "stg_axiahb", 2,
+                   JH7110_SYSCLK_AXI_CFG0),
+       JH71X0_GATE(JH7110_SYSCLK_AHB0, "ahb0", CLK_IS_CRITICAL,
+                   JH7110_SYSCLK_STG_AXIAHB),
+       JH71X0_GATE(JH7110_SYSCLK_AHB1, "ahb1", CLK_IS_CRITICAL,
+                   JH7110_SYSCLK_STG_AXIAHB),
+       JH71X0__DIV(JH7110_SYSCLK_APB_BUS_FUNC, "apb_bus_func", 8,
+                   JH7110_SYSCLK_STG_AXIAHB),
+       JH71X0_GATE(JH7110_SYSCLK_APB0, "apb0", CLK_IS_CRITICAL,
+                   JH7110_SYSCLK_APB_BUS),
+       JH71X0__DIV(JH7110_SYSCLK_PLL0_DIV2, "pll0_div2", 2,
+                   JH7110_SYSCLK_PLL0_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_PLL1_DIV2, "pll1_div2", 2,
+                   JH7110_SYSCLK_PLL1_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_PLL2_DIV2, "pll2_div2", 2,
+                   JH7110_SYSCLK_PLL2_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_AUDIO_ROOT, "audio_root", 8,
+                   JH7110_SYSCLK_PLL2_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_MCLK_INNER, "mclk_inner", 64,
+                   JH7110_SYSCLK_AUDIO_ROOT),
+       JH71X0__MUX(JH7110_SYSCLK_MCLK, "mclk", 2,
+                   JH7110_SYSCLK_MCLK_INNER,
+                   JH7110_SYSCLK_MCLK_EXT),
+       JH71X0_GATE(JH7110_SYSCLK_MCLK_OUT, "mclk_out", 0,
+                   JH7110_SYSCLK_MCLK_INNER),
+       JH71X0_MDIV(JH7110_SYSCLK_ISP_2X, "isp_2x", 8, 2,
+                   JH7110_SYSCLK_PLL2_OUT,
+                   JH7110_SYSCLK_PLL1_OUT),
+       JH71X0__DIV(JH7110_SYSCLK_ISP_AXI, "isp_axi", 4,
+                   JH7110_SYSCLK_ISP_2X),
+       JH71X0_GDIV(JH7110_SYSCLK_GCLK0, "gclk0", 0, 62,
+                   JH7110_SYSCLK_PLL0_DIV2),
+       JH71X0_GDIV(JH7110_SYSCLK_GCLK1, "gclk1", 0, 62,
+                   JH7110_SYSCLK_PLL1_DIV2),
+       JH71X0_GDIV(JH7110_SYSCLK_GCLK2, "gclk2", 0, 62,
+                   JH7110_SYSCLK_PLL2_DIV2),
+       /* cores */
+       JH71X0_GATE(JH7110_SYSCLK_CORE, "core_clk", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_CORE1, "core_clk1", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_CORE2, "core_clk2", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_CORE3, "core_clk3", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_CORE4, "core_clk4", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_DEBUG, "debug_clk", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_BUS),
+       JH71X0__DIV(JH7110_SYSCLK_RTC_TOGGLE, "rtc_toggle", 6,
+                   JH7110_SYSCLK_OSC),
+       JH71X0_GATE(JH7110_SYSCLK_TRACE0, "trace_clk0", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),

drivers/clk/starfive/clk-starfive-jh7110-sys.c line 114

Quoted 10 lines
drivers/clk/starfive/clk-starfive-jh7110-sys.c new file +10 -0
+       JH71X0_GATE(JH7110_SYSCLK_TRACE1, "trace_clk1", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_TRACE2, "trace_clk2", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_TRACE3, "trace_clk3", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_TRACE4, "trace_clk4", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_CORE),
+       JH71X0_GATE(JH7110_SYSCLK_TRACE_COM, "trace_com", CLK_IGNORE_UNUSED,
+                   JH7110_SYSCLK_CPU_BUS),

Why should these clocks not be turned off if they're not critical like the clocks above?

Quoted 2 lines

My guess would be that the clocks for core 1-4 are critical, but maybe not the trace and debug clocks.

I synchronized these flags before with StarFive JH7110 SDK which is not released yet. But you're right, the core clocks should be enabled and the debug/trace clocks could be disabled during system booting. After some discussion, we think it's more appropriate to remove the flags of trace/debug clocks and set the flags of core clocks as CLK_IS_CRITICAL.

Quoted 1 line

[...]

Quoted 41 lines
Quoted 41 lines
drivers/clk/starfive/clk-starfive-jh7110-sys.c new file +41 -0
+};
+
+static const struct {
+       const char *name;
+       const char *parent;
+       unsigned int mul;
+       unsigned int div;
+} jh7110_fixed_factor_clocks[JH7110_SYSCLK_END - JH7110_SYSCLK_PLL0_OUT] __initconst = {
+       [JH7110_SYSCLK_PLL0_OUT - JH7110_SYSCLK_PLL0_OUT] = {
+               "pll0_out", "osc", 625, 12 /* 24MHz -> 1250.0MHz */
+       },
+       [JH7110_SYSCLK_PLL1_OUT - JH7110_SYSCLK_PLL0_OUT] = {
+               "pll1_out", "osc", 533, 12 /* 24MHz -> 1066.0MHz */
+       },
+       [JH7110_SYSCLK_PLL2_OUT - JH7110_SYSCLK_PLL0_OUT] = {
+               "pll2_out", "osc", 99, 2 /* 24MHz -> 1188.0MHz */
+       },
+       [JH7110_SYSCLK_PCLK2_MUX_FUNC - JH7110_SYSCLK_PLL0_OUT] = {
+               "pclk2_mux_func", "apb_bus_func", 1, 1
+       },
+       [JH7110_SYSCLK_PCLK2_MUX - JH7110_SYSCLK_PLL0_OUT] = {
+               "pclk2_mux", "pclk2_mux_func", 1, 1
+       },
+       [JH7110_SYSCLK_APB_BUS - JH7110_SYSCLK_PLL0_OUT] = {
+               "apb_bus", "pclk2_mux", 1, 1
+       },
+       [JH7110_SYSCLK_AXI_CFG1 - JH7110_SYSCLK_PLL0_OUT] = {
+               "axi_cfg1", "isp_axi", 1, 1
+       },
+       [JH7110_SYSCLK_APB12 - JH7110_SYSCLK_PLL0_OUT] = {
+               "apb12", "apb_bus", 1, 1
+       },
+       [JH7110_SYSCLK_VOUT_ROOT - JH7110_SYSCLK_PLL0_OUT] = {
+               "vout_root", "pll2_out", 1, 1
+       },
+       [JH7110_SYSCLK_VENC_ROOT - JH7110_SYSCLK_PLL0_OUT] = {
+               "venc_root", "pll2_out", 1, 1
+       },
+       [JH7110_SYSCLK_VDEC_ROOT - JH7110_SYSCLK_PLL0_OUT] = {
+               "vdec_root", "pll0_out", 1, 1
+       },
Quoted 8 lines

drivers/clk/starfive/clk-starfive-jh7110-sys.c line 533

Quoted 4 lines
drivers/clk/starfive/clk-starfive-jh7110-sys.c new file +4 -0
+       [JH7110_SYSCLK_GMACUSB_ROOT - JH7110_SYSCLK_PLL0_OUT] = {
+               "gmacusb_root", "pll0_out", 1, 1
+       },
+};

Having these extra 1-1 clocks that can't be controlled anyway seems unnecessary. Consider sync'ing with my latest jh7110 branch at
https://github.com/esmil/linux/tree/jh7110

Thanks. I'll have a look.

Quoted 13 lines
Quoted 13 lines
drivers/clk/starfive/clk-starfive-jh71x0.h +1 -1
index baf4b5cb4b8a..7a52e46eb6db 100644
@@ -105,10 +105,18 @@ struct jh71x0_clk_priv {
        spinlock_t rmw_lock;
        struct device *dev;
        void __iomem *base;
-       struct clk_hw *pll[3];
+       struct clk_hw *pll[12];
        struct jh71x0_clk reg[];
 };
 
Quoted 6 lines

drivers/clk/starfive/clk-starfive-jh71x0.h struct jh71x0_clk_priv { · line 114

Quoted 3 lines
drivers/clk/starfive/clk-starfive-jh71x0.h +1 -0
 const struct clk_ops *starfive_jh71x0_clk_ops(u32 max);
 
+#if IS_ENABLED(CONFIG_CLK_STARFIVE_JH7110_SYS)

The function below is used both in the syscrg driver and the aoncrg driver, so why guard it like this?

Because the aoncrg driver depends on the syscrg driver, which is set in Kconfig.

Best regards,
Hal

Quoted 8 lines
Quoted 8 lines
drivers/clk/starfive/clk-starfive-jh71x0.h +6 -0
+int jh7110_reset_controller_register(struct jh71x0_clk_priv *priv,
+                                    const char *adev_name,
+                                    u32 adev_id);
+
+#endif
+
 #endif
author maintainer
#49 lore raw

PATCH v2 12/14 clk: starfive: Add StarFive JH7110 always-on clock driver

In reply to Hal Feng

From: Emil Renner Berthing <[email protected]>

Add driver for the StarFive JH7110 always-on clock controller and register an auxiliary device for always-on reset controller which is named as "reset-aon".

---
 drivers/clk/starfive/Kconfig                  |  10 ++
 drivers/clk/starfive/Makefile                 |   1 +
 .../clk/starfive/clk-starfive-jh7110-aon.c    | 165 ++++++++++++++++++
 3 files changed, 176 insertions(+)
 create mode 100644 drivers/clk/starfive/clk-starfive-jh7110-aon.c
drivers/clk/starfive/Kconfig +10 -0
index 7a6ff6614c74..baa602d384b7 100644
@@ -30,3 +30,13 @@ config CLK_STARFIVE_JH7110_SYS
 	help
 	  Say yes here to support the system clock controller on the
 	  StarFive JH7110 SoC.
+
+config CLK_STARFIVE_JH7110_AON
+	tristate "StarFive JH7110 always-on clock support"
+	depends on CLK_STARFIVE_JH7110_SYS
+	select AUXILIARY_BUS
+	select CLK_STARFIVE_JH71X0
+	default CLK_STARFIVE_JH7110_SYS
+	help
+	  Say yes here to support the always-on clock controller on the
+	  StarFive JH7110 SoC.
drivers/clk/starfive/Makefile +1 -0
index 5ca4e887fb9c..f3df7d957b1e 100644
@@ -5,3 +5,4 @@ obj-$(CONFIG_CLK_STARFIVE_JH7100)	+= clk-starfive-jh7100.o
 obj-$(CONFIG_CLK_STARFIVE_JH7100_AUDIO)	+= clk-starfive-jh7100-audio.o
 
 obj-$(CONFIG_CLK_STARFIVE_JH7110_SYS)	+= clk-starfive-jh7110-sys.o
+obj-$(CONFIG_CLK_STARFIVE_JH7110_AON)	+= clk-starfive-jh7110-aon.o
drivers/clk/starfive/clk-starfive-jh7110-aon.c new file +165 -0

165 lines not on this page · raw message

Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
author maintainer
#50 lore raw

PATCH v2 13/14 reset: starfive: Add StarFive JH7110 reset driver

In reply to Hal Feng

Add auxiliary driver to support StarFive JH7110 system and always-on resets.

---
 drivers/reset/starfive/Kconfig                |  8 +++
 drivers/reset/starfive/Makefile               |  1 +
 .../reset/starfive/reset-starfive-jh7110.c    | 67 +++++++++++++++++++
 .../reset/starfive/reset-starfive-jh71x0.h    |  7 ++
 4 files changed, 83 insertions(+)
 create mode 100644 drivers/reset/starfive/reset-starfive-jh7110.c
drivers/reset/starfive/Kconfig +8 -0
index 9d15c4110e40..fab1a081af17 100644
@@ -10,3 +10,11 @@ config RESET_STARFIVE_JH7100
 	default SOC_STARFIVE
 	help
 	  This enables the reset controller driver for the StarFive JH7100 SoC.
+
+config RESET_STARFIVE_JH7110
+	bool "StarFive JH7110 Reset Driver"
+	depends on AUXILIARY_BUS && CLK_STARFIVE_JH7110_SYS
+	select RESET_STARFIVE_JH71X0
+	default CLK_STARFIVE_JH7110_SYS
+	help
+	  This enables the reset controller driver for the StarFive JH7110 SoC.
drivers/reset/starfive/Makefile +1 -0
index f6aa12466fad..7a44b66fb9d5 100644
@@ -2,3 +2,4 @@
 obj-$(CONFIG_RESET_STARFIVE_JH71X0)		+= reset-starfive-jh71x0.o
 
 obj-$(CONFIG_RESET_STARFIVE_JH7100)		+= reset-starfive-jh7100.o
+obj-$(CONFIG_RESET_STARFIVE_JH7110)		+= reset-starfive-jh7110.o
drivers/reset/starfive/reset-starfive-jh7110.c new file +67 -0

67 lines not on this page · raw message

drivers/reset/starfive/reset-starfive-jh71x0.h +7 -0
index e6b27110de48..63a94ee1b395 100644
@@ -6,6 +6,13 @@
 #ifndef __RESET_STARFIVE_JH71X0_H
 #define __RESET_STARFIVE_JH71X0_H
 
+struct reset_info {
+	unsigned int nr_resets;
+	unsigned int assert_offset;
+	unsigned int status_offset;
+	const u32 *asserted;
+};
+
 int reset_starfive_jh71x0_register(struct device *dev, struct device_node *of_node,
 				   void __iomem *assert, void __iomem *status,
 				   const u32 *asserted, unsigned int nr_resets,
Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#51 lore raw

Re: [PATCH v2 13/14] reset: starfive: Add StarFive JH7110 reset driver

Quoted 78 lines · Hal Feng

Add auxiliary driver to support StarFive JH7110 system and always-on resets.

---
 drivers/reset/starfive/Kconfig                |  8 +++
 drivers/reset/starfive/Makefile               |  1 +
 .../reset/starfive/reset-starfive-jh7110.c    | 67 +++++++++++++++++++
 .../reset/starfive/reset-starfive-jh71x0.h    |  7 ++
 4 files changed, 83 insertions(+)
 create mode 100644 drivers/reset/starfive/reset-starfive-jh7110.c
drivers/reset/starfive/Kconfig +8 -0
index 9d15c4110e40..fab1a081af17 100644
@@ -10,3 +10,11 @@ config RESET_STARFIVE_JH7100
        default SOC_STARFIVE
        help
          This enables the reset controller driver for the StarFive JH7100 SoC.
+
+config RESET_STARFIVE_JH7110
+       bool "StarFive JH7110 Reset Driver"
+       depends on AUXILIARY_BUS && CLK_STARFIVE_JH7110_SYS
+       select RESET_STARFIVE_JH71X0
+       default CLK_STARFIVE_JH7110_SYS
+       help
+         This enables the reset controller driver for the StarFive JH7110 SoC.
drivers/reset/starfive/Makefile +1 -0
index f6aa12466fad..7a44b66fb9d5 100644
@@ -2,3 +2,4 @@
 obj-$(CONFIG_RESET_STARFIVE_JH71X0)            += reset-starfive-jh71x0.o
 
 obj-$(CONFIG_RESET_STARFIVE_JH7100)            += reset-starfive-jh7100.o
+obj-$(CONFIG_RESET_STARFIVE_JH7110)            += reset-starfive-jh7110.o
drivers/reset/starfive/reset-starfive-jh7110.c new file +34 -0
new file mode 100644
index 000000000000..00f3b4ecfb02
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Reset driver for the StarFive JH7110 SoC
+ *
+ * Copyright (C) 2022 StarFive Technology Co., Ltd.
+ * Copyright (C) 2022 Hal Feng <[email protected]>
+ */
+
+#include <linux/auxiliary_bus.h>
+
+#include "reset-starfive-jh71x0.h"
+
+#include <dt-bindings/reset/starfive-jh7110.h>
+
+static int jh7110_reset_probe(struct auxiliary_device *adev,
+                             const struct auxiliary_device_id *id)
+{
+       struct reset_info *info = (struct reset_info *)(id->driver_data);
+       void __iomem *base = dev_get_drvdata(adev->dev.parent);
+
+       if (!info || !base)
+               return -ENODEV;
+
+       return reset_starfive_jh71x0_register(&adev->dev, adev->dev.parent->of_node,
+                                             base + info->assert_offset,
+                                             base + info->status_offset,
+                                             info->asserted,
+                                             info->nr_resets,
+                                             false);
+}
+
+static const struct reset_info jh7110_sys_info = {
+       .nr_resets = JH7110_SYSRST_END,
+       .assert_offset = 0x2F8,

drivers/reset/starfive/reset-starfive-jh7110.c line 44

Quoted 10 lines
drivers/reset/starfive/reset-starfive-jh7110.c new file +10 -0
+       .status_offset = 0x308,
+       .asserted = NULL,
+};
+
+static const struct reset_info jh7110_aon_info = {
+       .nr_resets = JH7110_AONRST_END,
+       .assert_offset = 0x38,
+       .status_offset = 0x3C,
+       .asserted = NULL,
+};

It doesn't seem like syscrg, aoncrg or stgcrg have any inverted lines. Do you know if any other CRGs do? If not you can just leave out the .asserted member and always pass NULL.

Quoted 27 lines
drivers/reset/starfive/reset-starfive-jh7110.c new file +22 -0
+static const struct auxiliary_device_id jh7110_reset_ids[] = {
+       {
+               .name = "clk_starfive_jh71x0.reset-sys",
+               .driver_data = (kernel_ulong_t)&jh7110_sys_info,
+       },
+       {
+               .name = "clk_starfive_jh71x0.reset-aon",
+               .driver_data = (kernel_ulong_t)&jh7110_aon_info,
+       },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(auxiliary, jh7110_reset_ids);
+
+static struct auxiliary_driver jh7110_reset_driver = {
+       .probe          = jh7110_reset_probe,
+       .id_table       = jh7110_reset_ids,
+};
+module_auxiliary_driver(jh7110_reset_driver);
+
+MODULE_DESCRIPTION("StarFive JH7110 Reset Driver");
+MODULE_AUTHOR("Hal Feng <[email protected]>");
+MODULE_LICENSE("GPL");
drivers/reset/starfive/reset-starfive-jh71x0.h +0 -0
index e6b27110de48..63a94ee1b395 100644

drivers/reset/starfive/reset-starfive-jh71x0.h line 14

Quoted 9 lines
drivers/reset/starfive/reset-starfive-jh71x0.h +6 -0
@@ -6,6 +6,13 @@
 #ifndef __RESET_STARFIVE_JH71X0_H
 #define __RESET_STARFIVE_JH71X0_H
 
+struct reset_info {
+       unsigned int nr_resets;
+       unsigned int assert_offset;
+       unsigned int status_offset;
+       const u32 *asserted;
+};

This struct isn't used outside of reset-starfive-jh7110.c, so no need to define it in this header.
Also consider calling it jh7110_reset_info so it blends in with the functions defined in that file.

Quoted 6 lines
drivers/reset/starfive/reset-starfive-jh71x0.h +0 -1
 int reset_starfive_jh71x0_register(struct device *dev, struct device_node *of_node,
                                   void __iomem *assert, void __iomem *status,
                                   const u32 *asserted, unsigned int nr_resets,
--

2.38.1

author maintainer
#52 lore raw

Re: [PATCH v2 13/14] reset: starfive: Add StarFive JH7110 reset driver

Quoted 47 lines · Emil Renner Berthing
Quoted 46 lines · Hal Feng
drivers/reset/starfive/reset-starfive-jh7110.c new file +40 -0
new file mode 100644
index 000000000000..00f3b4ecfb02
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Reset driver for the StarFive JH7110 SoC
+ *
+ * Copyright (C) 2022 StarFive Technology Co., Ltd.
+ * Copyright (C) 2022 Hal Feng <[email protected]>
+ */
+
+#include <linux/auxiliary_bus.h>
+
+#include "reset-starfive-jh71x0.h"
+
+#include <dt-bindings/reset/starfive-jh7110.h>
+
+static int jh7110_reset_probe(struct auxiliary_device *adev,
+                             const struct auxiliary_device_id *id)
+{
+       struct reset_info *info = (struct reset_info *)(id->driver_data);
+       void __iomem *base = dev_get_drvdata(adev->dev.parent);
+
+       if (!info || !base)
+               return -ENODEV;
+
+       return reset_starfive_jh71x0_register(&adev->dev, adev->dev.parent->of_node,
+                                             base + info->assert_offset,
+                                             base + info->status_offset,
+                                             info->asserted,
+                                             info->nr_resets,
+                                             false);
+}
+
+static const struct reset_info jh7110_sys_info = {
+       .nr_resets = JH7110_SYSRST_END,
+       .assert_offset = 0x2F8,
+       .status_offset = 0x308,
+       .asserted = NULL,
+};
+
+static const struct reset_info jh7110_aon_info = {
+       .nr_resets = JH7110_AONRST_END,
Quoted 8 lines

drivers/reset/starfive/reset-starfive-jh7110.c line 44

Quoted 4 lines
drivers/reset/starfive/reset-starfive-jh7110.c new file +4 -0
+       .assert_offset = 0x38,
+       .status_offset = 0x3C,
+       .asserted = NULL,
+};

It doesn't seem like syscrg, aoncrg or stgcrg have any inverted lines. Do you know if any other CRGs do? If not you can just leave out the .asserted member and always pass NULL.

All JH7110 CRGs don't have inverted lines, and it could be modified as what you said.

Quoted 31 lines
Quoted 31 lines
drivers/reset/starfive/reset-starfive-jh7110.c new file +22 -0
+static const struct auxiliary_device_id jh7110_reset_ids[] = {
+       {
+               .name = "clk_starfive_jh71x0.reset-sys",
+               .driver_data = (kernel_ulong_t)&jh7110_sys_info,
+       },
+       {
+               .name = "clk_starfive_jh71x0.reset-aon",
+               .driver_data = (kernel_ulong_t)&jh7110_aon_info,
+       },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(auxiliary, jh7110_reset_ids);
+
+static struct auxiliary_driver jh7110_reset_driver = {
+       .probe          = jh7110_reset_probe,
+       .id_table       = jh7110_reset_ids,
+};
+module_auxiliary_driver(jh7110_reset_driver);
+
+MODULE_DESCRIPTION("StarFive JH7110 Reset Driver");
+MODULE_AUTHOR("Hal Feng <[email protected]>");
+MODULE_LICENSE("GPL");
drivers/reset/starfive/reset-starfive-jh71x0.h +0 -0
index e6b27110de48..63a94ee1b395 100644
@@ -6,6 +6,13 @@
 #ifndef __RESET_STARFIVE_JH71X0_H
 #define __RESET_STARFIVE_JH71X0_H
 
Quoted 11 lines

drivers/reset/starfive/reset-starfive-jh71x0.h line 14

Quoted 6 lines
drivers/reset/starfive/reset-starfive-jh71x0.h +6 -0
+struct reset_info {
+       unsigned int nr_resets;
+       unsigned int assert_offset;
+       unsigned int status_offset;
+       const u32 *asserted;
+};

This struct isn't used outside of reset-starfive-jh7110.c, so no need to define it in this header.
Also consider calling it jh7110_reset_info so it blends in with the functions defined in that file.

Maybe it can be used in JH7100 audio reset?

Best regards,
Hal

Quoted 4 lines

drivers/reset/starfive/reset-starfive-jh71x0.h line 18

Quoted 4 lines
drivers/reset/starfive/reset-starfive-jh71x0.h +0 -0
 int reset_starfive_jh71x0_register(struct device *dev, struct device_node *of_node,
                                   void __iomem *assert, void __iomem *status,
                                   const u32 *asserted, unsigned int nr_resets,

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author maintainer
#53 lore raw

PATCH v2 14/14 clk: starfive: jh71x0: Don't register aux devices if JH7110 reset is disabled

In reply to Hal Feng

The JH7110 clock drivers will not register redundant auxiliary devices if the JH7110 reset auxiliary driver is disabled.

---
 drivers/clk/starfive/clk-starfive-jh71x0.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/clk/starfive/clk-starfive-jh71x0.c +10 -1
index dda19c6937cb..4e69f56b00cc 100644
@@ -333,7 +333,7 @@ const struct clk_ops *starfive_jh71x0_clk_ops(u32 max)
 }
 EXPORT_SYMBOL_GPL(starfive_jh71x0_clk_ops);
 
-#if IS_ENABLED(CONFIG_CLK_STARFIVE_JH7110_SYS)
+#if IS_ENABLED(CONFIG_RESET_STARFIVE_JH7110)
 
 static void jh7110_reset_unregister_adev(void *_adev)
 {
@@ -384,4 +384,13 @@ int jh7110_reset_controller_register(struct jh71x0_clk_priv *priv,
 }
 EXPORT_SYMBOL_GPL(jh7110_reset_controller_register);
 
+#else /* !CONFIG_RESET_STARFIVE_JH7110 */
+
+int jh7110_reset_controller_register(struct jh71x0_clk_priv *priv,
+				     const char *adev_name,
+				     u32 adev_id)
+{
+	return 0;
+}
+
 #endif
Signature · 7 lines
2.38.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
#54 lore raw

Re: [PATCH v2 14/14] clk: starfive: jh71x0: Don't register aux devices if JH7110 reset is disabled

Quoted 14 lines · Hal Feng

The JH7110 clock drivers will not register redundant auxiliary devices if the JH7110 reset auxiliary driver is disabled.

---
 drivers/clk/starfive/clk-starfive-jh71x0.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/clk/starfive/clk-starfive-jh71x0.c +0 -0
index dda19c6937cb..4e69f56b00cc 100644

drivers/clk/starfive/clk-starfive-jh71x0.c const struct clk_ops *starfive_jh71x0_clk_ops(u32 max) · line 336

Quoted 5 lines
drivers/clk/starfive/clk-starfive-jh71x0.c +1 -1
@@ -333,7 +333,7 @@ const struct clk_ops *starfive_jh71x0_clk_ops(u32 max)
 }
 EXPORT_SYMBOL_GPL(starfive_jh71x0_clk_ops);
 
-#if IS_ENABLED(CONFIG_CLK_STARFIVE_JH7110_SYS)
+#if IS_ENABLED(CONFIG_RESET_STARFIVE_JH7110)

I don't see any reason you'd want to build a kernel that needs the clock driver but not the resets, so I don't think this is something we should optimize for. I'd just drop this patch and let such broken kernels register the auxiliary devices even when no reset driver is there to use them.

Quoted 19 lines
drivers/clk/starfive/clk-starfive-jh71x0.c +9 -1
 static void jh7110_reset_unregister_adev(void *_adev)
 {
@@ -384,4 +384,13 @@ int jh7110_reset_controller_register(struct jh71x0_clk_priv *priv,
 }
 EXPORT_SYMBOL_GPL(jh7110_reset_controller_register);
 
+#else /* !CONFIG_RESET_STARFIVE_JH7110 */
+
+int jh7110_reset_controller_register(struct jh71x0_clk_priv *priv,
+                                    const char *adev_name,
+                                    u32 adev_id)
+{
+       return 0;
+}
+
 #endif
--

2.38.1

author maintainer
#55 lore raw

Re: [PATCH v2 14/14] clk: starfive: jh71x0: Don't register aux devices if JH7110 reset is disabled

Quoted 18 lines · Emil Renner Berthing
Quoted 17 lines · Hal Feng

The JH7110 clock drivers will not register redundant auxiliary devices if the JH7110 reset auxiliary driver is disabled.

---
 drivers/clk/starfive/clk-starfive-jh71x0.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/clk/starfive/clk-starfive-jh71x0.c +0 -0
index dda19c6937cb..4e69f56b00cc 100644
@@ -333,7 +333,7 @@ const struct clk_ops *starfive_jh71x0_clk_ops(u32 max)
 }
 EXPORT_SYMBOL_GPL(starfive_jh71x0_clk_ops);
 
Quoted 8 lines

drivers/clk/starfive/clk-starfive-jh71x0.c const struct clk_ops *starfive_jh71x0_clk_ops(u32 max) · line 336

Quoted 2 lines
drivers/clk/starfive/clk-starfive-jh71x0.c +1 -1
-#if IS_ENABLED(CONFIG_CLK_STARFIVE_JH7110_SYS)
+#if IS_ENABLED(CONFIG_RESET_STARFIVE_JH7110)

I don't see any reason you'd want to build a kernel that needs the clock driver but not the resets, so I don't think this is something we should optimize for. I'd just drop this patch and let such broken kernels register the auxiliary devices even when no reset driver is there to use them.

You're right. I made this patch just following the style of jh7100. And I think it's better to select RESET_STARFIVE_JH7110 in config CLK_STARFIVE_JH7110_SYS.

Best regards,
Hal

Quoted 17 lines
Quoted 17 lines
drivers/clk/starfive/clk-starfive-jh71x0.c +9 -0
 static void jh7110_reset_unregister_adev(void *_adev)
 {
@@ -384,4 +384,13 @@ int jh7110_reset_controller_register(struct jh71x0_clk_priv *priv,
 }
 EXPORT_SYMBOL_GPL(jh7110_reset_controller_register);
 
+#else /* !CONFIG_RESET_STARFIVE_JH7110 */
+
+int jh7110_reset_controller_register(struct jh71x0_clk_priv *priv,
+                                    const char *adev_name,
+                                    u32 adev_id)
+{
+       return 0;
+}
+
 #endif