reset: mchp: sparx5: Extend support for lan966x

This patch extends sparx5 driver to support also the lan966x. The
process to reset the switch is the same only it has different offsets.
Therefore make the driver more generic and add support for lan966x.

Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Steen Hegelund <steen.hegelund@microchip.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Link: https://lore.kernel.org/r/20211018091522.1113510-3-horatiu.vultur@microchip.com
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index f9d8b364db5f64b3fa1f101f3b023385518b59a1..c1973dcbbac8d6dbfc96c9571380cae2007190a8 100644 (file)
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -116,7 +116,7 @@ config RESET_LPC18XX
 
 config RESET_MCHP_SPARX5
        bool "Microchip Sparx5 reset driver"
-       depends on ARCH_SPARX5 || COMPILE_TEST
+       depends on ARCH_SPARX5 || SOC_LAN966 || COMPILE_TEST
        default y if SPARX5_SWITCH
        select MFD_SYSCON
        help

diff --git a/drivers/reset/reset-microchip-sparx5.c b/drivers/reset/reset-microchip-sparx5.c
index f01e7db8e83b06a00bb28a480c1f07cc393354c0..00b612a0effa11729c6c71c4165385a769f09cee 100644 (file)
--- a/drivers/reset/reset-microchip-sparx5.c
+++ b/drivers/reset/reset-microchip-sparx5.c
@@ -13,15 +13,18 @@
 #include <linux/regmap.h>
 #include <linux/reset-controller.h>
 
-#define PROTECT_REG    0x84
-#define PROTECT_BIT    BIT(10)
-#define SOFT_RESET_REG 0x00
-#define SOFT_RESET_BIT BIT(1)
+struct reset_props {
+       u32 protect_reg;
+       u32 protect_bit;
+       u32 reset_reg;
+       u32 reset_bit;
+};
 
 struct mchp_reset_context {
        struct regmap *cpu_ctrl;
        struct regmap *gcb_ctrl;
        struct reset_controller_dev rcdev;
+       const struct reset_props *props;
 };
 
 static struct regmap_config sparx5_reset_regmap_config = {
@@ -38,14 +41,16 @@ static int sparx5_switch_reset(struct reset_controller_dev *rcdev,
        u32 val;
 
        /* Make sure the core is PROTECTED from reset */
-       regmap_update_bits(ctx->cpu_ctrl, PROTECT_REG, PROTECT_BIT, PROTECT_BIT);
+       regmap_update_bits(ctx->cpu_ctrl, ctx->props->protect_reg,
+                          ctx->props->protect_bit, ctx->props->protect_bit);
 
        /* Start soft reset */
-       regmap_write(ctx->gcb_ctrl, SOFT_RESET_REG, SOFT_RESET_BIT);
+       regmap_write(ctx->gcb_ctrl, ctx->props->reset_reg,
+                    ctx->props->reset_bit);
 
        /* Wait for soft reset done */
-       return regmap_read_poll_timeout(ctx->gcb_ctrl, SOFT_RESET_REG, val,
-                                       (val & SOFT_RESET_BIT) == 0,
+       return regmap_read_poll_timeout(ctx->gcb_ctrl, ctx->props->reset_reg, val,
+                                       (val & ctx->props->reset_bit) == 0,
                                        1, 100);
 }
 
@@ -115,13 +120,32 @@ static int mchp_sparx5_reset_probe(struct platform_device *pdev)
        ctx->rcdev.nr_resets = 1;
        ctx->rcdev.ops = &sparx5_reset_ops;
        ctx->rcdev.of_node = dn;
+       ctx->props = device_get_match_data(&pdev->dev);
 
        return devm_reset_controller_register(&pdev->dev, &ctx->rcdev);
 }
 
+static const struct reset_props reset_props_sparx5 = {
+       .protect_reg    = 0x84,
+       .protect_bit    = BIT(10),
+       .reset_reg      = 0x0,
+       .reset_bit      = BIT(1),
+};
+
+static const struct reset_props reset_props_lan966x = {
+       .protect_reg    = 0x88,
+       .protect_bit    = BIT(5),
+       .reset_reg      = 0x0,
+       .reset_bit      = BIT(1),
+};
+
 static const struct of_device_id mchp_sparx5_reset_of_match[] = {
        {
                .compatible = "microchip,sparx5-switch-reset",
+               .data = &reset_props_sparx5,
+       }, {
+               .compatible = "microchip,lan966x-switch-reset",
+               .data = &reset_props_lan966x,
        },
        { }
 };