Skip to content

Commit 9cc7d59

Browse files
committed
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()
2 parents 3d85339 + 5558f27 commit 9cc7d59

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+17
-80
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ description: |
1515
Some peripherals such as PWM have their I/O go through the 4 "GPIOs".
1616
1717
maintainers:
18-
- Jianlong Huang <jianlong.huang@starfivetech.com>
18+
- Hal Feng <hal.feng@starfivetech.com>
1919

2020
properties:
2121
compatible:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ description: |
1818
any GPIO can be set up to be controlled by any of the peripherals.
1919
2020
maintainers:
21-
- Jianlong Huang <jianlong.huang@starfivetech.com>
21+
- Hal Feng <hal.feng@starfivetech.com>
2222

2323
properties:
2424
compatible:

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23662,7 +23662,6 @@ F: include/dt-bindings/clock/starfive?jh71*.h
2366223662

2366323663
STARFIVE JH71X0 PINCTRL DRIVERS
2366423664
M: Emil Renner Berthing <[email protected]>
23665-
M: Jianlong Huang <[email protected]>
2366623665
M: Hal Feng <[email protected]>
2366723666
2366823667
S: Maintained

drivers/pinctrl/pinctrl-st.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,6 @@ static struct st_pio_control *st_get_pio_control(
374374
}
375375

376376
/* Low level functions.. */
377-
static inline int st_gpio_bank(int gpio)
378-
{
379-
return gpio/ST_GPIO_PINS_PER_BANK;
380-
}
381-
382377
static inline int st_gpio_pin(int gpio)
383378
{
384379
return gpio%ST_GPIO_PINS_PER_BANK;

drivers/pinctrl/pinctrl-tb10x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ static struct platform_driver tb10x_pinctrl_pdrv = {
823823
.remove = tb10x_pinctrl_remove,
824824
.driver = {
825825
.name = "tb10x_pinctrl",
826-
.of_match_table = of_match_ptr(tb10x_pinctrl_dt_ids),
826+
.of_match_table = tb10x_pinctrl_dt_ids,
827827
}
828828
};
829829

drivers/pinctrl/qcom/pinctrl-apq8064.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,6 @@ static struct platform_driver apq8064_pinctrl_driver = {
629629
.of_match_table = apq8064_pinctrl_of_match,
630630
},
631631
.probe = apq8064_pinctrl_probe,
632-
.remove = msm_pinctrl_remove,
633632
};
634633

635634
static int __init apq8064_pinctrl_init(void)

drivers/pinctrl/qcom/pinctrl-apq8084.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1207,7 +1207,6 @@ static struct platform_driver apq8084_pinctrl_driver = {
12071207
.of_match_table = apq8084_pinctrl_of_match,
12081208
},
12091209
.probe = apq8084_pinctrl_probe,
1210-
.remove = msm_pinctrl_remove,
12111210
};
12121211

12131212
static int __init apq8084_pinctrl_init(void)

drivers/pinctrl/qcom/pinctrl-ipq4019.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,6 @@ static struct platform_driver ipq4019_pinctrl_driver = {
710710
.of_match_table = ipq4019_pinctrl_of_match,
711711
},
712712
.probe = ipq4019_pinctrl_probe,
713-
.remove = msm_pinctrl_remove,
714713
};
715714

716715
static int __init ipq4019_pinctrl_init(void)

drivers/pinctrl/qcom/pinctrl-ipq5018.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,6 @@ static struct platform_driver ipq5018_pinctrl_driver = {
754754
.of_match_table = ipq5018_pinctrl_of_match,
755755
},
756756
.probe = ipq5018_pinctrl_probe,
757-
.remove = msm_pinctrl_remove,
758757
};
759758

760759
static int __init ipq5018_pinctrl_init(void)

drivers/pinctrl/qcom/pinctrl-ipq5332.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,6 @@ static struct platform_driver ipq5332_pinctrl_driver = {
834834
.of_match_table = ipq5332_pinctrl_of_match,
835835
},
836836
.probe = ipq5332_pinctrl_probe,
837-
.remove = msm_pinctrl_remove,
838837
};
839838

840839
static int __init ipq5332_pinctrl_init(void)

0 commit comments

Comments
 (0)