Commit d11db044 authored by Herve Codina's avatar Herve Codina Committed by Linus Walleij
Browse files

pinctrl: spear: spear: Convert to regmap 



Resources need to be shared between pinmux and plgpio.

Use regmap (syscon) to access resources to allow an
easy way to share resources.

Signed-off-by: default avatarHerve Codina <herve.codina@bootlin.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Link: https://lore.kernel.org/r/20211202095255.165797-2-herve.codina@bootlin.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 896568e5

drivers/pinctrl/spear/pinctrl-spear.c

+7 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 */



#include <linux/err.h>

#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_address.h>
@@ -367,9 +368,12 @@ int spear_pinctrl_probe(struct platform_device *pdev, 
	if (!pmx)

		return -ENOMEM;



	pmx->vbase = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(pmx->vbase))

		return PTR_ERR(pmx->vbase);

	pmx->regmap = device_node_to_regmap(np);

	if (IS_ERR(pmx->regmap)) {

		dev_err(&pdev->dev, "Init regmap failed (%pe).\n",

			pmx->regmap);

		return PTR_ERR(pmx->regmap);

	}



	pmx->dev = &pdev->dev;

	pmx->machdata = machdata;

drivers/pinctrl/spear/pinctrl-spear.h

+8 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/gpio/driver.h>

#include <linux/io.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/regmap.h>

#include <linux/types.h>



struct platform_device;
@@ -172,24 +173,27 @@ struct spear_pinctrl_machdata { 
 * @dev: pointer to struct dev of platform_device registered

 * @pctl: pointer to struct pinctrl_dev

 * @machdata: pointer to SoC or machine specific structure

 * @vbase: virtual base address of pinmux controller

 * @regmap: regmap of pinmux controller

 */

struct spear_pmx {

	struct device *dev;

	struct pinctrl_dev *pctl;

	struct spear_pinctrl_machdata *machdata;

	void __iomem *vbase;

	struct regmap *regmap;

};



/* exported routines */

static inline u32 pmx_readl(struct spear_pmx *pmx, u32 reg)

{

	return readl_relaxed(pmx->vbase + reg);

	u32 val;



	regmap_read(pmx->regmap, reg, &val);

	return val;

}



static inline void pmx_writel(struct spear_pmx *pmx, u32 val, u32 reg)

{

	writel_relaxed(val, pmx->vbase + reg);

	regmap_write(pmx->regmap, reg, val);

}



void pmx_init_addr(struct spear_pinctrl_machdata *machdata, u16 reg);