Commit 422ce5a9 authored May 12, 2016 by Linus Torvalds

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

parents 685764b1 5305a7b7

drivers/pinctrl/pinctrl-at91-pio4.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -722,9 +722,11 @@ static int atmel_conf_pin_config_group_set(struct pinctrl_dev *pctldev,
		break;
		case PIN_CONFIG_BIAS_PULL_UP:
		conf \|= ATMEL_PIO_PUEN_MASK;
		conf &= (~ATMEL_PIO_PDEN_MASK);
		break;
		case PIN_CONFIG_BIAS_PULL_DOWN:
		conf \|= ATMEL_PIO_PDEN_MASK;
		conf &= (~ATMEL_PIO_PUEN_MASK);
		break;
		case PIN_CONFIG_DRIVE_OPEN_DRAIN:
		if (arg == 0)