Skip to content

Commit 260d496

Browse files
trinitrini
committed
Merge tag v2023.07-rc4 into next
Signed-off-by: Tom Rini <[email protected]>
2 parents 5b589e1 + 19b77d3 commit 260d496

File tree

839 files changed

+18510
-4428
lines changed

Some content is hidden

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

839 files changed

+18510
-4428
lines changed

‎.mailmap

+65-16
Original file line numberDiff line numberDiff line change
@@ -17,66 +17,115 @@
1717

1818
Alexander Graf <[email protected]> <[email protected]>
1919
Allen Martin <[email protected]>
20+
Amanda Baze <[email protected]> <[email protected]>
21+
Amit Kumar Mahapatra <[email protected]> <[email protected]>
2022
Andreas Bießmann <[email protected]>
2123
Andreas Bießmann <[email protected]>
2224
Aneesh V <[email protected]>
2325
Anup Patel <[email protected]> <[email protected]>
26+
Anurag Kumar Vulisha <[email protected]> <[email protected]>
27+
Appana Durga Kedareswara rao <[email protected]> <[email protected]>
28+
Ashok Reddy Soma <[email protected]> <[email protected]>
2429
Atish Patra <[email protected]> <[email protected]>
30+
Bharat Kumar Gogada <[email protected]> <[email protected]>
31+
Bharat Kumar Gogada <[email protected]> <[email protected]>
32+
Bhargava Sreekantappa Gayathri <[email protected]> <[email protected]>
2533
Bin Meng <[email protected]> <[email protected]>
2634
Boris Brezillon <[email protected]> <[email protected]>
2735
Boris Brezillon <[email protected]> <[email protected]>
36+
Christian Kohn <[email protected]> <[email protected]>
2837
Dirk Behme <[email protected]>
38+
Durga Challa <[email protected]> <[email protected]>
2939
Eugen Hristev <[email protected]> <[email protected]>
3040
Fabio Estevam <[email protected]>
41+
Harini Katakam <[email protected]> <[email protected]>
42+
Harsha <[email protected]> <[email protected]>
3143
Heinrich Schuchardt <[email protected]> <[email protected]>
3244
Heinrich Schuchardt <[email protected]> [email protected] <[email protected]>
45+
Ibai Erkiaga <[email protected]> <[email protected]>
46+
Igor Opaniuk <[email protected]> <[email protected]>
47+
Igor Opaniuk <[email protected]> <[email protected]>
48+
Izhar Ameer Shaikh <[email protected]> <[email protected]>
3349
Jagan Teki <[email protected]>
3450
Jagan Teki <[email protected]>
3551
Jagan Teki <[email protected]>
3652
Jagan Teki <[email protected]>
3753
Jagan Teki <[email protected]>
54+
Jay Buddhabhatti <[email protected]> <[email protected]>
3855
Jernej Skrabec <[email protected]> <[email protected]>
39-
Igor Opaniuk <[email protected]> <[email protected]>
40-
Igor Opaniuk <[email protected]> <[email protected]>
56+
John Linn <[email protected]> <[email protected]>
57+
Jyotheeswar Reddy Mutthareddyvari <[email protected]> <[email protected]>
58+
Jyotheeswar Reddy Mutthareddyvari <[email protected]> <[email protected]>
59+
Kalyani Akula <[email protected]> <[email protected]>
60+
Love Kumar <[email protected]> <[email protected]>
61+
Lukasz Majewski <[email protected]>
4162
Marek Behún <[email protected]> <[email protected]>
4263
Marek Behún <[email protected]> Marek Behun <[email protected]>
4364
Marek Vasut <[email protected]> <[email protected]>
4465
Marek Vasut <[email protected]> <[email protected]>
4566
Marek Vasut <[email protected]> <marex at denx.de>
4667
Markus Klotzbuecher <[email protected]>
47-
Masahiro Yamada <[email protected]> <[email protected]>
4868
Masahiro Yamada <[email protected]> <[email protected]>
69+
Masahiro Yamada <[email protected]> <[email protected]>
70+
Michal Simek <[email protected]> <[email protected]>
4971
Michal Simek <[email protected]> <[email protected]>
50-
Michal Simek <[email protected]> <[email protected]>
51-
Michal Simek <[email protected]> <[email protected]>
52-
Michal Simek <[email protected]> <[email protected]>
72+
Michal Simek <[email protected]> <[email protected]>
73+
Michal Simek <[email protected]> <[email protected]>
74+
Mirza <[email protected]>
75+
Mounika Grace Akula <[email protected]> <[email protected]>
76+
Mubin Usman Sayyed <[email protected]> <[email protected]>
77+
Nathalie Chan King Choy <[email protected]> <[email protected]>
78+
Nathalie Chan King Choy <[email protected]> <[email protected]>
79+
Nava kishore Manne <[email protected]> <[email protected]>
80+
Neal Frager <[email protected]> <[email protected]>
5381
Neil Armstrong <[email protected]> <[email protected]>
5482
Nicolas Saenz Julienne <[email protected]> <[email protected]>
5583
Patrice Chotard <[email protected]> <[email protected]>
5684
Patrick Delaunay <[email protected]> <[email protected]>
5785
Paul Burton <[email protected]> <[email protected]>
86+
Piyush Mehta <[email protected]> <[email protected]>
5887
Prabhakar Kushwaha <[email protected]>
88+
Punnaiah Choudary Kalluri <[email protected]> <[email protected]>
89+
Radhey Shyam Pandey <[email protected]> <[email protected]>
5990
Rajeshwari Shinde <[email protected]>
60-
Ricardo Ribalda <[email protected]> <[email protected]>
91+
Raju Kumar Pothuraju <[email protected]> <[email protected]>
92+
Ravi Patel <[email protected]> <[email protected]>
6193
Ricardo Ribalda <[email protected]> <[email protected]>
94+
Ricardo Ribalda <[email protected]> <[email protected]>
95+
Rohit Visavalia <[email protected]> <[email protected]>
6296
Ruchika Gupta <[email protected]> <[email protected]>
97+
Saeed Nowshadi <[email protected]> <[email protected]>
98+
Sai Krishna Potthuri <[email protected]> <[email protected]>
99+
Sai Pavan Boddu <[email protected]> <[email protected]>
100+
Sandeep Gundlupet Raju <[email protected]> <[email protected]>
63101
Sandeep Paulraj <[email protected]>
102+
Sandeep Reddy Ghanapuram <[email protected]> <[email protected]>
64103
Shaohui Xie <[email protected]>
104+
Shravya Kumbham <[email protected]> <[email protected]>
105+
Shubhrajyoti Datta <[email protected]> <[email protected]>
106+
Siva Durga Prasad Paladugu <[email protected]> <[email protected]>
107+
Siva Durga Prasad Paladugu <[email protected]> <[email protected]>
108+
Srinivas Goud <[email protected]> <[email protected]>
109+
Srinivas Neeli <[email protected]> <[email protected]>
65110
Stefan Roese <[email protected]> <stroese>
66111
Stefano Babic <[email protected]>
112+
Stefano Stabellini <[email protected]> <[email protected]>
67113
Tom Rini <[email protected]> <[email protected]>
114+
Tomas Thoresen <[email protected]> <[email protected]>
68115
TsiChung Liew <[email protected]>
69-
Wolfgang Denk <[email protected]> <wdenk>
70-
Wolfgang Denk <[email protected]> <[email protected]>
71-
Wolfgang Denk <[email protected]> <wd@pollux.(none)>
72-
Wolfgang Denk <[email protected]> <[email protected]>
73-
Wolfgang Denk <[email protected]> <[email protected]>
116+
Varalaxmi Bingi <[email protected]> <[email protected]>
117+
Venkatesh Yadav Abbarapu <[email protected]> <[email protected]>
118+
Vikhyat Goyal <[email protected]> <[email protected]>
119+
Vishal Patel <[email protected]> <[email protected]>
74120
Wolfgang Denk <[email protected]> <[email protected]>
75121
Wolfgang Denk <[email protected]> <[email protected]>
76-
Wolfgang Denk <[email protected]> <wd@xpert.denx.de>
122+
Wolfgang Denk <[email protected]> <wd@fifi.denx.de>
77123
Wolfgang Denk <[email protected]> <wd@nyx.(none)>
78-
York Sun <[email protected]>
124+
Wolfgang Denk <[email protected]> <[email protected]>
125+
Wolfgang Denk <[email protected]> <wd@pollux.(none)>
126+
Wolfgang Denk <[email protected]> <[email protected]>
127+
Wolfgang Denk <[email protected]> <[email protected]>
128+
Wolfgang Denk <[email protected]> <wdenk>
79129
York Sun <[email protected]>
130+
York Sun <[email protected]>
80131
Łukasz Majewski <[email protected]>
81-
Lukasz Majewski <[email protected]>
82-
Mirza <[email protected]>

‎Kconfig

+8
Original file line numberDiff line numberDiff line change
@@ -397,11 +397,19 @@ endif # EXPERT
397397

398398
config PHYS_64BIT
399399
bool "64bit physical address support"
400+
select FDT_64BIT
400401
help
401402
Say Y here to support 64bit physical memory address.
402403
This can be used not only for 64bit SoCs, but also for
403404
large physical address extension on 32bit SoCs.
404405

406+
config FDT_64BIT
407+
bool "64bit fdt address support"
408+
help
409+
Say Y here to support 64bit fdt addresses.
410+
This can be used not only for 64bit SoCs, but also
411+
for large address extensions on 32bit SoCs.
412+
405413
config HAS_ROM
406414
bool
407415
select BINMAN

‎MAINTAINERS

-2
Original file line numberDiff line numberDiff line change
@@ -1496,8 +1496,6 @@ F: configs/k2g_hs_evm_defconfig
14961496
F: configs/k2l_hs_evm_defconfig
14971497
F: configs/am65x_hs_evm_r5_defconfig
14981498
F: configs/am65x_hs_evm_a53_defconfig
1499-
F: configs/j721e_hs_evm_a72_defconfig
1500-
F: configs/j721e_hs_evm_r5_defconfig
15011499

15021500
TPM DRIVERS
15031501
M: Ilias Apalodimas <[email protected]>

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
VERSION = 2023
44
PATCHLEVEL = 07
55
SUBLEVEL =
6-
EXTRAVERSION = -rc2
6+
EXTRAVERSION = -rc4
77
NAME =
88

99
# *DOCUMENTATION*
@@ -2123,7 +2123,7 @@ tools/version.h: include/version.h
21232123
$(Q)mkdir -p $(dir $@)
21242124
$(call if_changed,copy)
21252125

2126-
envtools: scripts_basic $(version_h) $(timestamp_h) tools/version.h
2126+
envtools: u-boot-initial-env scripts_basic $(version_h) $(timestamp_h) tools/version.h
21272127
$(Q)$(MAKE) $(build)=tools/env
21282128

21292129
tools-only: export TOOLS_ONLY=y

‎arch/Kconfig

+2
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ config SANDBOX
195195
imply PHYLIB
196196
imply DM_MDIO
197197
imply DM_MDIO_MUX
198+
imply ACPI
198199
imply ACPI_PMC
199200
imply ACPI_PMC_SANDBOX
200201
imply CMD_PMC
@@ -261,6 +262,7 @@ config X86
261262
imply PCH
262263
imply PHYSMEM
263264
imply RTC_MC146818
265+
imply ACPI
264266
imply ACPIGEN if !QEMU && !EFI_APP
265267
imply SYSINFO if GENERATE_SMBIOS_TABLE
266268
imply SYSINFO_SMBIOS if GENERATE_SMBIOS_TABLE

‎arch/arm/cpu/armv7/Kconfig

+5
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ config ARMV7_LPAE
107107
Say Y here to use the long descriptor page table format. This is
108108
required if U-Boot runs in HYP mode.
109109

110+
config ARMV7_SET_CORTEX_SMPEN
111+
bool
112+
help
113+
Enable the ARM Cortex ACTLR.SMP enable bit in U-boot.
114+
110115
config SPL_ARMV7_SET_CORTEX_SMPEN
111116
bool
112117
help

‎arch/arm/dts/Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
123123

124124
dtb-$(CONFIG_ROCKCHIP_RK3328) += \
125125
rk3328-evb.dtb \
126+
rk3328-nanopi-r2c.dtb \
126127
rk3328-nanopi-r2s.dtb \
127128
rk3328-roc-cc.dtb \
128129
rk3328-rock64.dtb \
@@ -157,16 +158,17 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
157158
rk3399-puma-haikou.dtb \
158159
rk3399-roc-pc.dtb \
159160
rk3399-roc-pc-mezzanine.dtb \
161+
rk3399-rock-4c-plus.dtb \
160162
rk3399-rock-pi-4a.dtb \
161-
rk3399-rock-pi-4b.dtb \
162163
rk3399-rock-pi-4c.dtb \
163164
rk3399-rock960.dtb \
164165
rk3399-rockpro64.dtb \
165166
rk3399pro-rock-pi-n10.dtb
166167

167168
dtb-$(CONFIG_ROCKCHIP_RK3568) += \
168-
rk3568-evb.dtb \
169+
rk3566-anbernic-rgxx3.dtb \
169170
rk3566-radxa-cm3-io.dtb \
171+
rk3568-evb.dtb \
170172
rk3568-rock-3a.dtb
171173

172174
dtb-$(CONFIG_ROCKCHIP_RK3588) += \

‎arch/arm/dts/axp22x.dtsi

+6
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@
6767
status = "disabled";
6868
};
6969

70+
axp_gpio: gpio {
71+
compatible = "x-powers,axp221-gpio";
72+
gpio-controller;
73+
#gpio-cells = <2>;
74+
};
75+
7076
regulators {
7177
/* Default work frequency for buck regulators */
7278
x-powers,dcdc-freq = <3000>;

‎arch/arm/dts/axp809.dtsi

+7
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,11 @@
5050
compatible = "x-powers,axp809";
5151
interrupt-controller;
5252
#interrupt-cells = <1>;
53+
54+
axp_gpio: gpio {
55+
compatible = "x-powers,axp809-gpio",
56+
"x-powers,axp221-gpio";
57+
gpio-controller;
58+
#gpio-cells = <2>;
59+
};
5360
};

‎arch/arm/dts/axp81x.dtsi

-14
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@
6262
compatible = "x-powers,axp813-gpio";
6363
gpio-controller;
6464
#gpio-cells = <2>;
65-
66-
gpio0_ldo: gpio0-ldo-pin {
67-
pins = "GPIO0";
68-
function = "ldo";
69-
};
70-
71-
gpio1_ldo: gpio1-ldo-pin {
72-
pins = "GPIO1";
73-
function = "ldo";
74-
};
7565
};
7666

7767
battery_power_supply: battery-power {
@@ -144,15 +134,11 @@
144134
};
145135

146136
reg_ldo_io0: ldo-io0 {
147-
pinctrl-names = "default";
148-
pinctrl-0 = <&gpio0_ldo>;
149137
/* Disable by default to avoid conflicts with GPIO */
150138
status = "disabled";
151139
};
152140

153141
reg_ldo_io1: ldo-io1 {
154-
pinctrl-names = "default";
155-
pinctrl-0 = <&gpio1_ldo>;
156142
/* Disable by default to avoid conflicts with GPIO */
157143
status = "disabled";
158144
};

‎arch/arm/dts/imx7d-sdb-u-boot.dtsi

+51
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,54 @@
55
&usbotg1 {
66
dr_mode = "peripheral";
77
};
8+
9+
&usdhc1 {
10+
pinctrl-names = "default", "state_100mhz", "state_200mhz";
11+
pinctrl-0 = <&pinctrl_usdhc1>, <&pinctrl_usdhc1_gpio>;
12+
pinctrl-1 = <&pinctrl_usdhc1_100mhz>, <&pinctrl_usdhc1_gpio>;
13+
pinctrl-2 = <&pinctrl_usdhc1_200mhz>, <&pinctrl_usdhc1_gpio>;
14+
};
15+
16+
&pinctrl_usdhc1 {
17+
fsl,pins = <
18+
MX7D_PAD_SD1_CMD__SD1_CMD 0x59
19+
MX7D_PAD_SD1_CLK__SD1_CLK 0x19
20+
MX7D_PAD_SD1_DATA0__SD1_DATA0 0x59
21+
MX7D_PAD_SD1_DATA1__SD1_DATA1 0x59
22+
MX7D_PAD_SD1_DATA2__SD1_DATA2 0x59
23+
MX7D_PAD_SD1_DATA3__SD1_DATA3 0x59
24+
>;
25+
};
26+
27+
&iomuxc {
28+
pinctrl_usdhc1_gpio: usdhc1gpiogrp {
29+
fsl,pins = <
30+
MX7D_PAD_SD1_CD_B__GPIO5_IO0 0x59 /* CD */
31+
MX7D_PAD_SD1_WP__GPIO5_IO1 0x59 /* WP */
32+
MX7D_PAD_SD1_RESET_B__GPIO5_IO2 0x59 /* vmmc */
33+
MX7D_PAD_GPIO1_IO08__SD1_VSELECT 0x59 /* VSELECT */
34+
>;
35+
};
36+
37+
pinctrl_usdhc1_100mhz: usdhc1100mhzgrp {
38+
fsl,pins = <
39+
MX7D_PAD_SD1_CMD__SD1_CMD 0x5a
40+
MX7D_PAD_SD1_CLK__SD1_CLK 0x1a
41+
MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5a
42+
MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5a
43+
MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5a
44+
MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5a
45+
>;
46+
};
47+
48+
pinctrl_usdhc1_200mhz: usdhc1200mhzgrp {
49+
fsl,pins = <
50+
MX7D_PAD_SD1_CMD__SD1_CMD 0x5b
51+
MX7D_PAD_SD1_CLK__SD1_CLK 0x1b
52+
MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5b
53+
MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5b
54+
MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5b
55+
MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5b
56+
>;
57+
};
58+
};

‎arch/arm/dts/imx93-11x11-evk-u-boot.dtsi

-29
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,6 @@
1010
bootph-pre-ram;
1111
};
1212

13-
aliases {
14-
usbgadget0 = &usbg1;
15-
usbgadget1 = &usbg2;
16-
};
17-
18-
usbg1: usbg1 {
19-
compatible = "fsl,imx27-usb-gadget";
20-
dr_mode = "peripheral";
21-
chipidea,usb = <&usbotg1>;
22-
status = "okay";
23-
};
24-
25-
usbg2: usbg2 {
26-
compatible = "fsl,imx27-usb-gadget";
27-
dr_mode = "peripheral";
28-
chipidea,usb = <&usbotg2>;
29-
status = "okay";
30-
};
31-
3213
firmware {
3314
optee {
3415
compatible = "linaro,optee-tz";
@@ -141,16 +122,6 @@
141122
reset-deassert-us = <100000>;
142123
};
143124

144-
&usbotg1 {
145-
status = "okay";
146-
extcon = <&ptn5110>;
147-
};
148-
149-
&usbotg2 {
150-
status = "okay";
151-
extcon = <&ptn5110_2>;
152-
};
153-
154125
&s4muap {
155126
bootph-pre-ram;
156127
status = "okay";

0 commit comments

Comments
 (0)