mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-28 06:44:36 -05:00
pinctrl: npcm7xx: use new generic GPIO chip API
Convert the driver to using the new generic GPIO chip interfaces from linux/gpio/generic.h. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Link: https://lore.kernel.org/20250811-gpio-mmio-pinctrl-conv-v1-4-a84c5da2be20@linaro.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
committed by
Linus Walleij
parent
d2e9afca3a
commit
9e546aa9d5
@@ -4,6 +4,7 @@
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <linux/gpio/driver.h>
|
||||
#include <linux/gpio/generic.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/mfd/syscon.h>
|
||||
@@ -77,7 +78,7 @@
|
||||
/* Structure for register banks */
|
||||
struct npcm7xx_gpio {
|
||||
void __iomem *base;
|
||||
struct gpio_chip gc;
|
||||
struct gpio_generic_chip chip;
|
||||
int irqbase;
|
||||
int irq;
|
||||
u32 pinctrl_id;
|
||||
@@ -99,32 +100,26 @@ struct npcm7xx_pinctrl {
|
||||
};
|
||||
|
||||
/* GPIO handling in the pinctrl driver */
|
||||
static void npcm_gpio_set(struct gpio_chip *gc, void __iomem *reg,
|
||||
static void npcm_gpio_set(struct gpio_generic_chip *chip, void __iomem *reg,
|
||||
unsigned int pinmask)
|
||||
{
|
||||
unsigned long flags;
|
||||
unsigned long val;
|
||||
|
||||
raw_spin_lock_irqsave(&gc->bgpio_lock, flags);
|
||||
guard(gpio_generic_lock_irqsave)(chip);
|
||||
|
||||
val = ioread32(reg) | pinmask;
|
||||
iowrite32(val, reg);
|
||||
|
||||
raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags);
|
||||
}
|
||||
|
||||
static void npcm_gpio_clr(struct gpio_chip *gc, void __iomem *reg,
|
||||
static void npcm_gpio_clr(struct gpio_generic_chip *chip, void __iomem *reg,
|
||||
unsigned int pinmask)
|
||||
{
|
||||
unsigned long flags;
|
||||
unsigned long val;
|
||||
|
||||
raw_spin_lock_irqsave(&gc->bgpio_lock, flags);
|
||||
guard(gpio_generic_lock_irqsave)(chip);
|
||||
|
||||
val = ioread32(reg) & ~pinmask;
|
||||
iowrite32(val, reg);
|
||||
|
||||
raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags);
|
||||
}
|
||||
|
||||
static void npcmgpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
|
||||
@@ -132,9 +127,9 @@ static void npcmgpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
|
||||
struct npcm7xx_gpio *bank = gpiochip_get_data(chip);
|
||||
|
||||
seq_printf(s, "-- module %d [gpio%d - %d]\n",
|
||||
bank->gc.base / bank->gc.ngpio,
|
||||
bank->gc.base,
|
||||
bank->gc.base + bank->gc.ngpio);
|
||||
bank->chip.gc.base / bank->chip.gc.ngpio,
|
||||
bank->chip.gc.base,
|
||||
bank->chip.gc.base + bank->chip.gc.ngpio);
|
||||
seq_printf(s, "DIN :%.8x DOUT:%.8x IE :%.8x OE :%.8x\n",
|
||||
ioread32(bank->base + NPCM7XX_GP_N_DIN),
|
||||
ioread32(bank->base + NPCM7XX_GP_N_DOUT),
|
||||
@@ -220,7 +215,7 @@ static void npcmgpio_irq_handler(struct irq_desc *desc)
|
||||
chained_irq_enter(chip, desc);
|
||||
sts = ioread32(bank->base + NPCM7XX_GP_N_EVST);
|
||||
en = ioread32(bank->base + NPCM7XX_GP_N_EVEN);
|
||||
dev_dbg(bank->gc.parent, "==> got irq sts %.8lx %.8lx\n", sts,
|
||||
dev_dbg(bank->chip.gc.parent, "==> got irq sts %.8lx %.8lx\n", sts,
|
||||
en);
|
||||
|
||||
sts &= en;
|
||||
@@ -235,42 +230,42 @@ static int npcmgpio_set_irq_type(struct irq_data *d, unsigned int type)
|
||||
struct npcm7xx_gpio *bank = gpiochip_get_data(gc);
|
||||
unsigned int gpio = BIT(irqd_to_hwirq(d));
|
||||
|
||||
dev_dbg(bank->gc.parent, "setirqtype: %u.%u = %u\n", gpio,
|
||||
dev_dbg(bank->chip.gc.parent, "setirqtype: %u.%u = %u\n", gpio,
|
||||
d->irq, type);
|
||||
switch (type) {
|
||||
case IRQ_TYPE_EDGE_RISING:
|
||||
dev_dbg(bank->gc.parent, "edge.rising\n");
|
||||
npcm_gpio_clr(&bank->gc, bank->base + NPCM7XX_GP_N_EVBE, gpio);
|
||||
npcm_gpio_clr(&bank->gc, bank->base + NPCM7XX_GP_N_POL, gpio);
|
||||
dev_dbg(bank->chip.gc.parent, "edge.rising\n");
|
||||
npcm_gpio_clr(&bank->chip, bank->base + NPCM7XX_GP_N_EVBE, gpio);
|
||||
npcm_gpio_clr(&bank->chip, bank->base + NPCM7XX_GP_N_POL, gpio);
|
||||
break;
|
||||
case IRQ_TYPE_EDGE_FALLING:
|
||||
dev_dbg(bank->gc.parent, "edge.falling\n");
|
||||
npcm_gpio_clr(&bank->gc, bank->base + NPCM7XX_GP_N_EVBE, gpio);
|
||||
npcm_gpio_set(&bank->gc, bank->base + NPCM7XX_GP_N_POL, gpio);
|
||||
dev_dbg(bank->chip.gc.parent, "edge.falling\n");
|
||||
npcm_gpio_clr(&bank->chip, bank->base + NPCM7XX_GP_N_EVBE, gpio);
|
||||
npcm_gpio_set(&bank->chip, bank->base + NPCM7XX_GP_N_POL, gpio);
|
||||
break;
|
||||
case IRQ_TYPE_EDGE_BOTH:
|
||||
dev_dbg(bank->gc.parent, "edge.both\n");
|
||||
npcm_gpio_set(&bank->gc, bank->base + NPCM7XX_GP_N_EVBE, gpio);
|
||||
dev_dbg(bank->chip.gc.parent, "edge.both\n");
|
||||
npcm_gpio_set(&bank->chip, bank->base + NPCM7XX_GP_N_EVBE, gpio);
|
||||
break;
|
||||
case IRQ_TYPE_LEVEL_LOW:
|
||||
dev_dbg(bank->gc.parent, "level.low\n");
|
||||
npcm_gpio_set(&bank->gc, bank->base + NPCM7XX_GP_N_POL, gpio);
|
||||
dev_dbg(bank->chip.gc.parent, "level.low\n");
|
||||
npcm_gpio_set(&bank->chip, bank->base + NPCM7XX_GP_N_POL, gpio);
|
||||
break;
|
||||
case IRQ_TYPE_LEVEL_HIGH:
|
||||
dev_dbg(bank->gc.parent, "level.high\n");
|
||||
npcm_gpio_clr(&bank->gc, bank->base + NPCM7XX_GP_N_POL, gpio);
|
||||
dev_dbg(bank->chip.gc.parent, "level.high\n");
|
||||
npcm_gpio_clr(&bank->chip, bank->base + NPCM7XX_GP_N_POL, gpio);
|
||||
break;
|
||||
default:
|
||||
dev_dbg(bank->gc.parent, "invalid irq type\n");
|
||||
dev_dbg(bank->chip.gc.parent, "invalid irq type\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) {
|
||||
npcm_gpio_clr(&bank->gc, bank->base + NPCM7XX_GP_N_EVTYP, gpio);
|
||||
npcm_gpio_clr(&bank->chip, bank->base + NPCM7XX_GP_N_EVTYP, gpio);
|
||||
irq_set_handler_locked(d, handle_level_irq);
|
||||
} else if (type & (IRQ_TYPE_EDGE_BOTH | IRQ_TYPE_EDGE_RISING
|
||||
| IRQ_TYPE_EDGE_FALLING)) {
|
||||
npcm_gpio_set(&bank->gc, bank->base + NPCM7XX_GP_N_EVTYP, gpio);
|
||||
npcm_gpio_set(&bank->chip, bank->base + NPCM7XX_GP_N_EVTYP, gpio);
|
||||
irq_set_handler_locked(d, handle_edge_irq);
|
||||
}
|
||||
|
||||
@@ -283,7 +278,7 @@ static void npcmgpio_irq_ack(struct irq_data *d)
|
||||
struct npcm7xx_gpio *bank = gpiochip_get_data(gc);
|
||||
unsigned int gpio = irqd_to_hwirq(d);
|
||||
|
||||
dev_dbg(bank->gc.parent, "irq_ack: %u.%u\n", gpio, d->irq);
|
||||
dev_dbg(bank->chip.gc.parent, "irq_ack: %u.%u\n", gpio, d->irq);
|
||||
iowrite32(BIT(gpio), bank->base + NPCM7XX_GP_N_EVST);
|
||||
}
|
||||
|
||||
@@ -295,7 +290,7 @@ static void npcmgpio_irq_mask(struct irq_data *d)
|
||||
unsigned int gpio = irqd_to_hwirq(d);
|
||||
|
||||
/* Clear events */
|
||||
dev_dbg(bank->gc.parent, "irq_mask: %u.%u\n", gpio, d->irq);
|
||||
dev_dbg(bank->chip.gc.parent, "irq_mask: %u.%u\n", gpio, d->irq);
|
||||
iowrite32(BIT(gpio), bank->base + NPCM7XX_GP_N_EVENC);
|
||||
gpiochip_disable_irq(gc, gpio);
|
||||
}
|
||||
@@ -309,7 +304,7 @@ static void npcmgpio_irq_unmask(struct irq_data *d)
|
||||
|
||||
/* Enable events */
|
||||
gpiochip_enable_irq(gc, gpio);
|
||||
dev_dbg(bank->gc.parent, "irq_unmask: %u.%u\n", gpio, d->irq);
|
||||
dev_dbg(bank->chip.gc.parent, "irq_unmask: %u.%u\n", gpio, d->irq);
|
||||
iowrite32(BIT(gpio), bank->base + NPCM7XX_GP_N_EVENS);
|
||||
}
|
||||
|
||||
@@ -1423,7 +1418,7 @@ static int npcm7xx_get_slew_rate(struct npcm7xx_gpio *bank,
|
||||
struct regmap *gcr_regmap, unsigned int pin)
|
||||
{
|
||||
u32 val;
|
||||
int gpio = (pin % bank->gc.ngpio);
|
||||
int gpio = (pin % bank->chip.gc.ngpio);
|
||||
unsigned long pinmask = BIT(gpio);
|
||||
|
||||
if (pincfg[pin].flag & SLEW)
|
||||
@@ -1443,16 +1438,16 @@ static int npcm7xx_set_slew_rate(struct npcm7xx_gpio *bank,
|
||||
struct regmap *gcr_regmap, unsigned int pin,
|
||||
int arg)
|
||||
{
|
||||
int gpio = BIT(pin % bank->gc.ngpio);
|
||||
int gpio = BIT(pin % bank->chip.gc.ngpio);
|
||||
|
||||
if (pincfg[pin].flag & SLEW) {
|
||||
switch (arg) {
|
||||
case 0:
|
||||
npcm_gpio_clr(&bank->gc, bank->base + NPCM7XX_GP_N_OSRC,
|
||||
npcm_gpio_clr(&bank->chip, bank->base + NPCM7XX_GP_N_OSRC,
|
||||
gpio);
|
||||
return 0;
|
||||
case 1:
|
||||
npcm_gpio_set(&bank->gc, bank->base + NPCM7XX_GP_N_OSRC,
|
||||
npcm_gpio_set(&bank->chip, bank->base + NPCM7XX_GP_N_OSRC,
|
||||
gpio);
|
||||
return 0;
|
||||
default:
|
||||
@@ -1485,7 +1480,7 @@ static int npcm7xx_get_drive_strength(struct pinctrl_dev *pctldev,
|
||||
struct npcm7xx_pinctrl *npcm = pinctrl_dev_get_drvdata(pctldev);
|
||||
struct npcm7xx_gpio *bank =
|
||||
&npcm->gpio_bank[pin / NPCM7XX_GPIO_PER_BANK];
|
||||
int gpio = (pin % bank->gc.ngpio);
|
||||
int gpio = (pin % bank->chip.gc.ngpio);
|
||||
unsigned long pinmask = BIT(gpio);
|
||||
u32 ds = 0;
|
||||
int flg, val;
|
||||
@@ -1496,7 +1491,7 @@ static int npcm7xx_get_drive_strength(struct pinctrl_dev *pctldev,
|
||||
val = ioread32(bank->base + NPCM7XX_GP_N_ODSC)
|
||||
& pinmask;
|
||||
ds = val ? DSHI(flg) : DSLO(flg);
|
||||
dev_dbg(bank->gc.parent,
|
||||
dev_dbg(bank->chip.gc.parent,
|
||||
"pin %d strength %d = %d\n", pin, val, ds);
|
||||
return ds;
|
||||
}
|
||||
@@ -1511,20 +1506,20 @@ static int npcm7xx_set_drive_strength(struct npcm7xx_pinctrl *npcm,
|
||||
int v;
|
||||
struct npcm7xx_gpio *bank =
|
||||
&npcm->gpio_bank[pin / NPCM7XX_GPIO_PER_BANK];
|
||||
int gpio = BIT(pin % bank->gc.ngpio);
|
||||
int gpio = BIT(pin % bank->chip.gc.ngpio);
|
||||
|
||||
v = (pincfg[pin].flag & DRIVE_STRENGTH_MASK);
|
||||
if (!nval || !v)
|
||||
return -ENOTSUPP;
|
||||
if (DSLO(v) == nval) {
|
||||
dev_dbg(bank->gc.parent,
|
||||
dev_dbg(bank->chip.gc.parent,
|
||||
"setting pin %d to low strength [%d]\n", pin, nval);
|
||||
npcm_gpio_clr(&bank->gc, bank->base + NPCM7XX_GP_N_ODSC, gpio);
|
||||
npcm_gpio_clr(&bank->chip, bank->base + NPCM7XX_GP_N_ODSC, gpio);
|
||||
return 0;
|
||||
} else if (DSHI(v) == nval) {
|
||||
dev_dbg(bank->gc.parent,
|
||||
dev_dbg(bank->chip.gc.parent,
|
||||
"setting pin %d to high strength [%d]\n", pin, nval);
|
||||
npcm_gpio_set(&bank->gc, bank->base + NPCM7XX_GP_N_ODSC, gpio);
|
||||
npcm_gpio_set(&bank->chip, bank->base + NPCM7XX_GP_N_ODSC, gpio);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1657,9 +1652,9 @@ static int npcm_gpio_set_direction(struct pinctrl_dev *pctldev,
|
||||
struct npcm7xx_pinctrl *npcm = pinctrl_dev_get_drvdata(pctldev);
|
||||
struct npcm7xx_gpio *bank =
|
||||
&npcm->gpio_bank[offset / NPCM7XX_GPIO_PER_BANK];
|
||||
int gpio = BIT(offset % bank->gc.ngpio);
|
||||
int gpio = BIT(offset % bank->chip.gc.ngpio);
|
||||
|
||||
dev_dbg(bank->gc.parent, "GPIO Set Direction: %d = %d\n", offset,
|
||||
dev_dbg(bank->chip.gc.parent, "GPIO Set Direction: %d = %d\n", offset,
|
||||
input);
|
||||
if (input)
|
||||
iowrite32(gpio, bank->base + NPCM7XX_GP_N_OEC);
|
||||
@@ -1687,7 +1682,7 @@ static int npcm7xx_config_get(struct pinctrl_dev *pctldev, unsigned int pin,
|
||||
struct npcm7xx_pinctrl *npcm = pinctrl_dev_get_drvdata(pctldev);
|
||||
struct npcm7xx_gpio *bank =
|
||||
&npcm->gpio_bank[pin / NPCM7XX_GPIO_PER_BANK];
|
||||
int gpio = (pin % bank->gc.ngpio);
|
||||
int gpio = (pin % bank->chip.gc.ngpio);
|
||||
unsigned long pinmask = BIT(gpio);
|
||||
u32 ie, oe, pu, pd;
|
||||
int rc = 0;
|
||||
@@ -1750,38 +1745,38 @@ static int npcm7xx_config_set_one(struct npcm7xx_pinctrl *npcm,
|
||||
u16 arg = pinconf_to_config_argument(config);
|
||||
struct npcm7xx_gpio *bank =
|
||||
&npcm->gpio_bank[pin / NPCM7XX_GPIO_PER_BANK];
|
||||
int gpio = BIT(pin % bank->gc.ngpio);
|
||||
int gpio = BIT(pin % bank->chip.gc.ngpio);
|
||||
|
||||
dev_dbg(bank->gc.parent, "param=%d %d[GPIO]\n", param, pin);
|
||||
dev_dbg(bank->chip.gc.parent, "param=%d %d[GPIO]\n", param, pin);
|
||||
switch (param) {
|
||||
case PIN_CONFIG_BIAS_DISABLE:
|
||||
npcm_gpio_clr(&bank->gc, bank->base + NPCM7XX_GP_N_PU, gpio);
|
||||
npcm_gpio_clr(&bank->gc, bank->base + NPCM7XX_GP_N_PD, gpio);
|
||||
npcm_gpio_clr(&bank->chip, bank->base + NPCM7XX_GP_N_PU, gpio);
|
||||
npcm_gpio_clr(&bank->chip, bank->base + NPCM7XX_GP_N_PD, gpio);
|
||||
break;
|
||||
case PIN_CONFIG_BIAS_PULL_DOWN:
|
||||
npcm_gpio_clr(&bank->gc, bank->base + NPCM7XX_GP_N_PU, gpio);
|
||||
npcm_gpio_set(&bank->gc, bank->base + NPCM7XX_GP_N_PD, gpio);
|
||||
npcm_gpio_clr(&bank->chip, bank->base + NPCM7XX_GP_N_PU, gpio);
|
||||
npcm_gpio_set(&bank->chip, bank->base + NPCM7XX_GP_N_PD, gpio);
|
||||
break;
|
||||
case PIN_CONFIG_BIAS_PULL_UP:
|
||||
npcm_gpio_clr(&bank->gc, bank->base + NPCM7XX_GP_N_PD, gpio);
|
||||
npcm_gpio_set(&bank->gc, bank->base + NPCM7XX_GP_N_PU, gpio);
|
||||
npcm_gpio_clr(&bank->chip, bank->base + NPCM7XX_GP_N_PD, gpio);
|
||||
npcm_gpio_set(&bank->chip, bank->base + NPCM7XX_GP_N_PU, gpio);
|
||||
break;
|
||||
case PIN_CONFIG_INPUT_ENABLE:
|
||||
iowrite32(gpio, bank->base + NPCM7XX_GP_N_OEC);
|
||||
bank->direction_input(&bank->gc, pin % bank->gc.ngpio);
|
||||
bank->direction_input(&bank->chip.gc, pin % bank->chip.gc.ngpio);
|
||||
break;
|
||||
case PIN_CONFIG_OUTPUT:
|
||||
bank->direction_output(&bank->gc, pin % bank->gc.ngpio, arg);
|
||||
bank->direction_output(&bank->chip.gc, pin % bank->chip.gc.ngpio, arg);
|
||||
iowrite32(gpio, bank->base + NPCM7XX_GP_N_OES);
|
||||
break;
|
||||
case PIN_CONFIG_DRIVE_PUSH_PULL:
|
||||
npcm_gpio_clr(&bank->gc, bank->base + NPCM7XX_GP_N_OTYP, gpio);
|
||||
npcm_gpio_clr(&bank->chip, bank->base + NPCM7XX_GP_N_OTYP, gpio);
|
||||
break;
|
||||
case PIN_CONFIG_DRIVE_OPEN_DRAIN:
|
||||
npcm_gpio_set(&bank->gc, bank->base + NPCM7XX_GP_N_OTYP, gpio);
|
||||
npcm_gpio_set(&bank->chip, bank->base + NPCM7XX_GP_N_OTYP, gpio);
|
||||
break;
|
||||
case PIN_CONFIG_INPUT_DEBOUNCE:
|
||||
npcm_gpio_set(&bank->gc, bank->base + NPCM7XX_GP_N_DBNC, gpio);
|
||||
npcm_gpio_set(&bank->chip, bank->base + NPCM7XX_GP_N_DBNC, gpio);
|
||||
break;
|
||||
case PIN_CONFIG_SLEW_RATE:
|
||||
return npcm7xx_set_slew_rate(bank, npcm->gcr_regmap, pin, arg);
|
||||
@@ -1829,6 +1824,7 @@ static const struct pinctrl_desc npcm7xx_pinctrl_desc = {
|
||||
|
||||
static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl)
|
||||
{
|
||||
struct gpio_generic_chip_config config;
|
||||
int ret = -ENXIO;
|
||||
struct device *dev = pctrl->dev;
|
||||
struct fwnode_reference_args args;
|
||||
@@ -1840,15 +1836,18 @@ static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl)
|
||||
if (!pctrl->gpio_bank[id].base)
|
||||
return -EINVAL;
|
||||
|
||||
ret = bgpio_init(&pctrl->gpio_bank[id].gc, dev, 4,
|
||||
pctrl->gpio_bank[id].base + NPCM7XX_GP_N_DIN,
|
||||
pctrl->gpio_bank[id].base + NPCM7XX_GP_N_DOUT,
|
||||
NULL,
|
||||
NULL,
|
||||
pctrl->gpio_bank[id].base + NPCM7XX_GP_N_IEM,
|
||||
BGPIOF_READ_OUTPUT_REG_SET);
|
||||
config = (typeof(config)){
|
||||
.dev = dev,
|
||||
.sz = 4,
|
||||
.dat = pctrl->gpio_bank[id].base + NPCM7XX_GP_N_DIN,
|
||||
.set = pctrl->gpio_bank[id].base + NPCM7XX_GP_N_DOUT,
|
||||
.dirin = pctrl->gpio_bank[id].base + NPCM7XX_GP_N_IEM,
|
||||
.flags = BGPIOF_READ_OUTPUT_REG_SET,
|
||||
};
|
||||
|
||||
ret = gpio_generic_chip_init(&pctrl->gpio_bank[id].chip, &config);
|
||||
if (ret) {
|
||||
dev_err(dev, "bgpio_init() failed\n");
|
||||
dev_err(dev, "failed to initialize the generic GPIO chip\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -1866,23 +1865,23 @@ static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl)
|
||||
pctrl->gpio_bank[id].irq = ret;
|
||||
pctrl->gpio_bank[id].irqbase = id * NPCM7XX_GPIO_PER_BANK;
|
||||
pctrl->gpio_bank[id].pinctrl_id = args.args[0];
|
||||
pctrl->gpio_bank[id].gc.base = args.args[1];
|
||||
pctrl->gpio_bank[id].gc.ngpio = args.args[2];
|
||||
pctrl->gpio_bank[id].gc.owner = THIS_MODULE;
|
||||
pctrl->gpio_bank[id].gc.parent = dev;
|
||||
pctrl->gpio_bank[id].gc.fwnode = child;
|
||||
pctrl->gpio_bank[id].gc.label = devm_kasprintf(dev, GFP_KERNEL, "%pfw", child);
|
||||
if (pctrl->gpio_bank[id].gc.label == NULL)
|
||||
pctrl->gpio_bank[id].chip.gc.base = args.args[1];
|
||||
pctrl->gpio_bank[id].chip.gc.ngpio = args.args[2];
|
||||
pctrl->gpio_bank[id].chip.gc.owner = THIS_MODULE;
|
||||
pctrl->gpio_bank[id].chip.gc.parent = dev;
|
||||
pctrl->gpio_bank[id].chip.gc.fwnode = child;
|
||||
pctrl->gpio_bank[id].chip.gc.label = devm_kasprintf(dev, GFP_KERNEL, "%pfw", child);
|
||||
if (pctrl->gpio_bank[id].chip.gc.label == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
pctrl->gpio_bank[id].gc.dbg_show = npcmgpio_dbg_show;
|
||||
pctrl->gpio_bank[id].direction_input = pctrl->gpio_bank[id].gc.direction_input;
|
||||
pctrl->gpio_bank[id].gc.direction_input = npcmgpio_direction_input;
|
||||
pctrl->gpio_bank[id].direction_output = pctrl->gpio_bank[id].gc.direction_output;
|
||||
pctrl->gpio_bank[id].gc.direction_output = npcmgpio_direction_output;
|
||||
pctrl->gpio_bank[id].request = pctrl->gpio_bank[id].gc.request;
|
||||
pctrl->gpio_bank[id].gc.request = npcmgpio_gpio_request;
|
||||
pctrl->gpio_bank[id].gc.free = pinctrl_gpio_free;
|
||||
pctrl->gpio_bank[id].chip.gc.dbg_show = npcmgpio_dbg_show;
|
||||
pctrl->gpio_bank[id].direction_input = pctrl->gpio_bank[id].chip.gc.direction_input;
|
||||
pctrl->gpio_bank[id].chip.gc.direction_input = npcmgpio_direction_input;
|
||||
pctrl->gpio_bank[id].direction_output = pctrl->gpio_bank[id].chip.gc.direction_output;
|
||||
pctrl->gpio_bank[id].chip.gc.direction_output = npcmgpio_direction_output;
|
||||
pctrl->gpio_bank[id].request = pctrl->gpio_bank[id].chip.gc.request;
|
||||
pctrl->gpio_bank[id].chip.gc.request = npcmgpio_gpio_request;
|
||||
pctrl->gpio_bank[id].chip.gc.free = pinctrl_gpio_free;
|
||||
id++;
|
||||
}
|
||||
|
||||
@@ -1897,7 +1896,7 @@ static int npcm7xx_gpio_register(struct npcm7xx_pinctrl *pctrl)
|
||||
for (id = 0 ; id < pctrl->bank_num ; id++) {
|
||||
struct gpio_irq_chip *girq;
|
||||
|
||||
girq = &pctrl->gpio_bank[id].gc.irq;
|
||||
girq = &pctrl->gpio_bank[id].chip.gc.irq;
|
||||
gpio_irq_chip_set_chip(girq, &npcmgpio_irqchip);
|
||||
girq->parent_handler = npcmgpio_irq_handler;
|
||||
girq->num_parents = 1;
|
||||
@@ -1912,21 +1911,21 @@ static int npcm7xx_gpio_register(struct npcm7xx_pinctrl *pctrl)
|
||||
girq->default_type = IRQ_TYPE_NONE;
|
||||
girq->handler = handle_level_irq;
|
||||
ret = devm_gpiochip_add_data(pctrl->dev,
|
||||
&pctrl->gpio_bank[id].gc,
|
||||
&pctrl->gpio_bank[id].chip.gc,
|
||||
&pctrl->gpio_bank[id]);
|
||||
if (ret) {
|
||||
dev_err(pctrl->dev, "Failed to add GPIO chip %u\n", id);
|
||||
goto err_register;
|
||||
}
|
||||
|
||||
ret = gpiochip_add_pin_range(&pctrl->gpio_bank[id].gc,
|
||||
ret = gpiochip_add_pin_range(&pctrl->gpio_bank[id].chip.gc,
|
||||
dev_name(pctrl->dev),
|
||||
pctrl->gpio_bank[id].pinctrl_id,
|
||||
pctrl->gpio_bank[id].gc.base,
|
||||
pctrl->gpio_bank[id].gc.ngpio);
|
||||
pctrl->gpio_bank[id].chip.gc.base,
|
||||
pctrl->gpio_bank[id].chip.gc.ngpio);
|
||||
if (ret < 0) {
|
||||
dev_err(pctrl->dev, "Failed to add GPIO bank %u\n", id);
|
||||
gpiochip_remove(&pctrl->gpio_bank[id].gc);
|
||||
gpiochip_remove(&pctrl->gpio_bank[id].chip.gc);
|
||||
goto err_register;
|
||||
}
|
||||
}
|
||||
@@ -1935,7 +1934,7 @@ static int npcm7xx_gpio_register(struct npcm7xx_pinctrl *pctrl)
|
||||
|
||||
err_register:
|
||||
for (; id > 0; id--)
|
||||
gpiochip_remove(&pctrl->gpio_bank[id - 1].gc);
|
||||
gpiochip_remove(&pctrl->gpio_bank[id - 1].chip.gc);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user