Commit 9cc7d590 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pin control fixes from Linus Walleij:

 - Add some missing pins on the Qualcomm QCM2290, along with a managed
   resources patch that make it clean and nice

 - Drop an unused function in the ST Micro driver

 - Drop bouncing MAINTAINER entry

 - Drop of_match_ptr() macro to rid compile warnings in the TB10x
   driver

 - Fix up calculation of pin numbers from base in the Sunxi driver

* tag 'pinctrl-v6.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: sunxi: dt: Consider pin base when calculating bank number from pin
  pinctrl: tb10x: Drop of_match_ptr for ID table
  pinctrl: MAINTAINERS: Drop bouncing Jianlong Huang
  pinctrl: st: Drop unused st_gpio_bank() function
  pinctrl: qcom: pinctrl-qcm2290: Add missing pins
  pinctrl: qcom: switch to devm_gpiochip_add_data()
parents 3d853391 5558f27a

Documentation/devicetree/bindings/pinctrl/starfive,jh7110-aon-pinctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ description: | 
  Some peripherals such as PWM have their I/O go through the 4 "GPIOs".



maintainers:

  - Jianlong Huang <jianlong.huang@starfivetech.com>

  - Hal Feng <hal.feng@starfivetech.com>



properties:

  compatible:

Documentation/devicetree/bindings/pinctrl/starfive,jh7110-sys-pinctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ description: | 
  any GPIO can be set up to be controlled by any of the peripherals.



maintainers:

  - Jianlong Huang <jianlong.huang@starfivetech.com>

  - Hal Feng <hal.feng@starfivetech.com>



properties:

  compatible:

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -23662,7 +23662,6 @@ F: include/dt-bindings/clock/starfive?jh71*.h 








STARFIVE JH71X0 PINCTRL DRIVERS









M:	Emil Renner Berthing <kernel@esmil.dk>









M:	Jianlong Huang <jianlong.huang@starfivetech.com>









M:	Hal Feng <hal.feng@starfivetech.com>









L:	linux-gpio@vger.kernel.org









S:	Maintained

























drivers/pinctrl/pinctrl-st.c



+0
−5






























Original line number
Diff line number
Diff line







@@ -374,11 +374,6 @@ static struct st_pio_control *st_get_pio_control(







}



















/* Low level functions.. */









static inline int st_gpio_bank(int gpio)









{









	return gpio/ST_GPIO_PINS_PER_BANK;









}



















static inline int st_gpio_pin(int gpio)









{









	return gpio%ST_GPIO_PINS_PER_BANK;
































drivers/pinctrl/pinctrl-tb10x.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -823,7 +823,7 @@ static struct platform_driver tb10x_pinctrl_pdrv = {







	.remove  = tb10x_pinctrl_remove,









	.driver  = {









		.name  = "tb10x_pinctrl",









		.of_match_table = of_match_ptr(tb10x_pinctrl_dt_ids),









		.of_match_table = tb10x_pinctrl_dt_ids,









	}









};