tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 282fd2a2 94ca5c18

+6 -5
+1
MAINTAINERS
··· 11745 11745 PIN CONTROLLER - INTEL 11746 11746 M: Mika Westerberg <mika.westerberg@linux.intel.com> 11747 11747 M: Andy Shevchenko <andriy.shevchenko@linux.intel.com> 11748 + T: git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git 11748 11749 S: Maintained 11749 11750 F: drivers/pinctrl/intel/ 11750 11751
+1 -1
drivers/pinctrl/meson/pinctrl-meson-gxbb.c
··· 830 830 831 831 static struct meson_bank meson_gxbb_aobus_banks[] = { 832 832 /* name first last irq pullen pull dir out in */ 833 - BANK("AO", GPIOAO_0, GPIOAO_13, 0, 13, 0, 0, 0, 16, 0, 0, 0, 16, 1, 0), 833 + BANK("AO", GPIOAO_0, GPIOAO_13, 0, 13, 0, 16, 0, 0, 0, 0, 0, 16, 1, 0), 834 834 }; 835 835 836 836 static struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
+1 -1
drivers/pinctrl/meson/pinctrl-meson-gxl.c
··· 807 807 808 808 static struct meson_bank meson_gxl_aobus_banks[] = { 809 809 /* name first last irq pullen pull dir out in */ 810 - BANK("AO", GPIOAO_0, GPIOAO_9, 0, 9, 0, 0, 0, 16, 0, 0, 0, 16, 1, 0), 810 + BANK("AO", GPIOAO_0, GPIOAO_9, 0, 9, 0, 16, 0, 0, 0, 0, 0, 16, 1, 0), 811 811 }; 812 812 813 813 static struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
+1 -1
drivers/pinctrl/meson/pinctrl-meson.c
··· 192 192 dev_dbg(pc->dev, "pin %u: disable bias\n", pin); 193 193 194 194 meson_calc_reg_and_bit(bank, pin, REG_PULL, &reg, &bit); 195 - ret = regmap_update_bits(pc->reg_pull, reg, 195 + ret = regmap_update_bits(pc->reg_pullen, reg, 196 196 BIT(bit), 0); 197 197 if (ret) 198 198 return ret;
+1 -1
drivers/pinctrl/meson/pinctrl-meson8.c
··· 1053 1053 1054 1054 static struct meson_bank meson8_aobus_banks[] = { 1055 1055 /* name first last irq pullen pull dir out in */ 1056 - BANK("AO", GPIOAO_0, GPIO_TEST_N, 0, 13, 0, 0, 0, 16, 0, 0, 0, 16, 1, 0), 1056 + BANK("AO", GPIOAO_0, GPIO_TEST_N, 0, 13, 0, 16, 0, 0, 0, 0, 0, 16, 1, 0), 1057 1057 }; 1058 1058 1059 1059 static struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
+1 -1
drivers/pinctrl/meson/pinctrl-meson8b.c
··· 906 906 907 907 static struct meson_bank meson8b_aobus_banks[] = { 908 908 /* name first lastc irq pullen pull dir out in */ 909 - BANK("AO", GPIOAO_0, GPIO_TEST_N, 0, 13, 0, 0, 0, 16, 0, 0, 0, 16, 1, 0), 909 + BANK("AO", GPIOAO_0, GPIO_TEST_N, 0, 13, 0, 16, 0, 0, 0, 0, 0, 16, 1, 0), 910 910 }; 911 911 912 912 static struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {