Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pinctrl-v4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pinctrl fix from Linus Walleij:
"A single last pin control fix for v4.6. t's tagged for stable and
only hits a single driver with two added lines so should be safe.
Tested in linux-next.
- The pull up/down logic for the AT91 PIO4 controller was tilted: we
need to mask the reverse pull when unmasking a pull direction.
Setting both pull up & pull down is illegal and makes no sense"
* tag 'pinctrl-v4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: at91-pio4: fix pull-up/down logic
+2
+2
drivers/pinctrl/pinctrl-at91-pio4.c
+2
drivers/pinctrl/pinctrl-at91-pio4.c
···
722
722
break;
723
723
case PIN_CONFIG_BIAS_PULL_UP:
724
724
conf |= ATMEL_PIO_PUEN_MASK;
725
+
conf &= (~ATMEL_PIO_PDEN_MASK);
725
726
break;
726
727
case PIN_CONFIG_BIAS_PULL_DOWN:
727
728
conf |= ATMEL_PIO_PDEN_MASK;
729
+
conf &= (~ATMEL_PIO_PUEN_MASK);
728
730
break;
729
731
case PIN_CONFIG_DRIVE_OPEN_DRAIN:
730
732
if (arg == 0)