Skip to content

Commit 28968f3

Browse files
committed
Merge tag 'pinctrl-v6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control updates from Linus Walleij: "No core changes this time New drivers: - Tegra234 support - Qualcomm IPQ5018 support - Intel Meteor Lake-S support - Qualcomm SDX75 subdriver - Qualcomm SPMI-based PM8953 support Improvements: - Fix up support for GPIO3 on the AXP209 - Push-pull drive configuration support for the AT91 PIO4 - Fix misc non-urgent bugs in the AMD driver - Misc non-urgent improved error handling - Misc janitorial and minor improvements" * tag 'pinctrl-v6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (75 commits) pinctrl: cherryview: Drop goto label pinctrl: baytrail: invert if condition pinctrl: baytrail: add warning for BYT_VAL_REG retrieval failure pinctrl: baytrail: reduce scope of spinlock in ->dbg_show() hook pinctrl: tegra: avoid duplicate field initializers dt-bindings: pinctrl: qcom,sdx65-tlmm: add pcie_clkreq function pinctrl: mlxbf3: remove broken Kconfig 'select' pinctrl: spear: Remove unused of_gpio.h inclusion pinctrl: lantiq: Remove unused of_gpio.h inclusion pinctrl: at91-pio4: check return value of devm_kasprintf() pinctrl: microchip-sgpio: check return value of devm_kasprintf() pinctrl: freescale: Fix a memory out of bounds when num_configs is 1 pinctrl: intel: refine ->irq_set_type() hook pinctrl: intel: refine ->set_mux() hook pinctrl: baytrail: Use str_hi_lo() helper lib/string_choices: Add str_high_low() helper lib/string_helpers: Split out string_choices.h lib/string_helpers: Add missing header files to MAINTAINERS database pinctrl: npcm7xx: Add missing check for ioremap pinctrl:sunplus: Add check for kmalloc ...
2 parents 9c3255a + 9f0648f commit 28968f3

File tree

112 files changed

+11602
-7366
lines changed

Some content is hidden

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

112 files changed

+11602
-7366
lines changed

Documentation/devicetree/bindings/pinctrl/atmel,at91-pio4-pinctrl.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ right representation of the pin.
3737
Optional properties:
3838
- GENERIC_PINCONFIG: generic pinconfig options to use:
3939
- bias-disable, bias-pull-down, bias-pull-up, drive-open-drain,
40-
input-schmitt-enable, input-debounce, output-low, output-high.
40+
drive-push-pull input-schmitt-enable, input-debounce, output-low,
41+
output-high.
4142
- for microchip,sama7g5-pinctrl only:
4243
- slew-rate: 0 - disabled, 1 - enabled (default)
4344
- atmel,drive-strength: 0 or 1 for low drive, 2 for medium drive and 3 for
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pinctrl/nvidia,tegra234-pinmux-aon.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NVIDIA Tegra234 AON Pinmux Controller
8+
9+
maintainers:
10+
- Thierry Reding <[email protected]>
11+
- Jon Hunter <[email protected]>
12+
13+
$ref: nvidia,tegra234-pinmux-common.yaml
14+
15+
properties:
16+
compatible:
17+
const: nvidia,tegra234-pinmux-aon
18+
19+
patternProperties:
20+
"^pinmux(-[a-z0-9-]+)?$":
21+
type: object
22+
23+
# pin groups
24+
additionalProperties:
25+
properties:
26+
nvidia,pins:
27+
items:
28+
enum: [ can0_dout_paa0, can0_din_paa1, can1_dout_paa2,
29+
can1_din_paa3, can0_stb_paa4, can0_en_paa5,
30+
soc_gpio49_paa6, can0_err_paa7, can1_stb_pbb0,
31+
can1_en_pbb1, soc_gpio50_pbb2, can1_err_pbb3,
32+
spi2_sck_pcc0, spi2_miso_pcc1, spi2_mosi_pcc2,
33+
spi2_cs0_pcc3, touch_clk_pcc4, uart3_tx_pcc5,
34+
uart3_rx_pcc6, gen2_i2c_scl_pcc7, gen2_i2c_sda_pdd0,
35+
gen8_i2c_scl_pdd1, gen8_i2c_sda_pdd2,
36+
sce_error_pee0, vcomp_alert_pee1,
37+
ao_retention_n_pee2, batt_oc_pee3, power_on_pee4,
38+
soc_gpio26_pee5, soc_gpio27_pee6, bootv_ctl_n_pee7,
39+
hdmi_cec_pgg0,
40+
# drive groups
41+
drive_touch_clk_pcc4, drive_uart3_rx_pcc6,
42+
drive_uart3_tx_pcc5, drive_gen8_i2c_sda_pdd2,
43+
drive_gen8_i2c_scl_pdd1, drive_spi2_mosi_pcc2,
44+
drive_gen2_i2c_scl_pcc7, drive_spi2_cs0_pcc3,
45+
drive_gen2_i2c_sda_pdd0, drive_spi2_sck_pcc0,
46+
drive_spi2_miso_pcc1, drive_can1_dout_paa2,
47+
drive_can1_din_paa3, drive_can0_dout_paa0,
48+
drive_can0_din_paa1, drive_can0_stb_paa4,
49+
drive_can0_en_paa5, drive_soc_gpio49_paa6,
50+
drive_can0_err_paa7, drive_can1_stb_pbb0,
51+
drive_can1_en_pbb1, drive_soc_gpio50_pbb2,
52+
drive_can1_err_pbb3, drive_sce_error_pee0,
53+
drive_batt_oc_pee3, drive_bootv_ctl_n_pee7,
54+
drive_power_on_pee4, drive_soc_gpio26_pee5,
55+
drive_soc_gpio27_pee6, drive_ao_retention_n_pee2,
56+
drive_vcomp_alert_pee1, drive_hdmi_cec_pgg0 ]
57+
58+
unevaluatedProperties: false
59+
60+
examples:
61+
- |
62+
#include <dt-bindings/pinctrl/pinctrl-tegra.h>
63+
64+
pinmux@c300000 {
65+
compatible = "nvidia,tegra234-pinmux-aon";
66+
reg = <0xc300000 0x4000>;
67+
68+
pinctrl-names = "cec";
69+
pinctrl-0 = <&cec_state>;
70+
71+
cec_state: pinmux-cec {
72+
cec {
73+
nvidia,pins = "hdmi_cec_pgg0";
74+
nvidia,function = "gp";
75+
};
76+
};
77+
};
78+
...
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pinctrl/nvidia,tegra234-pinmux-common.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NVIDIA Tegra234 Pinmux Controller
8+
9+
maintainers:
10+
- Thierry Reding <[email protected]>
11+
- Jon Hunter <[email protected]>
12+
13+
properties:
14+
reg:
15+
items:
16+
- description: pinmux registers
17+
18+
patternProperties:
19+
"^pinmux(-[a-z0-9-]+)?$":
20+
type: object
21+
22+
# pin groups
23+
additionalProperties:
24+
$ref: nvidia,tegra-pinmux-common.yaml
25+
# We would typically use unevaluatedProperties here but that has the
26+
# downside that all the properties in the common bindings become valid
27+
# for all chip generations. In this case, however, we want the per-SoC
28+
# bindings to be able to override which of the common properties are
29+
# allowed, since not all pinmux generations support the same sets of
30+
# properties. This way, the common bindings define the format of the
31+
# properties but the per-SoC bindings define which of them apply to a
32+
# given chip.
33+
additionalProperties: false
34+
properties:
35+
nvidia,function:
36+
enum: [ gp, uartc, i2c8, spi2, i2c2, can1, can0, rsvd0, eth0, eth2,
37+
eth1, dp, eth3, i2c4, i2c7, i2c9, eqos, pe2, pe1, pe0, pe3,
38+
pe4, pe5, pe6, pe7, pe8, pe9, pe10, qspi0, qspi1, qpsi,
39+
sdmmc1, sce, soc, gpio, hdmi, ufs0, spi3, spi1, uartb, uarte,
40+
usb, extperiph2, extperiph1, i2c3, vi0, i2c5, uarta, uartd,
41+
i2c1, i2s4, i2s6, aud, spi5, touch, uartj, rsvd1, wdt, tsc,
42+
dmic3, led, vi0_alt, i2s5, nv, extperiph3, extperiph4, spi4,
43+
ccla, i2s1, i2s2, i2s3, i2s8, rsvd2, dmic5, dca, displayb,
44+
displaya, vi1, dcb, dmic1, dmic4, i2s7, dmic2, dspk0, rsvd3,
45+
tsc_alt, istctrl, vi1_alt, dspk1, igpu ]
46+
47+
# out of the common properties, only these are allowed for Tegra234
48+
nvidia,pins: true
49+
nvidia,pull: true
50+
nvidia,tristate: true
51+
nvidia,schmitt: true
52+
nvidia,enable-input: true
53+
nvidia,open-drain: true
54+
nvidia,lock: true
55+
nvidia,drive-type: true
56+
nvidia,io-hv: true
57+
58+
required:
59+
- nvidia,pins
60+
61+
required:
62+
- compatible
63+
- reg
64+
65+
additionalProperties: true
66+
...
Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pinctrl/nvidia,tegra234-pinmux.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NVIDIA Tegra234 Pinmux Controller
8+
9+
maintainers:
10+
- Thierry Reding <[email protected]>
11+
- Jon Hunter <[email protected]>
12+
13+
$ref: nvidia,tegra234-pinmux-common.yaml
14+
15+
properties:
16+
compatible:
17+
const: nvidia,tegra234-pinmux
18+
19+
patternProperties:
20+
"^pinmux(-[a-z0-9-]+)?$":
21+
type: object
22+
23+
# pin groups
24+
additionalProperties:
25+
properties:
26+
nvidia,pins:
27+
items:
28+
enum: [ dap6_sclk_pa0, dap6_dout_pa1, dap6_din_pa2,
29+
dap6_fs_pa3, dap4_sclk_pa4, dap4_dout_pa5,
30+
dap4_din_pa6, dap4_fs_pa7, soc_gpio08_pb0,
31+
qspi0_sck_pc0, qspi0_cs_n_pc1,
32+
qspi0_io0_pc2, qspi0_io1_pc3, qspi0_io2_pc4,
33+
qspi0_io3_pc5, qspi1_sck_pc6, qspi1_cs_n_pc7,
34+
qspi1_io0_pd0, qspi1_io1_pd1, qspi1_io2_pd2,
35+
qspi1_io3_pd3, eqos_txc_pe0, eqos_td0_pe1,
36+
eqos_td1_pe2, eqos_td2_pe3, eqos_td3_pe4,
37+
eqos_tx_ctl_pe5, eqos_rd0_pe6, eqos_rd1_pe7,
38+
eqos_rd2_pf0, eqos_rd3_pf1, eqos_rx_ctl_pf2,
39+
eqos_rxc_pf3, eqos_sma_mdio_pf4, eqos_sma_mdc_pf5,
40+
soc_gpio13_pg0, soc_gpio14_pg1, soc_gpio15_pg2,
41+
soc_gpio16_pg3, soc_gpio17_pg4, soc_gpio18_pg5,
42+
soc_gpio19_pg6, soc_gpio20_pg7, soc_gpio21_ph0,
43+
soc_gpio22_ph1, soc_gpio06_ph2, uart4_tx_ph3,
44+
uart4_rx_ph4, uart4_rts_ph5, uart4_cts_ph6,
45+
soc_gpio41_ph7, soc_gpio42_pi0, soc_gpio43_pi1,
46+
soc_gpio44_pi2, gen1_i2c_scl_pi3, gen1_i2c_sda_pi4,
47+
cpu_pwr_req_pi5, soc_gpio07_pi6,
48+
sdmmc1_clk_pj0, sdmmc1_cmd_pj1, sdmmc1_dat0_pj2,
49+
sdmmc1_dat1_pj3, sdmmc1_dat2_pj4, sdmmc1_dat3_pj5,
50+
pex_l0_clkreq_n_pk0, pex_l0_rst_n_pk1,
51+
pex_l1_clkreq_n_pk2, pex_l1_rst_n_pk3,
52+
pex_l2_clkreq_n_pk4, pex_l2_rst_n_pk5,
53+
pex_l3_clkreq_n_pk6, pex_l3_rst_n_pk7,
54+
pex_l4_clkreq_n_pl0, pex_l4_rst_n_pl1,
55+
pex_wake_n_pl2, soc_gpio34_pl3, dp_aux_ch0_hpd_pm0,
56+
dp_aux_ch1_hpd_pm1, dp_aux_ch2_hpd_pm2,
57+
dp_aux_ch3_hpd_pm3, soc_gpio55_pm4, soc_gpio36_pm5,
58+
soc_gpio53_pm6, soc_gpio38_pm7, dp_aux_ch3_n_pn0,
59+
soc_gpio39_pn1, soc_gpio40_pn2, dp_aux_ch1_p_pn3,
60+
dp_aux_ch1_n_pn4, dp_aux_ch2_p_pn5, dp_aux_ch2_n_pn6,
61+
dp_aux_ch3_p_pn7, extperiph1_clk_pp0,
62+
extperiph2_clk_pp1, cam_i2c_scl_pp2, cam_i2c_sda_pp3,
63+
soc_gpio23_pp4, soc_gpio24_pp5, soc_gpio25_pp6,
64+
pwr_i2c_scl_pp7, pwr_i2c_sda_pq0, soc_gpio28_pq1,
65+
soc_gpio29_pq2, soc_gpio30_pq3, soc_gpio31_pq4,
66+
soc_gpio32_pq5, soc_gpio33_pq6, soc_gpio35_pq7,
67+
soc_gpio37_pr0, soc_gpio56_pr1, uart1_tx_pr2,
68+
uart1_rx_pr3, uart1_rts_pr4, uart1_cts_pr5,
69+
soc_gpio61_pw0, soc_gpio62_pw1, gpu_pwr_req_px0,
70+
cv_pwr_req_px1, gp_pwm2_px2, gp_pwm3_px3, uart2_tx_px4,
71+
uart2_rx_px5, uart2_rts_px6, uart2_cts_px7, spi3_sck_py0,
72+
spi3_miso_py1, spi3_mosi_py2, spi3_cs0_py3,
73+
spi3_cs1_py4, uart5_tx_py5, uart5_rx_py6,
74+
uart5_rts_py7, uart5_cts_pz0, usb_vbus_en0_pz1,
75+
usb_vbus_en1_pz2, spi1_sck_pz3, spi1_miso_pz4,
76+
spi1_mosi_pz5, spi1_cs0_pz6, spi1_cs1_pz7,
77+
spi5_sck_pac0, spi5_miso_pac1, spi5_mosi_pac2,
78+
spi5_cs0_pac3, soc_gpio57_pac4, soc_gpio58_pac5,
79+
soc_gpio59_pac6, soc_gpio60_pac7, soc_gpio45_pad0,
80+
soc_gpio46_pad1, soc_gpio47_pad2, soc_gpio48_pad3,
81+
ufs0_ref_clk_pae0, ufs0_rst_n_pae1,
82+
pex_l5_clkreq_n_paf0, pex_l5_rst_n_paf1,
83+
pex_l6_clkreq_n_paf2, pex_l6_rst_n_paf3,
84+
pex_l7_clkreq_n_pag0, pex_l7_rst_n_pag1,
85+
pex_l8_clkreq_n_pag2, pex_l8_rst_n_pag3,
86+
pex_l9_clkreq_n_pag4, pex_l9_rst_n_pag5,
87+
pex_l10_clkreq_n_pag6, pex_l10_rst_n_pag7,
88+
sdmmc1_comp, eqos_comp, qspi_comp,
89+
# drive groups
90+
drive_soc_gpio08_pb0, drive_soc_gpio36_pm5,
91+
drive_soc_gpio53_pm6, drive_soc_gpio55_pm4,
92+
drive_soc_gpio38_pm7, drive_soc_gpio39_pn1,
93+
drive_soc_gpio40_pn2, drive_dp_aux_ch0_hpd_pm0,
94+
drive_dp_aux_ch1_hpd_pm1, drive_dp_aux_ch2_hpd_pm2,
95+
drive_dp_aux_ch3_hpd_pm3, drive_dp_aux_ch1_p_pn3,
96+
drive_dp_aux_ch1_n_pn4, drive_dp_aux_ch2_p_pn5,
97+
drive_dp_aux_ch2_n_pn6, drive_dp_aux_ch3_p_pn7,
98+
drive_dp_aux_ch3_n_pn0, drive_pex_l2_clkreq_n_pk4,
99+
drive_pex_wake_n_pl2, drive_pex_l1_clkreq_n_pk2,
100+
drive_pex_l1_rst_n_pk3, drive_pex_l0_clkreq_n_pk0,
101+
drive_pex_l0_rst_n_pk1, drive_pex_l2_rst_n_pk5,
102+
drive_pex_l3_clkreq_n_pk6, drive_pex_l3_rst_n_pk7,
103+
drive_pex_l4_clkreq_n_pl0, drive_pex_l4_rst_n_pl1,
104+
drive_soc_gpio34_pl3, drive_pex_l5_clkreq_n_paf0,
105+
drive_pex_l5_rst_n_paf1, drive_pex_l6_clkreq_n_paf2,
106+
drive_pex_l6_rst_n_paf3, drive_pex_l10_clkreq_n_pag6,
107+
drive_pex_l10_rst_n_pag7, drive_pex_l7_clkreq_n_pag0,
108+
drive_pex_l7_rst_n_pag1, drive_pex_l8_clkreq_n_pag2,
109+
drive_pex_l8_rst_n_pag3, drive_pex_l9_clkreq_n_pag4,
110+
drive_pex_l9_rst_n_pag5, drive_sdmmc1_clk_pj0,
111+
drive_sdmmc1_cmd_pj1, drive_sdmmc1_dat3_pj5,
112+
drive_sdmmc1_dat2_pj4, drive_sdmmc1_dat1_pj3,
113+
drive_sdmmc1_dat0_pj2 ]
114+
115+
unevaluatedProperties: false
116+
117+
examples:
118+
- |
119+
#include <dt-bindings/pinctrl/pinctrl-tegra.h>
120+
121+
pinmux@2430000 {
122+
compatible = "nvidia,tegra234-pinmux";
123+
reg = <0x2430000 0x17000>;
124+
125+
pinctrl-names = "pex_rst";
126+
pinctrl-0 = <&pex_rst_c5_out_state>;
127+
128+
pex_rst_c5_out_state: pinmux-pex-rst-c5-out {
129+
pexrst {
130+
nvidia,pins = "pex_l5_rst_n_paf1";
131+
nvidia,schmitt = <TEGRA_PIN_DISABLE>;
132+
nvidia,enable-input = <TEGRA_PIN_DISABLE>;
133+
nvidia,io-hv = <TEGRA_PIN_ENABLE>;
134+
nvidia,tristate = <TEGRA_PIN_DISABLE>;
135+
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
136+
};
137+
};
138+
};
139+
...

0 commit comments

Comments
 (0)