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

pinctrl: meson-gx: TEST_N belongs to the AO controller

On meson-gx platforms, TEST_N has been incorrectly declared in the EE
controller while it belongs to AO controller.

Move the pin to the appropriate controller

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Jerome Brunet and committed by
Linus Walleij e891a5a4 70e5ecb1

+10 -10
+4 -4
drivers/pinctrl/meson/pinctrl-meson-gxbb.c
··· 141 141 MESON_PIN(GPIOCLK_1), 142 142 MESON_PIN(GPIOCLK_2), 143 143 MESON_PIN(GPIOCLK_3), 144 - 145 - MESON_PIN(GPIO_TEST_N), 146 144 }; 147 145 148 146 static const unsigned int emmc_nand_d07_pins[] = { ··· 256 258 MESON_PIN(GPIOAO_11), 257 259 MESON_PIN(GPIOAO_12), 258 260 MESON_PIN(GPIOAO_13), 261 + 262 + MESON_PIN(GPIO_TEST_N), 259 263 }; 260 264 261 265 static const unsigned int uart_tx_ao_a_pins[] = { GPIOAO_0 }; ··· 596 596 "GPIOX_10", "GPIOX_11", "GPIOX_12", "GPIOX_13", "GPIOX_14", 597 597 "GPIOX_15", "GPIOX_16", "GPIOX_17", "GPIOX_18", "GPIOX_19", 598 598 "GPIOX_20", "GPIOX_21", "GPIOX_22", 599 - 600 - "GPIO_TEST_N", 601 599 }; 602 600 603 601 static const char * const emmc_groups[] = { ··· 704 706 "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3", "GPIOAO_4", 705 707 "GPIOAO_5", "GPIOAO_6", "GPIOAO_7", "GPIOAO_8", "GPIOAO_9", 706 708 "GPIOAO_10", "GPIOAO_11", "GPIOAO_12", "GPIOAO_13", 709 + 710 + "GPIO_TEST_N", 707 711 }; 708 712 709 713 static const char * const uart_ao_groups[] = {
+4 -4
drivers/pinctrl/meson/pinctrl-meson-gxl.c
··· 122 122 123 123 MESON_PIN(GPIOCLK_0), 124 124 MESON_PIN(GPIOCLK_1), 125 - 126 - MESON_PIN(GPIO_TEST_N), 127 125 }; 128 126 129 127 static const unsigned int emmc_nand_d07_pins[] = { ··· 261 263 MESON_PIN(GPIOAO_7), 262 264 MESON_PIN(GPIOAO_8), 263 265 MESON_PIN(GPIOAO_9), 266 + 267 + MESON_PIN(GPIO_TEST_N), 264 268 }; 265 269 266 270 static const unsigned int uart_tx_ao_a_pins[] = { GPIOAO_0 }; ··· 587 587 "GPIOX_5", "GPIOX_6", "GPIOX_7", "GPIOX_8", "GPIOX_9", 588 588 "GPIOX_10", "GPIOX_11", "GPIOX_12", "GPIOX_13", "GPIOX_14", 589 589 "GPIOX_15", "GPIOX_16", "GPIOX_17", "GPIOX_18", 590 - 591 - "GPIO_TEST_N", 592 590 }; 593 591 594 592 static const char * const emmc_groups[] = { ··· 701 703 static const char * const gpio_aobus_groups[] = { 702 704 "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3", "GPIOAO_4", 703 705 "GPIOAO_5", "GPIOAO_6", "GPIOAO_7", "GPIOAO_8", "GPIOAO_9", 706 + 707 + "GPIO_TEST_N", 704 708 }; 705 709 706 710 static const char * const uart_ao_groups[] = {
+1 -1
include/dt-bindings/gpio/meson-gxbb-gpio.h
··· 29 29 #define GPIOAO_11 11 30 30 #define GPIOAO_12 12 31 31 #define GPIOAO_13 13 32 + #define GPIO_TEST_N 14 32 33 33 34 #define GPIOZ_0 0 34 35 #define GPIOZ_1 1 ··· 150 149 #define GPIOCLK_1 116 151 150 #define GPIOCLK_2 117 152 151 #define GPIOCLK_3 118 153 - #define GPIO_TEST_N 119 154 152 155 153 #endif
+1 -1
include/dt-bindings/gpio/meson-gxl-gpio.h
··· 25 25 #define GPIOAO_7 7 26 26 #define GPIOAO_8 8 27 27 #define GPIOAO_9 9 28 + #define GPIO_TEST_N 10 28 29 29 30 #define GPIOZ_0 0 30 31 #define GPIOZ_1 1 ··· 127 126 #define GPIOX_18 97 128 127 #define GPIOCLK_0 98 129 128 #define GPIOCLK_1 99 130 - #define GPIO_TEST_N 100 131 129 132 130 #endif