Skip to content

Commit 2f992e7

Browse files
committed
Merge tag 'stm32-dt-for-v6.13-1' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into soc/dt
STM32 DT for v6.13, round 1 Highlights: ---------- - MPU: - STM32MP13: - ST DK board: - Add support of WLAN/BT Murata Type 1DX module. - DH SOM: - Add M24256E EEPROM suport. - STMP32MP15: - Use IWDG2 as wakeup source. - Add support of WLAN/BT Murata Type 1DX module on DK2 board. - STM32MP25: - Enable RTC. - Add DMA support for U(S)ART, I2C and SPI instances. * tag 'stm32-dt-for-v6.13-1' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: arm64: dts: st: add DMA support on SPI instances of stm32mp25 arm64: dts: st: add DMA support on I2C instances of stm32mp25 arm64: dts: st: add DMA support on U(S)ART instances of stm32mp25 arm64: dts: st: add RNG node on stm32mp251 arm64: dts: st: enable RTC on stm32mp257f-ev1 board arm64: dts: st: add RTC on stm32mp25x ARM: dts: stm32: add support of WLAN/BT on stm32mp135f-dk ARM: dts: stm32: add support of WLAN/BT on stm32mp157c-dk2 ARM: dts: stm32: rtc, add LSCO to WLAN/BT module on stm32mp135f-dk ARM: dts: stm32: rtc, add LSCO to WLAN/BT module on stm32mp157c-dk2 ARM: dts: stm32: rtc, add pin to provide LSCO on stm32mp13 ARM: dts: stm32: rtc, add pin to provide LSCO on stm32mp15 ARM: dts: stm32: Describe M24256E write-lockable page in DH STM32MP13xx DHCOR SoM DT ARM: dts: stm32: Add IWDG2 EXTI interrupt mapping and mark as wakeup source Link: https://lore.kernel.org/r/92d2d6df-cc5c-488f-8ebd-550b1903db12@foss.st.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents d745bdc + b0191a5 commit 2f992e7

8 files changed

Lines changed: 225 additions & 1 deletion

File tree

arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,13 @@
594594
};
595595
};
596596

597+
/omit-if-no-ref/
598+
rtc_rsvd_pins_a: rtc-rsvd-0 {
599+
pins {
600+
pinmux = <STM32_PINMUX('I', 1, ANALOG)>; /* RTC_OUT2_RMP */
601+
};
602+
};
603+
597604
/omit-if-no-ref/
598605
sai1a_pins_a: sai1a-0 {
599606
pins {

arch/arm/boot/dts/st/stm32mp135f-dk.dts

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,19 @@
121121
};
122122
};
123123
};
124+
125+
v3v3_ao: v3v3-ao {
126+
compatible = "regulator-fixed";
127+
regulator-name = "v3v3_ao";
128+
regulator-min-microvolt = <3300000>;
129+
regulator-max-microvolt = <3300000>;
130+
regulator-always-on;
131+
};
132+
133+
wifi_pwrseq: wifi-pwrseq {
134+
compatible = "mmc-pwrseq-simple";
135+
reset-gpios = <&mcp23017 11 GPIO_ACTIVE_LOW>;
136+
};
124137
};
125138

126139
&adc_1 {
@@ -346,7 +359,14 @@
346359
};
347360

348361
&rtc {
362+
pinctrl-names = "default";
363+
pinctrl-0 = <&rtc_rsvd_pins_a>;
349364
status = "okay";
365+
366+
rtc_lsco_pins_a: rtc-lsco-0 {
367+
pins = "out2_rmp";
368+
function = "lsco";
369+
};
350370
};
351371

352372
&scmi_regu {
@@ -385,6 +405,30 @@
385405
status = "okay";
386406
};
387407

408+
/* Wifi */
409+
&sdmmc2 {
410+
pinctrl-names = "default", "opendrain", "sleep";
411+
pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_clk_pins_a>;
412+
pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_clk_pins_a>;
413+
pinctrl-2 = <&sdmmc2_b4_sleep_pins_a>;
414+
non-removable;
415+
cap-sdio-irq;
416+
st,neg-edge;
417+
bus-width = <4>;
418+
vmmc-supply = <&v3v3_ao>;
419+
mmc-pwrseq = <&wifi_pwrseq>;
420+
#address-cells = <1>;
421+
#size-cells = <0>;
422+
status = "okay";
423+
424+
brcmf: bcrmf@1 {
425+
reg = <1>;
426+
compatible = "brcm,bcm4329-fmac";
427+
pinctrl-names = "default";
428+
pinctrl-0 = <&rtc_lsco_pins_a>;
429+
};
430+
};
431+
388432
&spi5 {
389433
pinctrl-names = "default", "sleep";
390434
pinctrl-0 = <&spi5_pins_a>;
@@ -491,6 +535,14 @@
491535
pinctrl-2 = <&usart2_idle_pins_a>;
492536
uart-has-rtscts;
493537
status = "okay";
538+
539+
bluetooth {
540+
shutdown-gpios = <&mcp23017 13 GPIO_ACTIVE_HIGH>;
541+
compatible = "brcm,bcm43438-bt";
542+
max-speed = <3000000>;
543+
vbat-supply = <&v3v3_ao>;
544+
vddio-supply = <&v3v3_ao>;
545+
};
494546
};
495547

496548
&usbh_ehci {

arch/arm/boot/dts/st/stm32mp13xx-dhcor-som.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,12 @@
201201
pagesize = <64>;
202202
};
203203

204+
eeprom0wl: eeprom@58 {
205+
compatible = "st,24256e-wl"; /* ST M24256E WL page of 0x50 */
206+
pagesize = <64>;
207+
reg = <0x58>;
208+
};
209+
204210
rv3032: rtc@51 {
205211
compatible = "microcrystal,rv3032";
206212
reg = <0x51>;

arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1696,6 +1696,13 @@
16961696
};
16971697
};
16981698

1699+
/omit-if-no-ref/
1700+
rtc_rsvd_pins_a: rtc-rsvd-0 {
1701+
pins {
1702+
pinmux = <STM32_PINMUX('I', 8, ANALOG)>; /* RTC_OUT2_RMP */
1703+
};
1704+
};
1705+
16991706
/omit-if-no-ref/
17001707
sai2a_pins_a: sai2a-0 {
17011708
pins {

arch/arm/boot/dts/st/stm32mp151.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,8 @@
355355
reg = <0x5a002000 0x400>;
356356
clocks = <&rcc IWDG2>, <&rcc CK_LSI>;
357357
clock-names = "pclk", "lsi";
358+
interrupts-extended = <&exti 46 IRQ_TYPE_LEVEL_HIGH>;
359+
wakeup-source;
358360
status = "disabled";
359361
};
360362

arch/arm/boot/dts/st/stm32mp157c-dk2.dts

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
chosen {
2525
stdout-path = "serial0:115200n8";
2626
};
27+
28+
wifi_pwrseq: wifi-pwrseq {
29+
compatible = "mmc-pwrseq-simple";
30+
reset-gpios = <&gpioh 4 GPIO_ACTIVE_LOW>;
31+
};
2732
};
2833

2934
&cryp1 {
@@ -84,10 +89,54 @@
8489
};
8590
};
8691

92+
&rtc {
93+
pinctrl-names = "default";
94+
pinctrl-0 = <&rtc_rsvd_pins_a>;
95+
96+
rtc_lsco_pins_a: rtc-lsco-0 {
97+
pins = "out2_rmp";
98+
function = "lsco";
99+
};
100+
};
101+
102+
/* Wifi */
103+
&sdmmc2 {
104+
pinctrl-names = "default", "opendrain", "sleep";
105+
pinctrl-0 = <&sdmmc2_b4_pins_a>;
106+
pinctrl-1 = <&sdmmc2_b4_od_pins_a>;
107+
pinctrl-2 = <&sdmmc2_b4_sleep_pins_a>;
108+
non-removable;
109+
cap-sdio-irq;
110+
st,neg-edge;
111+
bus-width = <4>;
112+
vmmc-supply = <&v3v3>;
113+
mmc-pwrseq = <&wifi_pwrseq>;
114+
#address-cells = <1>;
115+
#size-cells = <0>;
116+
status = "okay";
117+
118+
brcmf: bcrmf@1 {
119+
reg = <1>;
120+
compatible = "brcm,bcm4329-fmac";
121+
pinctrl-names = "default";
122+
pinctrl-0 = <&rtc_lsco_pins_a>;
123+
};
124+
};
125+
126+
/* Bluetooth */
87127
&usart2 {
88128
pinctrl-names = "default", "sleep", "idle";
89129
pinctrl-0 = <&usart2_pins_c>;
90130
pinctrl-1 = <&usart2_sleep_pins_c>;
91131
pinctrl-2 = <&usart2_idle_pins_c>;
92-
status = "disabled";
132+
uart-has-rtscts;
133+
status = "okay";
134+
135+
bluetooth {
136+
shutdown-gpios = <&gpioz 6 GPIO_ACTIVE_HIGH>;
137+
compatible = "brcm,bcm43438-bt";
138+
max-speed = <3000000>;
139+
vbat-supply = <&v3v3>;
140+
vddio-supply = <&v3v3>;
141+
};
93142
};

0 commit comments

Comments
 (0)