Commit 8dfce899 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v6.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pin control fixes from Linus Walleij:

 - Mark the Meson GPIO controller as sleeping to avoid a
   context splat

 - Fix up the I2S2 and SWR TX group settings in the
   Qualcomm SM8350 LPASS pin controller, and implement the
   proper .get_direction() callback

 - Fix a pin typo in the TG1520 pin controller

 - Fix a group name in the Marvell armada 3710 XB pin
   controller that got mangled in a DT schema rewrite

* tag 'pinctrl-v6.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  dt-bindings: pinctrl: marvell,armada3710-xb-pinctrl: fix 'usb32_drvvbus0' group name
  pinctrl: lpass-lpi: implement .get_direction() for the GPIO driver
  pinctrl: th1520: Fix typo
  pinctrl: qcom: sm8350-lpass-lpi: Merge with SC7280 to fix I2S2 and SWR TX pins
  pinctrl: meson: mark the GPIO controller as sleeping
parents 1f97d9dc f5844278

Documentation/devicetree/bindings/pinctrl/marvell,armada3710-xb-pinctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ patternProperties: 
                pcie1_clkreq, pcie1_wakeup, pmic0, pmic1, ptp, ptp_clk,

                ptp_trig, pwm0, pwm1, pwm2, pwm3, rgmii, sdio0, sdio_sb, smi,

                spi_cs1, spi_cs2, spi_cs3, spi_quad, uart1, uart2,

                usb2_drvvbus1, usb32_drvvbus ]

                usb2_drvvbus1, usb32_drvvbus0 ]



      function:

        enum: [ drvbus, emmc, gpio, i2c, jtag, led, mii, mii_err, onewire,

arch/arm64/configs/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -670,7 +670,6 @@ CONFIG_PINCTRL_LPASS_LPI=m 
CONFIG_PINCTRL_SC7280_LPASS_LPI=m

CONFIG_PINCTRL_SM6115_LPASS_LPI=m

CONFIG_PINCTRL_SM8250_LPASS_LPI=m

CONFIG_PINCTRL_SM8350_LPASS_LPI=m

CONFIG_PINCTRL_SM8450_LPASS_LPI=m

CONFIG_PINCTRL_SC8280XP_LPASS_LPI=m

CONFIG_PINCTRL_SM8550_LPASS_LPI=m

drivers/pinctrl/meson/pinctrl-meson.c

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ static int meson_gpiolib_register(struct meson_pinctrl *pc) 
	pc->chip.set = meson_gpio_set;

	pc->chip.base = -1;

	pc->chip.ngpio = pc->data->num_pins;

	pc->chip.can_sleep = false;

	pc->chip.can_sleep = true;



	ret = gpiochip_add_data(&pc->chip, pc);

	if (ret) {

drivers/pinctrl/pinctrl-th1520.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static const struct pinctrl_pin_desc th1520_group3_pins[] = { 
	TH1520_PAD(5,  QSPI0_D0_MOSI, QSPI, PWM,  I2S,  GPIO, ____, ____, 0),

	TH1520_PAD(6,  QSPI0_D1_MISO, QSPI, PWM,  I2S,  GPIO, ____, ____, 0),

	TH1520_PAD(7,  QSPI0_D2_WP,   QSPI, PWM,  I2S,  GPIO, ____, ____, 0),

	TH1520_PAD(8,  QSPI1_D3_HOLD, QSPI, ____, I2S,  GPIO, ____, ____, 0),

	TH1520_PAD(8,  QSPI0_D3_HOLD, QSPI, ____, I2S,  GPIO, ____, ____, 0),

	TH1520_PAD(9,  I2C2_SCL,      I2C,  UART, ____, GPIO, ____, ____, 0),

	TH1520_PAD(10, I2C2_SDA,      I2C,  UART, ____, GPIO, ____, ____, 0),

	TH1520_PAD(11, I2C3_SCL,      I2C,  ____, ____, GPIO, ____, ____, 0),

drivers/pinctrl/qcom/Kconfig

+3 −12
Original line number Diff line number Diff line
@@ -61,13 +61,14 @@ config PINCTRL_LPASS_LPI 
	  (Low Power Island) found on the Qualcomm Technologies Inc SoCs.



config PINCTRL_SC7280_LPASS_LPI

	tristate "Qualcomm Technologies Inc SC7280 LPASS LPI pin controller driver"

	tristate "Qualcomm Technologies Inc SC7280 and SM8350 LPASS LPI pin controller driver"

	depends on ARM64 || COMPILE_TEST

	depends on PINCTRL_LPASS_LPI

	help

	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the

	  Qualcomm Technologies Inc LPASS (Low Power Audio SubSystem) LPI

	  (Low Power Island) found on the Qualcomm Technologies Inc SC7280 platform.

	  (Low Power Island) found on the Qualcomm Technologies Inc SC7280

	  and SM8350 platforms.



config PINCTRL_SDM660_LPASS_LPI

	tristate "Qualcomm Technologies Inc SDM660 LPASS LPI pin controller driver"
@@ -106,16 +107,6 @@ config PINCTRL_SM8250_LPASS_LPI 
	  Qualcomm Technologies Inc LPASS (Low Power Audio SubSystem) LPI

	  (Low Power Island) found on the Qualcomm Technologies Inc SM8250 platform.



config PINCTRL_SM8350_LPASS_LPI

	tristate "Qualcomm Technologies Inc SM8350 LPASS LPI pin controller driver"

	depends on ARM64 || COMPILE_TEST

	depends on PINCTRL_LPASS_LPI

	help

	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the

	  Qualcomm Technologies Inc LPASS (Low Power Audio SubSystem) LPI

	  (Low Power Island) found on the Qualcomm Technologies Inc SM8350

	  platform.



config PINCTRL_SM8450_LPASS_LPI

	tristate "Qualcomm Technologies Inc SM8450 LPASS LPI pin controller driver"

	depends on ARM64 || COMPILE_TEST