Merge tag 'pinctrl-v4.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl (cc74613b) · Commits · 戴 / test

drivers/pinctrl/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ config PINCTRL_AMD
		tristate "AMD GPIO pin control"
		depends on GPIOLIB
		select GPIOLIB_IRQCHIP
		select PINMUX
		select PINCONF
		select GENERIC_PINCONF
		help

+0 −4

Original line number	Diff line number	Diff line
		@@ -373,16 +373,12 @@ static void bcm2835_gpio_irq_handle_bank(struct bcm2835_pinctrl *pc,
		unsigned long events;
		unsigned offset;
		unsigned gpio;
		unsigned int type;

		events = bcm2835_gpio_rd(pc, GPEDS0 + bank * 4);
		events &= mask;
		events &= pc->enabled_irq_map[bank];
		for_each_set_bit(offset, &events, 32) {
		gpio = (32 * bank) + offset;
		/* FIXME: no clue why the code looks up the type here */
		type = pc->irq_type[gpio];

		generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irqdomain,
		gpio));
		}

+13 −1

Original line number	Diff line number	Diff line
		@@ -1577,6 +1577,7 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
		struct gpio_chip *chip = &pctrl->chip;
		bool need_valid_mask = !dmi_check_system(chv_no_valid_mask);
		int ret, i, offset;
		int irq_base;

		*chip = chv_gpio_chip;

		@@ -1622,7 +1623,18 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
		/* Clear all interrupts */
		chv_writel(0xffff, pctrl->regs + CHV_INTSTAT);

		ret = gpiochip_irqchip_add(chip, &chv_gpio_irqchip, 0,
		if (!need_valid_mask) {
		irq_base = devm_irq_alloc_descs(pctrl->dev, -1, 0,
		chip->ngpio, NUMA_NO_NODE);
		if (irq_base < 0) {
		dev_err(pctrl->dev, "Failed to allocate IRQ numbers\n");
		return irq_base;
		}
		} else {
		irq_base = 0;
		}

		ret = gpiochip_irqchip_add(chip, &chv_gpio_irqchip, irq_base,
		handle_bad_irq, IRQ_TYPE_NONE);
		if (ret) {
		dev_err(pctrl->dev, "failed to add IRQ chip\n");