Commit ce852837 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

pinctrl: Propagate firmware node from a parent device 



When creating MFD platform devices the firmware node is left unset.
This, in particular, prevents GPIO library to use it for different
purposes. Propagate firmware node from the parent device and let
GPIO library do the right thing.

While at it, slightly modify the headers to reflect the usage of APIs.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Link: https://lore.kernel.org/r/20211216151227.58687-1-andriy.shevchenko@linux.intel.com


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

drivers/pinctrl/cirrus/pinctrl-madera-core.c

+4 −1
Original line number Diff line number Diff line
@@ -8,8 +8,10 @@ 
#include <linux/err.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/regmap.h>

#include <linux/slab.h>



#include <linux/pinctrl/machine.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinmux.h>
@@ -1004,13 +1006,14 @@ static int madera_pin_probe(struct platform_device *pdev) 


	dev_dbg(&pdev->dev, "%s\n", __func__);



	device_set_node(&pdev->dev, dev_fwnode(pdev->dev.parent));



	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	priv->dev = &pdev->dev;

	priv->madera = madera;

	pdev->dev.of_node = madera->dev->of_node;



	switch (madera->type) {

	case CS47L15:

drivers/pinctrl/pinctrl-as3722.c

+7 −6
Original line number Diff line number Diff line
@@ -23,19 +23,20 @@ 
#include <linux/delay.h>

#include <linux/gpio/driver.h>

#include <linux/kernel.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/mfd/as3722.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/pm.h>

#include <linux/property.h>

#include <linux/slab.h>



#include <linux/pinctrl/consumer.h>

#include <linux/pinctrl/machine.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinconf-generic.h>

#include <linux/pinctrl/pinconf.h>

#include <linux/pinctrl/pinmux.h>

#include <linux/pm.h>

#include <linux/slab.h>



#include "core.h"

#include "pinconf.h"
@@ -551,12 +552,13 @@ static int as3722_pinctrl_probe(struct platform_device *pdev) 
	struct as3722_pctrl_info *as_pci;

	int ret;



	device_set_node(&pdev->dev, dev_fwnode(pdev->dev.parent));



	as_pci = devm_kzalloc(&pdev->dev, sizeof(*as_pci), GFP_KERNEL);

	if (!as_pci)

		return -ENOMEM;



	as_pci->dev = &pdev->dev;

	as_pci->dev->of_node = pdev->dev.parent->of_node;

	as_pci->as3722 = dev_get_drvdata(pdev->dev.parent);

	platform_set_drvdata(pdev, as_pci);
@@ -578,7 +580,6 @@ static int as3722_pinctrl_probe(struct platform_device *pdev) 


	as_pci->gpio_chip = as3722_gpio_chip;

	as_pci->gpio_chip.parent = &pdev->dev;

	as_pci->gpio_chip.of_node = pdev->dev.parent->of_node;

	ret = gpiochip_add_data(&as_pci->gpio_chip, as_pci);

	if (ret < 0) {

		dev_err(&pdev->dev, "Couldn't register gpiochip, %d\n", ret);

drivers/pinctrl/pinctrl-da9062.c

+3 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/bits.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/regmap.h>



#include <linux/gpio/driver.h>
@@ -256,6 +257,8 @@ static int da9062_pctl_probe(struct platform_device *pdev) 
	struct da9062_pctl *pctl;

	int i;



	device_set_node(&pdev->dev, dev_fwnode(pdev->dev.parent));



	pctl = devm_kzalloc(&pdev->dev, sizeof(*pctl), GFP_KERNEL);

	if (!pctl)

		return -ENOMEM;
@@ -277,9 +280,6 @@ static int da9062_pctl_probe(struct platform_device *pdev) 
	pctl->gc = reference_gc;

	pctl->gc.label = dev_name(&pdev->dev);

	pctl->gc.parent = &pdev->dev;

#ifdef CONFIG_OF_GPIO

	pctl->gc.of_node = parent->of_node;

#endif



	platform_set_drvdata(pdev, pctl);

drivers/pinctrl/pinctrl-max77620.c

+7 −4
Original line number Diff line number Diff line
@@ -10,14 +10,16 @@ 
 */



#include <linux/mfd/max77620.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/regmap.h>



#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinconf-generic.h>

#include <linux/pinctrl/pinconf.h>

#include <linux/pinctrl/pinmux.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>



#include "core.h"

#include "pinconf.h"
@@ -551,12 +553,13 @@ static int max77620_pinctrl_probe(struct platform_device *pdev) 
	struct max77620_pctrl_info *mpci;

	int i;



	device_set_node(&pdev->dev, dev_fwnode(pdev->dev.parent));



	mpci = devm_kzalloc(&pdev->dev, sizeof(*mpci), GFP_KERNEL);

	if (!mpci)

		return -ENOMEM;



	mpci->dev = &pdev->dev;

	mpci->dev->of_node = pdev->dev.parent->of_node;

	mpci->rmap = max77620->rmap;



	mpci->pins = max77620_pins_desc;

drivers/pinctrl/pinctrl-rk805.c

+6 −6
Original line number Diff line number Diff line
@@ -13,17 +13,17 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/mfd/rk808.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/pm.h>

#include <linux/property.h>

#include <linux/slab.h>



#include <linux/pinctrl/consumer.h>

#include <linux/pinctrl/machine.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinconf-generic.h>

#include <linux/pinctrl/pinconf.h>

#include <linux/pinctrl/pinmux.h>

#include <linux/pm.h>

#include <linux/slab.h>



#include "core.h"

#include "pinconf.h"
@@ -420,18 +420,18 @@ static int rk805_pinctrl_probe(struct platform_device *pdev) 
	struct rk805_pctrl_info *pci;

	int ret;



	device_set_node(&pdev->dev, dev_fwnode(pdev->dev.parent));



	pci = devm_kzalloc(&pdev->dev, sizeof(*pci), GFP_KERNEL);

	if (!pci)

		return -ENOMEM;



	pci->dev = &pdev->dev;

	pci->dev->of_node = pdev->dev.parent->of_node;

	pci->rk808 = dev_get_drvdata(pdev->dev.parent);



	pci->pinctrl_desc = rk805_pinctrl_desc;

	pci->gpio_chip = rk805_gpio_chip;

	pci->gpio_chip.parent = &pdev->dev;

	pci->gpio_chip.of_node = pdev->dev.parent->of_node;



	platform_set_drvdata(pdev, pci);