Skip to content

L
linux
Commit ac816e9e authored by Linus Walleij's avatar Linus Walleij
Browse files
Options

Merge tag 'intel-pinctrl-v6.9-1' of... 

Merge tag 'intel-pinctrl-v6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel into fixes

intel-pinctrl for v6.9-1

* Correct GPIO selection and add UART3 pins for Intel Bay Trail

The following is an automated git shortlog grouped by driver:

baytrail:
 -  Add pinconf group for uart3
 -  Fix selecting gpio pinctrl state
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parents 7fb1fe37 5d10a157
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 37 deletions
drivers/pinctrl/intel/pinctrl-baytrail.c
View file @ ac816e9e
...@@ -231,6 +231,7 @@ static const unsigned int byt_score_pins_map[BYT_NGPIO_SCORE] = { ...@@ -231,6 +231,7 @@ static const unsigned int byt_score_pins_map[BYT_NGPIO_SCORE] = {
/* SCORE groups */ /* SCORE groups */
static const unsigned int byt_score_uart1_pins[] = { 70, 71, 72, 73 }; static const unsigned int byt_score_uart1_pins[] = { 70, 71, 72, 73 };
static const unsigned int byt_score_uart2_pins[] = { 74, 75, 76, 77 }; static const unsigned int byt_score_uart2_pins[] = { 74, 75, 76, 77 };
static const unsigned int byt_score_uart3_pins[] = { 57, 61 };
static const unsigned int byt_score_pwm0_pins[] = { 94 }; static const unsigned int byt_score_pwm0_pins[] = { 94 };
static const unsigned int byt_score_pwm1_pins[] = { 95 }; static const unsigned int byt_score_pwm1_pins[] = { 95 };
...@@ -278,37 +279,38 @@ static const unsigned int byt_score_plt_clk5_pins[] = { 101 }; ...@@ -278,37 +279,38 @@ static const unsigned int byt_score_plt_clk5_pins[] = { 101 };
static const unsigned int byt_score_smbus_pins[] = { 51, 52, 53 }; static const unsigned int byt_score_smbus_pins[] = { 51, 52, 53 };
static const struct intel_pingroup byt_score_groups[] = { static const struct intel_pingroup byt_score_groups[] = {
PIN_GROUP("uart1_grp", byt_score_uart1_pins, 1), PIN_GROUP_GPIO("uart1_grp", byt_score_uart1_pins, 1),
PIN_GROUP("uart2_grp", byt_score_uart2_pins, 1), PIN_GROUP_GPIO("uart2_grp", byt_score_uart2_pins, 1),
PIN_GROUP("pwm0_grp", byt_score_pwm0_pins, 1), PIN_GROUP_GPIO("uart3_grp", byt_score_uart3_pins, 1),
PIN_GROUP("pwm1_grp", byt_score_pwm1_pins, 1), PIN_GROUP_GPIO("pwm0_grp", byt_score_pwm0_pins, 1),
PIN_GROUP("ssp2_grp", byt_score_ssp2_pins, 1), PIN_GROUP_GPIO("pwm1_grp", byt_score_pwm1_pins, 1),
PIN_GROUP("sio_spi_grp", byt_score_sio_spi_pins, 1), PIN_GROUP_GPIO("ssp2_grp", byt_score_ssp2_pins, 1),
PIN_GROUP("i2c5_grp", byt_score_i2c5_pins, 1), PIN_GROUP_GPIO("sio_spi_grp", byt_score_sio_spi_pins, 1),
PIN_GROUP("i2c6_grp", byt_score_i2c6_pins, 1), PIN_GROUP_GPIO("i2c5_grp", byt_score_i2c5_pins, 1),
PIN_GROUP("i2c4_grp", byt_score_i2c4_pins, 1), PIN_GROUP_GPIO("i2c6_grp", byt_score_i2c6_pins, 1),
PIN_GROUP("i2c3_grp", byt_score_i2c3_pins, 1), PIN_GROUP_GPIO("i2c4_grp", byt_score_i2c4_pins, 1),
PIN_GROUP("i2c2_grp", byt_score_i2c2_pins, 1), PIN_GROUP_GPIO("i2c3_grp", byt_score_i2c3_pins, 1),
PIN_GROUP("i2c1_grp", byt_score_i2c1_pins, 1), PIN_GROUP_GPIO("i2c2_grp", byt_score_i2c2_pins, 1),
PIN_GROUP("i2c0_grp", byt_score_i2c0_pins, 1), PIN_GROUP_GPIO("i2c1_grp", byt_score_i2c1_pins, 1),
PIN_GROUP("ssp0_grp", byt_score_ssp0_pins, 1), PIN_GROUP_GPIO("i2c0_grp", byt_score_i2c0_pins, 1),
PIN_GROUP("ssp1_grp", byt_score_ssp1_pins, 1), PIN_GROUP_GPIO("ssp0_grp", byt_score_ssp0_pins, 1),
PIN_GROUP("sdcard_grp", byt_score_sdcard_pins, byt_score_sdcard_mux_values), PIN_GROUP_GPIO("ssp1_grp", byt_score_ssp1_pins, 1),
PIN_GROUP("sdio_grp", byt_score_sdio_pins, 1), PIN_GROUP_GPIO("sdcard_grp", byt_score_sdcard_pins, byt_score_sdcard_mux_values),
PIN_GROUP("emmc_grp", byt_score_emmc_pins, 1), PIN_GROUP_GPIO("sdio_grp", byt_score_sdio_pins, 1),
PIN_GROUP("lpc_grp", byt_score_ilb_lpc_pins, 1), PIN_GROUP_GPIO("emmc_grp", byt_score_emmc_pins, 1),
PIN_GROUP("sata_grp", byt_score_sata_pins, 1), PIN_GROUP_GPIO("lpc_grp", byt_score_ilb_lpc_pins, 1),
PIN_GROUP("plt_clk0_grp", byt_score_plt_clk0_pins, 1), PIN_GROUP_GPIO("sata_grp", byt_score_sata_pins, 1),
PIN_GROUP("plt_clk1_grp", byt_score_plt_clk1_pins, 1), PIN_GROUP_GPIO("plt_clk0_grp", byt_score_plt_clk0_pins, 1),
PIN_GROUP("plt_clk2_grp", byt_score_plt_clk2_pins, 1), PIN_GROUP_GPIO("plt_clk1_grp", byt_score_plt_clk1_pins, 1),
PIN_GROUP("plt_clk3_grp", byt_score_plt_clk3_pins, 1), PIN_GROUP_GPIO("plt_clk2_grp", byt_score_plt_clk2_pins, 1),
PIN_GROUP("plt_clk4_grp", byt_score_plt_clk4_pins, 1), PIN_GROUP_GPIO("plt_clk3_grp", byt_score_plt_clk3_pins, 1),
PIN_GROUP("plt_clk5_grp", byt_score_plt_clk5_pins, 1), PIN_GROUP_GPIO("plt_clk4_grp", byt_score_plt_clk4_pins, 1),
PIN_GROUP("smbus_grp", byt_score_smbus_pins, 1), PIN_GROUP_GPIO("plt_clk5_grp", byt_score_plt_clk5_pins, 1),
PIN_GROUP_GPIO("smbus_grp", byt_score_smbus_pins, 1),
}; };
static const char * const byt_score_uart_groups[] = { static const char * const byt_score_uart_groups[] = {
"uart1_grp", "uart2_grp", "uart1_grp", "uart2_grp", "uart3_grp",
}; };
static const char * const byt_score_pwm_groups[] = { static const char * const byt_score_pwm_groups[] = {
"pwm0_grp", "pwm1_grp", "pwm0_grp", "pwm1_grp",
...@@ -332,12 +334,14 @@ static const char * const byt_score_plt_clk_groups[] = { ...@@ -332,12 +334,14 @@ static const char * const byt_score_plt_clk_groups[] = {
}; };
static const char * const byt_score_smbus_groups[] = { "smbus_grp" }; static const char * const byt_score_smbus_groups[] = { "smbus_grp" };
static const char * const byt_score_gpio_groups[] = { static const char * const byt_score_gpio_groups[] = {
"uart1_grp", "uart2_grp", "pwm0_grp", "pwm1_grp", "ssp0_grp", "uart1_grp_gpio", "uart2_grp_gpio", "uart3_grp_gpio", "pwm0_grp_gpio",
"ssp1_grp", "ssp2_grp", "sio_spi_grp", "i2c0_grp", "i2c1_grp", "pwm1_grp_gpio", "ssp0_grp_gpio", "ssp1_grp_gpio", "ssp2_grp_gpio",
"i2c2_grp", "i2c3_grp", "i2c4_grp", "i2c5_grp", "i2c6_grp", "sio_spi_grp_gpio", "i2c0_grp_gpio", "i2c1_grp_gpio", "i2c2_grp_gpio",
"sdcard_grp", "sdio_grp", "emmc_grp", "lpc_grp", "sata_grp", "i2c3_grp_gpio", "i2c4_grp_gpio", "i2c5_grp_gpio", "i2c6_grp_gpio",
"plt_clk0_grp", "plt_clk1_grp", "plt_clk2_grp", "plt_clk3_grp", "sdcard_grp_gpio", "sdio_grp_gpio", "emmc_grp_gpio", "lpc_grp_gpio",
"plt_clk4_grp", "plt_clk5_grp", "smbus_grp", "sata_grp_gpio", "plt_clk0_grp_gpio", "plt_clk1_grp_gpio",
"plt_clk2_grp_gpio", "plt_clk3_grp_gpio", "plt_clk4_grp_gpio",
"plt_clk5_grp_gpio", "smbus_grp_gpio",
}; };
static const struct intel_function byt_score_functions[] = { static const struct intel_function byt_score_functions[] = {
...@@ -456,8 +460,8 @@ static const struct intel_pingroup byt_sus_groups[] = { ...@@ -456,8 +460,8 @@ static const struct intel_pingroup byt_sus_groups[] = {
PIN_GROUP("usb_oc_grp_gpio", byt_sus_usb_over_current_pins, byt_sus_usb_over_current_gpio_mode_values), PIN_GROUP("usb_oc_grp_gpio", byt_sus_usb_over_current_pins, byt_sus_usb_over_current_gpio_mode_values),
PIN_GROUP("usb_ulpi_grp_gpio", byt_sus_usb_ulpi_pins, byt_sus_usb_ulpi_gpio_mode_values), PIN_GROUP("usb_ulpi_grp_gpio", byt_sus_usb_ulpi_pins, byt_sus_usb_ulpi_gpio_mode_values),
PIN_GROUP("pcu_spi_grp_gpio", byt_sus_pcu_spi_pins, byt_sus_pcu_spi_gpio_mode_values), PIN_GROUP("pcu_spi_grp_gpio", byt_sus_pcu_spi_pins, byt_sus_pcu_spi_gpio_mode_values),
PIN_GROUP("pmu_clk1_grp", byt_sus_pmu_clk1_pins, 1), PIN_GROUP_GPIO("pmu_clk1_grp", byt_sus_pmu_clk1_pins, 1),
PIN_GROUP("pmu_clk2_grp", byt_sus_pmu_clk2_pins, 1), PIN_GROUP_GPIO("pmu_clk2_grp", byt_sus_pmu_clk2_pins, 1),
}; };
static const char * const byt_sus_usb_groups[] = { static const char * const byt_sus_usb_groups[] = {
...@@ -469,7 +473,7 @@ static const char * const byt_sus_pmu_clk_groups[] = { ...@@ -469,7 +473,7 @@ static const char * const byt_sus_pmu_clk_groups[] = {
}; };
static const char * const byt_sus_gpio_groups[] = { static const char * const byt_sus_gpio_groups[] = {
"usb_oc_grp_gpio", "usb_ulpi_grp_gpio", "pcu_spi_grp_gpio", "usb_oc_grp_gpio", "usb_ulpi_grp_gpio", "pcu_spi_grp_gpio",
"pmu_clk1_grp", "pmu_clk2_grp", "pmu_clk1_grp_gpio", "pmu_clk2_grp_gpio",
}; };
static const struct intel_function byt_sus_functions[] = { static const struct intel_function byt_sus_functions[] = {
......
drivers/pinctrl/intel/pinctrl-intel.h
View file @ ac816e9e
...@@ -179,6 +179,10 @@ struct intel_community { ...@@ -179,6 +179,10 @@ struct intel_community {
.modes = __builtin_choose_expr(__builtin_constant_p((m)), NULL, (m)), \ .modes = __builtin_choose_expr(__builtin_constant_p((m)), NULL, (m)), \
} }
#define PIN_GROUP_GPIO(n, p, m) \
PIN_GROUP(n, p, m), \
PIN_GROUP(n "_gpio", p, 0)
#define FUNCTION(n, g) \ #define FUNCTION(n, g) \
{ \ { \
.func = PINCTRL_PINFUNCTION((n), (g), ARRAY_SIZE(g)), \ .func = PINCTRL_PINFUNCTION((n), (g), ARRAY_SIZE(g)), \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7