@@ -6,10 +6,12 @@
* Copyright (C) 2016 Jonas Gorski <jonas.gorski@gmail.com>
*/
+#include <linux/gpio/driver.h>
#include <linux/gpio/regmap.h>
#include <linux/mfd/syscon.h>
#include <linux/mod_devicetable.h>
#include <linux/of.h>
+#include <linux/pinctrl/consumer.h>
#include <linux/platform_device.h>
#include "pinctrl-bcm63xx.h"
@@ -32,6 +34,16 @@ static int bcm63xx_reg_mask_xlate(struct gpio_regmap *gpio,
return 0;
}
+static int bcm63xx_request(struct gpio_chip *chip, unsigned int offset)
+{
+ return pinctrl_gpio_request(chip, offset);
+}
+
+static void bcm63xx_free(struct gpio_chip *chip, unsigned int offset)
+{
+ pinctrl_gpio_free(chip, offset);
+}
+
static const struct of_device_id bcm63xx_gpio_of_match[] = {
{ .compatible = "brcm,bcm6318-gpio", },
{ .compatible = "brcm,bcm6328-gpio", },
@@ -57,6 +69,8 @@ static int bcm63xx_gpio_probe(struct device *dev, struct device_node *node,
grc.reg_dir_out_base = BCM63XX_DIROUT_REG;
grc.reg_set_base = BCM63XX_DATA_REG;
grc.reg_mask_xlate = bcm63xx_reg_mask_xlate;
+ grc.request = bcm63xx_request;
+ grc.free = bcm63xx_free;
return PTR_ERR_OR_ZERO(devm_gpio_regmap_register(dev, &grc));
}
Implement pinctrl gpio request/free functions on gpio_regmap, which ensures calling gpio_request_enable on bcm63xx pinctrl drivers when a gpio is requested. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> --- drivers/pinctrl/bcm/pinctrl-bcm63xx.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)