Skip to content

Commit b746043

Browse files
committed
Merge tag 'pinctrl-v6.14-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: - New subdriver for the Qualcomm MSM8917 SoC TLMM - New subdriver for the Mediatek MT7988 SoC - New subdriver for the Rockchip RK3562 SoC - New subdriver for the Renesas RZ/G3E SoC Improvements: - Fix some missing pins in the Qualcomm IPQ5424 TLMM - Fix some missing LVDS pins in the Sunxi A100/A133 - Support Sunxi V853 (simple compatible string) - Cleanups in the Samsung driver - Fix some AMD suspend behaviour - Cleanups" * tag 'pinctrl-v6.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (29 commits) dt-bindings: pinctrl: sunxi: add compatible for V853 pinctrl: Use str_enable_disable-like helpers dt-bindings: pinctrl: Correct indentation and style in DTS example pinctrl: amd: Take suspend type into consideration which pins are non-wake pinctrl: stm32: Add check for clk_enable() pinctrl: renesas: rzg2l: Fix PFC_MASK for RZ/V2H and RZ/G3E pinctrl: sunxi: add missed lvds pins for a100/a133 pinctrl: mediatek: Drop mtk_pinconf_bias_set_pd() pinctrl: renesas: rzg2l: Add support for RZ/G3E SoC pinctrl: renesas: rzg2l: Update r9a09g057_variable_pin_cfg table dt-bindings: pinctrl: renesas: Document RZ/G3E SoC dt-bindings: pinctrl: renesas: Add alpha-numerical port support for RZ/V2H pinctrl: rockchip: add rk3562 support dt-bindings: pinctrl: Add rk3562 pinctrl support pinctrl: Fix the clean up on pinconf_apply_setting failure dt-bindings: pinctrl: add binding for MT7988 SoC pinctrl: mediatek: add MT7988 pinctrl driver pinctrl: mediatek: add support for MTK_PULL_PD_TYPE pinctrl: ocelot: Constify some structures pinctrl: renesas: rzg2l: Add audio clock pins on RZ/G3S ...
2 parents f1c243f + c9da995 commit b746043

Some content is hidden

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

46 files changed

+4803
-301
lines changed

Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ properties:
4444
- allwinner,sun8i-r40-pinctrl
4545
- allwinner,sun8i-v3-pinctrl
4646
- allwinner,sun8i-v3s-pinctrl
47+
- allwinner,sun8i-v853-pinctrl
4748
- allwinner,sun9i-a80-pinctrl
4849
- allwinner,sun9i-a80-r-pinctrl
4950
- allwinner,sun20i-d1-pinctrl
@@ -179,6 +180,18 @@ allOf:
179180
minItems: 7
180181
maxItems: 7
181182

183+
- if:
184+
properties:
185+
compatible:
186+
enum:
187+
- allwinner,sun8i-v853-pinctrl
188+
189+
then:
190+
properties:
191+
interrupts:
192+
minItems: 8
193+
maxItems: 8
194+
182195
- if:
183196
properties:
184197
compatible:

Documentation/devicetree/bindings/pinctrl/atmel,at91rm9200-pinctrl.yaml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -145,40 +145,40 @@ additionalProperties:
145145
146146
examples:
147147
- |
148-
#include <dt-bindings/clock/at91.h>
149-
#include <dt-bindings/interrupt-controller/irq.h>
150-
#include <dt-bindings/pinctrl/at91.h>
151-
152-
pinctrl@fffff400 {
153-
#address-cells = <1>;
154-
#size-cells = <1>;
155-
compatible = "atmel,at91rm9200-pinctrl", "simple-mfd";
156-
ranges = <0xfffff400 0xfffff400 0x600>;
157-
158-
atmel,mux-mask = <
159-
/* A B */
160-
0xffffffff 0xffc00c3b /* pioA */
161-
0xffffffff 0x7fff3ccf /* pioB */
162-
0xffffffff 0x007fffff /* pioC */
163-
>;
164-
165-
dbgu {
166-
pinctrl_dbgu: dbgu-0 {
167-
atmel,pins =
168-
<AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
169-
AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE>;
170-
};
171-
};
172-
173-
pioA: gpio@fffff400 {
174-
compatible = "atmel,at91rm9200-gpio";
175-
reg = <0xfffff400 0x200>;
176-
interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
177-
#gpio-cells = <2>;
178-
gpio-controller;
179-
interrupt-controller;
180-
#interrupt-cells = <2>;
181-
clocks = <&pmc PMC_TYPE_PERIPHERAL 2>;
182-
};
183-
};
148+
#include <dt-bindings/clock/at91.h>
149+
#include <dt-bindings/interrupt-controller/irq.h>
150+
#include <dt-bindings/pinctrl/at91.h>
151+
152+
pinctrl@fffff400 {
153+
#address-cells = <1>;
154+
#size-cells = <1>;
155+
compatible = "atmel,at91rm9200-pinctrl", "simple-mfd";
156+
ranges = <0xfffff400 0xfffff400 0x600>;
157+
158+
atmel,mux-mask = <
159+
/* A B */
160+
0xffffffff 0xffc00c3b /* pioA */
161+
0xffffffff 0x7fff3ccf /* pioB */
162+
0xffffffff 0x007fffff /* pioC */
163+
>;
164+
165+
dbgu {
166+
dbgu-0 {
167+
atmel,pins =
168+
<AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
169+
AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE>;
170+
};
171+
};
172+
173+
gpio@fffff400 {
174+
compatible = "atmel,at91rm9200-gpio";
175+
reg = <0xfffff400 0x200>;
176+
interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
177+
#gpio-cells = <2>;
178+
gpio-controller;
179+
interrupt-controller;
180+
#interrupt-cells = <2>;
181+
clocks = <&pmc PMC_TYPE_PERIPHERAL 2>;
182+
};
183+
};
184184
...

0 commit comments

Comments
 (0)