reset: starfive: Rename "jh7100" to "jh71x0" for the common code

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

Co-developed-by: Emil Renner Berthing <kernel@esmil.dk>
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
Signed-off-by: Hal Feng <hal.feng@starfivetech.com>

diff --git a/drivers/reset/starfive/reset-starfive-jh7100.c b/drivers/reset/starfive/reset-starfive-jh7100.c
index 43248e8..4be8510 100644 (file)
--- a/drivers/reset/starfive/reset-starfive-jh7100.c
+++ b/drivers/reset/starfive/reset-starfive-jh7100.c
@@ -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,

diff --git a/drivers/reset/starfive/reset-starfive-jh71x0.c b/drivers/reset/starfive/reset-starfive-jh71x0.c
index 1e230f3..fa80912 100644 (file)
--- a/drivers/reset/starfive/reset-starfive-jh71x0.c
+++ b/drivers/reset/starfive/reset-starfive-jh71x0.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * Reset driver for the StarFive JH7100 SoC
+ * Reset driver for the StarFive JH71X0 SoCs
  *
  * Copyright (C) 2021 Emil Renner Berthing <kernel@esmil.dk>
  */
@@ -13,7 +13,7 @@
 #include <linux/reset-controller.h>
 #include <linux/spinlock.h>
 
-struct jh7100_reset {
+struct jh71x0_reset {
        struct reset_controller_dev rcdev;
        /* protect registers against concurrent read-modify-write */
        spinlock_t lock;
@@ -22,16 +22,16 @@ struct jh7100_reset {
        const u64 *asserted;
 };
 
-static inline struct jh7100_reset *
-jh7100_reset_from(struct reset_controller_dev *rcdev)
+static inline struct jh71x0_reset *
+jh71x0_reset_from(struct reset_controller_dev *rcdev)
 {
-       return container_of(rcdev, struct jh7100_reset, rcdev);
+       return container_of(rcdev, struct jh71x0_reset, rcdev);
 }
 
-static int jh7100_reset_update(struct reset_controller_dev *rcdev,
+static int jh71x0_reset_update(struct reset_controller_dev *rcdev,
                               unsigned long id, bool assert)
 {
-       struct jh7100_reset *data = jh7100_reset_from(rcdev);
+       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);
@@ -60,34 +60,34 @@ static int jh7100_reset_update(struct reset_controller_dev *rcdev,
        return ret;
 }
 
-static int jh7100_reset_assert(struct reset_controller_dev *rcdev,
+static int jh71x0_reset_assert(struct reset_controller_dev *rcdev,
                               unsigned long id)
 {
-       return jh7100_reset_update(rcdev, id, true);
+       return jh71x0_reset_update(rcdev, id, true);
 }
 
-static int jh7100_reset_deassert(struct reset_controller_dev *rcdev,
+static int jh71x0_reset_deassert(struct reset_controller_dev *rcdev,
                                 unsigned long id)
 {
-       return jh7100_reset_update(rcdev, id, false);
+       return jh71x0_reset_update(rcdev, id, false);
 }
 
-static int jh7100_reset_reset(struct reset_controller_dev *rcdev,
+static int jh71x0_reset_reset(struct reset_controller_dev *rcdev,
                              unsigned long id)
 {
        int ret;
 
-       ret = jh7100_reset_assert(rcdev, id);
+       ret = jh71x0_reset_assert(rcdev, id);
        if (ret)
                return ret;
 
-       return jh7100_reset_deassert(rcdev, id);
+       return jh71x0_reset_deassert(rcdev, id);
 }
 
-static int jh7100_reset_status(struct reset_controller_dev *rcdev,
+static int jh71x0_reset_status(struct reset_controller_dev *rcdev,
                               unsigned long id)
 {
-       struct jh7100_reset *data = jh7100_reset_from(rcdev);
+       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);
@@ -96,25 +96,25 @@ static int jh7100_reset_status(struct reset_controller_dev *rcdev,
        return !((value ^ data->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 const struct reset_control_ops jh71x0_reset_ops = {
+       .assert         = jh71x0_reset_assert,
+       .deassert       = jh71x0_reset_deassert,
+       .reset          = jh71x0_reset_reset,
+       .status         = jh71x0_reset_status,
 };
 
-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)
 {
-       struct jh7100_reset *data;
+       struct jh71x0_reset *data;
 
        data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
-       data->rcdev.ops = &jh7100_reset_ops;
+       data->rcdev.ops = &jh71x0_reset_ops;
        if (is_module)
                data->rcdev.owner = THIS_MODULE;
        data->rcdev.nr_resets = nr_resets;
@@ -128,4 +128,4 @@ int reset_starfive_jh7100_register(struct device *dev, struct device_node *of_no
 
        return devm_reset_controller_register(dev, &data->rcdev);
 }
-EXPORT_SYMBOL_GPL(reset_starfive_jh7100_register);
+EXPORT_SYMBOL_GPL(reset_starfive_jh71x0_register);

diff --git a/drivers/reset/starfive/reset-starfive-jh71x0.h b/drivers/reset/starfive/reset-starfive-jh71x0.h
index 10770c5..3c70982 100644 (file)
--- a/drivers/reset/starfive/reset-starfive-jh71x0.h
+++ b/drivers/reset/starfive/reset-starfive-jh71x0.h
@@ -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);