tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'gpio-fixes-for-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux

Pull gpio fixes from Bartosz Golaszewski:

- fix a regression in gpio-rockchip introduced on older chips during
the merge window when converting to dynamic GPIO base

- fix AST2700 debounce selector bit definitions in gpio-aspeed

* tag 'gpio-fixes-for-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
gpio: aspeed: fix AST2700 debounce selector bit definitions
gpio: rockchip: Fix GPIO regression after conversion to dynamic base allocation

Linus Torvalds d0fc5bf9 1fe93b2a

+3 -3
+2 -2
drivers/gpio/gpio-aspeed.c
··· 42 42 #define GPIO_G7_CTRL_IRQ_TYPE1 BIT(4) 43 43 #define GPIO_G7_CTRL_IRQ_TYPE2 BIT(5) 44 44 #define GPIO_G7_CTRL_RST_TOLERANCE BIT(6) 45 - #define GPIO_G7_CTRL_DEBOUNCE_SEL1 BIT(7) 46 - #define GPIO_G7_CTRL_DEBOUNCE_SEL2 BIT(8) 45 + #define GPIO_G7_CTRL_DEBOUNCE_SEL2 BIT(7) 46 + #define GPIO_G7_CTRL_DEBOUNCE_SEL1 BIT(8) 47 47 #define GPIO_G7_CTRL_INPUT_MASK BIT(9) 48 48 #define GPIO_G7_CTRL_IRQ_STS BIT(12) 49 49 #define GPIO_G7_CTRL_IN_DATA BIT(13)
+1 -1
drivers/gpio/gpio-rockchip.c
··· 617 617 return -ENODEV; 618 618 619 619 ret = gpiochip_add_pin_range(gc, dev_name(pctldev->dev), 0, 620 - gc->base, gc->ngpio); 620 + bank->pin_base, bank->nr_pins); 621 621 if (ret) { 622 622 dev_err(bank->dev, "Failed to add pin range\n"); 623 623 goto fail;