Skip to content

Commit 2f7821a

Browse files
trinitrini
committed
Merge tag 'u-boot-stm32-20220620' of https://source.denx.de/u-boot/custodians/u-boot-stm into next
- Add STM32MP13 SoCs support with associated board STM32M135F-DK - Correct livetree support in stm32mp1 boards - Activate livetree for stm32mp15 DHSOM boards
2 parents a9e90d3 + eae488b commit 2f7821a

Some content is hidden

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

69 files changed

+2274
-739
lines changed

‎MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ S: Maintained
496496
F: arch/arm/mach-stm32mp/
497497
F: doc/board/st/
498498
F: drivers/adc/stm32-adc*
499-
F: drivers/clk/clk_stm32mp1.c
499+
F: drivers/clk/stm32/
500500
F: drivers/gpio/stm32_gpio.c
501501
F: drivers/hwspinlock/stm32_hwspinlock.c
502502
F: drivers/i2c/stm32f7_i2c.c

‎arch/arm/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1928,7 +1928,7 @@ config ARCH_STM32
19281928
imply CMD_DM
19291929

19301930
config ARCH_STI
1931-
bool "Support STMicrolectronics SoCs"
1931+
bool "Support STMicroelectronics SoCs"
19321932
select BLK
19331933
select CPU_V7A
19341934
select DM
@@ -1956,7 +1956,6 @@ config ARCH_STM32MP
19561956
select OF_SYSTEM_SETUP
19571957
select PINCTRL
19581958
select REGMAP
1959-
select SUPPORT_SPL
19601959
select SYSCON
19611960
select SYSRESET
19621961
select SYS_THUMB_BUILD

‎arch/arm/cpu/armv7/stv0991/lowlevel.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0+ */
22
/*
3-
* (C) Copyright 2014 stmicroelectronics
3+
* (C) Copyright 2014 STMicroelectronics
44
*/
55

66
#include <config.h>

‎arch/arm/dts/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,6 +1162,9 @@ dtb-$(CONFIG_ASPEED_AST2600) += ast2600-evb.dtb
11621162

11631163
dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb
11641164

1165+
dtb-$(CONFIG_STM32MP13x) += \
1166+
stm32mp135f-dk.dtb
1167+
11651168
dtb-$(CONFIG_STM32MP15x) += \
11661169
stm32mp157a-dk1.dtb \
11671170
stm32mp157a-icore-stm32mp1-ctouch2.dtb \

‎arch/arm/dts/stm32mp13-pinctrl.dtsi

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
2+
/*
3+
* Copyright (C) STMicroelectronics 2021 - All Rights Reserved
4+
* Author: Alexandre Torgue <[email protected]>
5+
*/
6+
#include <dt-bindings/pinctrl/stm32-pinfunc.h>
7+
8+
&pinctrl {
9+
sdmmc1_b4_pins_a: sdmmc1-b4-0 {
10+
pins {
11+
pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1_D0 */
12+
<STM32_PINMUX('C', 9, AF12)>, /* SDMMC1_D1 */
13+
<STM32_PINMUX('C', 10, AF12)>, /* SDMMC1_D2 */
14+
<STM32_PINMUX('C', 11, AF12)>, /* SDMMC1_D3 */
15+
<STM32_PINMUX('D', 2, AF12)>; /* SDMMC1_CMD */
16+
slew-rate = <1>;
17+
drive-push-pull;
18+
bias-disable;
19+
};
20+
};
21+
22+
sdmmc1_b4_od_pins_a: sdmmc1-b4-od-0 {
23+
pins1 {
24+
pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1_D0 */
25+
<STM32_PINMUX('C', 9, AF12)>, /* SDMMC1_D1 */
26+
<STM32_PINMUX('C', 10, AF12)>, /* SDMMC1_D2 */
27+
<STM32_PINMUX('C', 11, AF12)>; /* SDMMC1_D3 */
28+
slew-rate = <1>;
29+
drive-push-pull;
30+
bias-disable;
31+
};
32+
pins2 {
33+
pinmux = <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1_CMD */
34+
slew-rate = <1>;
35+
drive-open-drain;
36+
bias-disable;
37+
};
38+
};
39+
40+
sdmmc1_b4_sleep_pins_a: sdmmc1-b4-sleep-0 {
41+
pins {
42+
pinmux = <STM32_PINMUX('C', 8, ANALOG)>, /* SDMMC1_D0 */
43+
<STM32_PINMUX('C', 9, ANALOG)>, /* SDMMC1_D1 */
44+
<STM32_PINMUX('C', 10, ANALOG)>, /* SDMMC1_D2 */
45+
<STM32_PINMUX('C', 11, ANALOG)>, /* SDMMC1_D3 */
46+
<STM32_PINMUX('C', 12, ANALOG)>, /* SDMMC1_CK */
47+
<STM32_PINMUX('D', 2, ANALOG)>; /* SDMMC1_CMD */
48+
};
49+
};
50+
51+
sdmmc1_clk_pins_a: sdmmc1-clk-0 {
52+
pins {
53+
pinmux = <STM32_PINMUX('C', 12, AF12)>; /* SDMMC1_CK */
54+
slew-rate = <1>;
55+
drive-push-pull;
56+
bias-disable;
57+
};
58+
};
59+
60+
sdmmc2_b4_pins_a: sdmmc2-b4-0 {
61+
pins {
62+
pinmux = <STM32_PINMUX('B', 14, AF10)>, /* SDMMC2_D0 */
63+
<STM32_PINMUX('B', 15, AF10)>, /* SDMMC2_D1 */
64+
<STM32_PINMUX('B', 3, AF10)>, /* SDMMC2_D2 */
65+
<STM32_PINMUX('B', 4, AF10)>, /* SDMMC2_D3 */
66+
<STM32_PINMUX('G', 6, AF10)>; /* SDMMC2_CMD */
67+
slew-rate = <1>;
68+
drive-push-pull;
69+
bias-pull-up;
70+
};
71+
};
72+
73+
sdmmc2_b4_od_pins_a: sdmmc2-b4-od-0 {
74+
pins1 {
75+
pinmux = <STM32_PINMUX('B', 14, AF10)>, /* SDMMC2_D0 */
76+
<STM32_PINMUX('B', 15, AF10)>, /* SDMMC2_D1 */
77+
<STM32_PINMUX('B', 3, AF10)>, /* SDMMC2_D2 */
78+
<STM32_PINMUX('B', 4, AF10)>; /* SDMMC2_D3 */
79+
slew-rate = <1>;
80+
drive-push-pull;
81+
bias-pull-up;
82+
};
83+
pins2 {
84+
pinmux = <STM32_PINMUX('G', 6, AF10)>; /* SDMMC2_CMD */
85+
slew-rate = <1>;
86+
drive-open-drain;
87+
bias-pull-up;
88+
};
89+
};
90+
91+
sdmmc2_b4_sleep_pins_a: sdmmc2-b4-sleep-0 {
92+
pins {
93+
pinmux = <STM32_PINMUX('B', 14, ANALOG)>, /* SDMMC2_D0 */
94+
<STM32_PINMUX('B', 15, ANALOG)>, /* SDMMC2_D1 */
95+
<STM32_PINMUX('B', 3, ANALOG)>, /* SDMMC2_D2 */
96+
<STM32_PINMUX('B', 4, ANALOG)>, /* SDMMC2_D3 */
97+
<STM32_PINMUX('E', 3, ANALOG)>, /* SDMMC2_CK */
98+
<STM32_PINMUX('G', 6, ANALOG)>; /* SDMMC2_CMD */
99+
};
100+
};
101+
102+
sdmmc2_clk_pins_a: sdmmc2-clk-0 {
103+
pins {
104+
pinmux = <STM32_PINMUX('E', 3, AF10)>; /* SDMMC2_CK */
105+
slew-rate = <1>;
106+
drive-push-pull;
107+
bias-pull-up;
108+
};
109+
};
110+
111+
uart4_pins_a: uart4-0 {
112+
pins1 {
113+
pinmux = <STM32_PINMUX('D', 6, AF8)>; /* UART4_TX */
114+
bias-disable;
115+
drive-push-pull;
116+
slew-rate = <0>;
117+
};
118+
pins2 {
119+
pinmux = <STM32_PINMUX('D', 8, AF8)>; /* UART4_RX */
120+
bias-disable;
121+
};
122+
};
123+
};

‎arch/arm/dts/stm32mp13-u-boot.dtsi

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
2+
/*
3+
* Copyright (C) 2022, STMicroelectronics - All Rights Reserved
4+
*/
5+
6+
/ {
7+
aliases {
8+
gpio0 = &gpioa;
9+
gpio1 = &gpiob;
10+
gpio2 = &gpioc;
11+
gpio3 = &gpiod;
12+
gpio4 = &gpioe;
13+
gpio5 = &gpiof;
14+
gpio6 = &gpiog;
15+
gpio7 = &gpioh;
16+
gpio8 = &gpioi;
17+
pinctrl0 = &pinctrl;
18+
};
19+
20+
/* need PSCI for sysreset during board_f */
21+
psci {
22+
u-boot,dm-pre-proper;
23+
};
24+
25+
soc {
26+
u-boot,dm-pre-reloc;
27+
28+
ddr: ddr@5a003000 {
29+
u-boot,dm-pre-reloc;
30+
31+
compatible = "st,stm32mp13-ddr";
32+
33+
reg = <0x5A003000 0x550
34+
0x5A004000 0x234>;
35+
36+
status = "okay";
37+
};
38+
};
39+
};
40+
41+
&bsec {
42+
u-boot,dm-pre-reloc;
43+
};
44+
45+
&gpioa {
46+
u-boot,dm-pre-reloc;
47+
};
48+
49+
&gpiob {
50+
u-boot,dm-pre-reloc;
51+
};
52+
53+
&gpioc {
54+
u-boot,dm-pre-reloc;
55+
};
56+
57+
&gpiod {
58+
u-boot,dm-pre-reloc;
59+
};
60+
61+
&gpioe {
62+
u-boot,dm-pre-reloc;
63+
};
64+
65+
&gpiof {
66+
u-boot,dm-pre-reloc;
67+
};
68+
69+
&gpiog {
70+
u-boot,dm-pre-reloc;
71+
};
72+
73+
&gpioh {
74+
u-boot,dm-pre-reloc;
75+
};
76+
77+
&gpioi {
78+
u-boot,dm-pre-reloc;
79+
};
80+
81+
&iwdg2 {
82+
u-boot,dm-pre-reloc;
83+
};
84+
85+
&pinctrl {
86+
u-boot,dm-pre-reloc;
87+
};
88+
89+
&syscfg {
90+
u-boot,dm-pre-reloc;
91+
};

0 commit comments

Comments
 (0)