diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-14 18:17:17 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-14 18:17:17 +0100 |
| commit | 7fb5f5d3738c3a3ed7a3a8685266bc88dc69fbbd (patch) | |
| tree | c9f82af8ff2b358bcf31932bd90a46a72fc2e924 /drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | |
| parent | Merge tag 'drm-fixes-2018-12-14' of git://anongit.freedesktop.org/drm/drm (diff) | |
| parent | pinctrl: sunxi: a83t: Fix IRQ offset typo for PH11 (diff) | |
| download | linux-7fb5f5d3738c3a3ed7a3a8685266bc88dc69fbbd.tar.xz linux-7fb5f5d3738c3a3ed7a3a8685266bc88dc69fbbd.zip | |
Merge tag 'pinctrl-v4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij:
"Three pin control fixes for the v4.20 series. Just odd drivers, so
nothing particularly interesting:
- Set the tile property on Qualcomm SDM60.
- Fix up enable register calculation for the Meson
- Fix an IRQ offset on the Sunxi (Allwinner)"
* tag 'pinctrl-v4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: sunxi: a83t: Fix IRQ offset typo for PH11
pinctrl: meson: fix pull enable register calculation
pinctrl: sdm660: Set tile property for pingroups
Diffstat (limited to 'drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c')
| -rw-r--r-- | drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c b/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c index 6624499eae72..4ada80317a3b 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c +++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c @@ -568,7 +568,7 @@ static const struct sunxi_desc_pin sun8i_a83t_pins[] = { SUNXI_PIN(SUNXI_PINCTRL_PIN(H, 11), SUNXI_FUNCTION(0x0, "gpio_in"), SUNXI_FUNCTION(0x1, "gpio_out"), - SUNXI_FUNCTION_IRQ_BANK(0x6, 2, 1)), /* PH_EINT11 */ + SUNXI_FUNCTION_IRQ_BANK(0x6, 2, 11)), /* PH_EINT11 */ }; static const struct sunxi_pinctrl_desc sun8i_a83t_pinctrl_data = { |