Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 282fd2a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pin control fixes from Linus Walleij:

 - A bunch of fixes for the Allwinner meson platform

 - Establish a git repo for Intel pin control in MAINTAINERS

* tag 'pinctrl-v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  MAINTAINERS: Add tree link for Intel pin control driver
  pinctrl: meson: fix meson8b ao pull register bits
  pinctrl: meson: fix meson8 ao pull register bits
  pinctrl: meson: fix gxl ao pull register bits
  pinctrl: meson: fix gxbb ao pull register bits
  pinctrl: meson: fix pinconf bias disable
parents 94ca5c18 595b0674

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -11745,6 +11745,7 @@ F: Documentation/devicetree/bindings/pinctrl/fsl,* 
PIN CONTROLLER - INTEL

M:	Mika Westerberg <mika.westerberg@linux.intel.com>

M:	Andy Shevchenko <andriy.shevchenko@linux.intel.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git

S:	Maintained

F:	drivers/pinctrl/intel/

drivers/pinctrl/meson/pinctrl-meson-gxbb.c

+1 −1
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ static struct meson_bank meson_gxbb_periphs_banks[] = { 


static struct meson_bank meson_gxbb_aobus_banks[] = {

	/*   name    first      last       irq    pullen  pull    dir     out     in  */

	BANK("AO",   GPIOAO_0,  GPIOAO_13, 0, 13, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),

	BANK("AO",   GPIOAO_0,  GPIOAO_13, 0, 13, 0,  16, 0, 0,   0,  0,  0, 16,  1,  0),

};



static struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {

drivers/pinctrl/meson/pinctrl-meson-gxl.c

+1 −1
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ static struct meson_bank meson_gxl_periphs_banks[] = { 


static struct meson_bank meson_gxl_aobus_banks[] = {

	/*   name    first      last      irq	pullen  pull    dir     out     in  */

	BANK("AO",   GPIOAO_0,  GPIOAO_9, 0, 9, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),

	BANK("AO",   GPIOAO_0,  GPIOAO_9, 0, 9, 0,  16, 0, 0,   0,  0,  0, 16,  1,  0),

};



static struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {

drivers/pinctrl/meson/pinctrl-meson.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin, 
			dev_dbg(pc->dev, "pin %u: disable bias\n", pin);



			meson_calc_reg_and_bit(bank, pin, REG_PULL, &reg, &bit);

			ret = regmap_update_bits(pc->reg_pull, reg,

			ret = regmap_update_bits(pc->reg_pullen, reg,

						 BIT(bit), 0);

			if (ret)

				return ret;

drivers/pinctrl/meson/pinctrl-meson8.c

+1 −1
Original line number Diff line number Diff line
@@ -1053,7 +1053,7 @@ static struct meson_bank meson8_cbus_banks[] = { 


static struct meson_bank meson8_aobus_banks[] = {

	/*   name    first     last         irq    pullen  pull    dir     out     in  */

	BANK("AO",   GPIOAO_0, GPIO_TEST_N, 0, 13, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),

	BANK("AO",   GPIOAO_0, GPIO_TEST_N, 0, 13, 0, 16,  0,  0,  0,  0,  0, 16,  1,  0),

};



static struct meson_pinctrl_data meson8_cbus_pinctrl_data = {