[v15,mfd,6/9] pinctrl: microchip-sgpio: add ability to be used in a non-mmio configuration

Commit Message

Colin Foster Aug. 3, 2022, 5:47 a.m. UTC

There are a few Ocelot chips that can contain SGPIO logic, but can be
controlled externally. Specifically the VSC7511, 7512, 7513, and 7514. In
the externally controlled configurations these registers are not
memory-mapped.

Add support for these non-memory-mapped configurations.

Signed-off-by: Colin Foster <[e-mail]>
Reviewed-by: Vladimir Oltean <[e-mail]>
Acked-by: Linus Walleij <[e-mail]>
---

(No changes since v14)

v14
    * Add Reviewed and Acked tags

---
 drivers/pinctrl/pinctrl-microchip-sgpio.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

Andy Shevchenko Aug. 3, 2022, 11:32 a.m. UTC | #1

On Wed, Aug 3, 2022 at 7:47 AM Colin Foster
<[e-mail]> wrote:
>
> There are a few Ocelot chips that can contain SGPIO logic, but can be
> controlled externally. Specifically the VSC7511, 7512, 7513, and 7514. In
> the externally controlled configurations these registers are not
> memory-mapped.
>
> Add support for these non-memory-mapped configurations.

FWIW,
Reviewed-by: Andy Shevchenko <[e-mail]>

> Signed-off-by: Colin Foster <[e-mail]>
> Reviewed-by: Vladimir Oltean <[e-mail]>
> Acked-by: Linus Walleij <[e-mail]>
> ---
>
> (No changes since v14)
>
> v14
>     * Add Reviewed and Acked tags
>
> ---
>  drivers/pinctrl/pinctrl-microchip-sgpio.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-microchip-sgpio.c b/drivers/pinctrl/pinctrl-microchip-sgpio.c
> index e56074b7e659..2b4167a09b3b 100644
> --- a/drivers/pinctrl/pinctrl-microchip-sgpio.c
> +++ b/drivers/pinctrl/pinctrl-microchip-sgpio.c
> @@ -12,6 +12,7 @@
>  #include <linux/clk.h>
>  #include <linux/gpio/driver.h>
>  #include <linux/io.h>
> +#include <linux/mfd/ocelot.h>
>  #include <linux/mod_devicetable.h>
>  #include <linux/module.h>
>  #include <linux/pinctrl/pinmux.h>
> @@ -904,7 +905,6 @@ static int microchip_sgpio_probe(struct platform_device *pdev)
>         struct reset_control *reset;
>         struct sgpio_priv *priv;
>         struct clk *clk;
> -       u32 __iomem *regs;
>         u32 val;
>         struct regmap_config regmap_config = {
>                 .reg_bits = 32,
> @@ -937,11 +937,7 @@ static int microchip_sgpio_probe(struct platform_device *pdev)
>                 return -EINVAL;
>         }
>
> -       regs = devm_platform_ioremap_resource(pdev, 0);
> -       if (IS_ERR(regs))
> -               return PTR_ERR(regs);
> -
> -       priv->regs = devm_regmap_init_mmio(dev, regs, &regmap_config);
> +       priv->regs = ocelot_regmap_from_resource(pdev, 0, &regmap_config);
>         if (IS_ERR(priv->regs))
>                 return PTR_ERR(priv->regs);
>
> --
> 2.25.1
>

Patch

diff --git a/drivers/pinctrl/pinctrl-microchip-sgpio.c b/drivers/pinctrl/pinctrl-microchip-sgpio.c
index e56074b7e659..2b4167a09b3b 100644
--- a/drivers/pinctrl/pinctrl-microchip-sgpio.c
+++ b/drivers/pinctrl/pinctrl-microchip-sgpio.c
@@ -12,6 +12,7 @@ 
 #include <linux/clk.h>
 #include <linux/gpio/driver.h>
 #include <linux/io.h>
+#include <linux/mfd/ocelot.h>
 #include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/pinctrl/pinmux.h>
@@ -904,7 +905,6 @@  static int microchip_sgpio_probe(struct platform_device *pdev)
 	struct reset_control *reset;
 	struct sgpio_priv *priv;
 	struct clk *clk;
-	u32 __iomem *regs;
 	u32 val;
 	struct regmap_config regmap_config = {
 		.reg_bits = 32,
@@ -937,11 +937,7 @@  static int microchip_sgpio_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	regs = devm_platform_ioremap_resource(pdev, 0);
-	if (IS_ERR(regs))
-		return PTR_ERR(regs);
-
-	priv->regs = devm_regmap_init_mmio(dev, regs, &regmap_config);
+	priv->regs = ocelot_regmap_from_resource(pdev, 0, &regmap_config);
 	if (IS_ERR(priv->regs))
 		return PTR_ERR(priv->regs);