UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pin control fixes for the v4.20 series: 

- A bunch of meson fixes for this (Allwinner) platform.
 
 - Establish a git repo for Intel pin control in MAINTAINERS.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJb7S1qAAoJEEEQszewGV1zbi8QAIDFNEGDWx2zU1tUhkm52Bne
 Lzw3oVP3oGPAYg/m7Amw/rFVbpM8nxkDdAImwZ59L4I/hQxYl1X83Qd/fHxMqNo2
 335mHqC6MP4zofdlVWxgLQYOadCKnNruUgL22ZIBSH3Arzl8bzRN2nG0E/3dXi5L
 mU78KxvTp2xUPryHppOP8VcKMt3rh5jg24kPZamwXfLlbNVV/dTLBecBZz2kYrTP
 GccX7LM8cu0ldFwPotXtOMoo6GlszVhv8QzObLYsxrgOjnrGbomKTCrHxxQ02+/f
 HBeVE4bM2cD2heKHQusxQvwN7dsK2vRu+diLXEOLxq12SYaok0WugJNlPqN3t40O
 RBFmiBVsQL1EfYKz85HGO/eCLsaGqQDX4Br401v0Bsq5zHhqFOycNkDrAGg1UJX8
 fOKMjgajoyobsaV+GIaXinhXewoATmnvvL0w1yc9YK+AdIrDtGpUQxT9YqN/4Jhl
 k+GNdSHrH/9EugkwRk7yQUqRjMtELVPlaqSozsVekk0OSFHv8Xe4TqakiyxcKDnR
 r+vh7XRq2rBjXgnfFfRljf4k4cDvsOQ/ON+cOqZBsnD+HrCvTSbzXN4jgnq3Jrmv
 YhlRDkRJFrflmm+WE0eL2jx8iDPtS6+qNB4Yceww3lmlP1VmdK1dvrKoyc6Qyo6y
 LD6uBaBY6Eig08TIDQFZ
 =1FKi
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2018-11-15 11:20:06 -06:00
parent 94ca5c18e1 595b0674ce
commit 282fd2a2ad
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -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/

2
drivers/pinctrl/meson/pinctrl-meson-gxbb.c
View File

@ -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 = {

2
drivers/pinctrl/meson/pinctrl-meson-gxl.c
View File

@ -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 = {

2
drivers/pinctrl/meson/pinctrl-meson.c
View File

@ -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;

2
drivers/pinctrl/meson/pinctrl-meson8.c
View File

@ -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 = {

2
drivers/pinctrl/meson/pinctrl-meson8b.c
View File

@ -906,7 +906,7 @@ static struct meson_bank meson8b_cbus_banks[] = {
static struct meson_bank meson8b_aobus_banks[] = {
/* name first lastc 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 meson8b_cbus_pinctrl_data = {