Skip to content

Commit

Permalink
Merge tag 'v2021.10-rc4' into next
Browse files Browse the repository at this point in the history 
Prepare v2021.10-rc4

Signed-off-by: Tom Rini <[email protected]>

# gpg: Signature made Tue 14 Sep 2021 06:58:32 PM EDT
# gpg:                using RSA key 1A3C7F70E08FAB1707809BBF147C39FF9634B72C
# gpg: Good signature from "Thomas Rini <[email protected]>" [ultimate]

# Conflicts:
#	board/Arcturus/ucp1020/spl.c
#	cmd/mvebu/Kconfig
#	common/Kconfig.boot
#	common/image-fit.c
#	configs/UCP1020_defconfig
#	configs/sifive_unmatched_defconfig
#	drivers/pci/Kconfig
#	include/configs/UCP1020.h
#	include/configs/sifive-unmatched.h
#	lib/Makefile
#	scripts/config_whitelist.txt
  • Loading branch information
@trini
trini committed Sep 16, 2021
2 parents 4f8bf67 + bb92678 commit 6674eda
Show file tree
Hide file tree
Showing 215 changed files with 1,078 additions and 3,317 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ F: arch/arm/mach-tegra/
F: arch/arm/include/asm/arch-tegra*/

ARM TI
M: Lokesh Vutla <lokeshvutla@ti.com>
M: Tom Rini <trini@konsulko.com>
S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-ti.git
F: arch/arm/mach-davinci/
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
VERSION = 2021
PATCHLEVEL = 10
SUBLEVEL =
EXTRAVERSION = -rc3
EXTRAVERSION = -rc4
NAME =

# *DOCUMENTATION*
Expand Down
3 changes: 0 additions & 3 deletions README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2631,9 +2631,6 @@ Low Level (hardware related) configuration options:
CONFIG_SYS_OR3_PRELIM, CONFIG_SYS_BR3_PRELIM:
Memory Controller Definitions: BR2/3 and OR2/3 (SDRAM)

- CONFIG_PCI_INDIRECT_BRIDGE:
Enable support for indirect PCI bridges.

- CONFIG_SYS_SRIO:
Chip has SRIO or not

Expand Down
1 change: 0 additions & 1 deletion arch/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ config X86
select SUPPORT_TPL
select CREATE_ARCH_SYMLINK
select DM
select DM_PCI
select HAVE_ARCH_IOMAP
select HAVE_PRIVATE_LIBGCC
select OF_CONTROL
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1696,7 +1696,7 @@ config TARGET_SL28
select DM_SPI_FLASH
select DM_ETH
select DM_MDIO
select DM_PCI
select PCI
select DM_RNG
select DM_RTC
select DM_SCSI
Expand Down
6 changes: 0 additions & 6 deletions arch/arm/dts/am33xx.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,28 +380,24 @@
#address-cells = <1>;
#size-cells = <1>;
ti,hwmods = "usb_otg_hs";
status = "disabled";

usb_ctrl_mod: control@44e10620 {
compatible = "ti,am335x-usb-ctrl-module";
reg = <0x44e10620 0x10
0x44e10648 0x4>;
reg-names = "phy_ctrl", "wakeup";
status = "disabled";
};

usb0_phy: usb-phy@47401300 {
compatible = "ti,am335x-usb-phy";
reg = <0x47401300 0x100>;
reg-names = "phy";
status = "disabled";
ti,ctrl_mod = <&usb_ctrl_mod>;
#phy-cells = <0>;
};

usb0: usb@47401000 {
compatible = "ti,musb-am33xx";
status = "disabled";
reg = <0x47401400 0x400
0x47401000 0x200>;
reg-names = "mc", "control";
Expand Down Expand Up @@ -443,14 +439,12 @@
compatible = "ti,am335x-usb-phy";
reg = <0x47401b00 0x100>;
reg-names = "phy";
status = "disabled";
ti,ctrl_mod = <&usb_ctrl_mod>;
#phy-cells = <0>;
};

usb1: usb@47401800 {
compatible = "ti,musb-am33xx";
status = "disabled";
reg = <0x47401c00 0x400
0x47401800 0x200>;
reg-names = "mc", "control";
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/dts/am3517-evm-ui.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,14 @@
};

&mcbsp1 {
status = "ok";
status = "okay";
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&mcbsp1_pins>;
};

&mcbsp2 {
status = "ok";
status = "okay";
#sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&mcbsp2_pins>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/am3517-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
};

&dss {
status = "ok";
status = "okay";

pinctrl-names = "default";
pinctrl-0 = <&dss_dpi_pins>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/am437x-gp-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@
};

&dss {
status = "ok";
status = "okay";

pinctrl-names = "default";
pinctrl-0 = <&dss_pins>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/am43x-epos-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@
};

&dss {
status = "ok";
status = "okay";

pinctrl-names = "default";
pinctrl-0 = <&dss_pins>;
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/dts/am57xx-beagle-x15-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -528,13 +528,13 @@
};

&dss {
status = "ok";
status = "okay";

vdda_video-supply = <&ldoln_reg>;
};

&hdmi {
status = "ok";
status = "okay";
vdda-supply = <&ldo4_reg>;

port {
Expand All @@ -545,7 +545,7 @@
};

&pcie1_rc {
status = "ok";
status = "okay";
gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;
};

Expand Down
1 change: 1 addition & 0 deletions arch/arm/dts/armada-7040-db.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
};

&cp0_mdio {
status = "okay";
phy0: ethernet-phy@0 {
reg = <0>;
};
Expand Down
1 change: 1 addition & 0 deletions arch/arm/dts/armada-8040-clearfog-gt-8k.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@
};

&cp1_mdio {
status = "okay";
phy0: ethernet-phy@0 {
reg = <0>;
};
Expand Down
1 change: 1 addition & 0 deletions arch/arm/dts/armada-8040-db.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@
};

&cp0_mdio {
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
Expand Down
1 change: 1 addition & 0 deletions arch/arm/dts/armada-8040-mcbin.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
};

&cp0_mdio {
status = "okay";
ge_phy: ethernet-phy@0 {
reg = <0>;
};
Expand Down
23 changes: 23 additions & 0 deletions arch/arm/dts/beacon-renesom-som.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
#include <dt-bindings/clk/versaclock.h>

/ {
aliases {
spi0 = &rpc;
};

memory@48000000 {
device_type = "memory";
/* first 128MB is reserved for secure area. */
Expand Down Expand Up @@ -275,6 +279,25 @@
};
};

&rpc {
compatible = "renesas,rcar-gen3-rpc";
num-cs = <1>;
spi-max-frequency = <40000000>;
#address-cells = <1>;
#size-cells = <0>;
status = "okay";

flash0: spi-flash@0 {
#address-cells = <1>;
#size-cells = <1>;
reg = <0>;
compatible = "spi-flash", "jedec,spi-nor";
spi-max-frequency = <40000000>;
spi-tx-bus-width = <1>;
spi-rx-bus-width = <1>;
};
};

&scif_clk {
clock-frequency = <14745600>;
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/da850-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@
&aemif {
pinctrl-names = "default";
pinctrl-0 = <&nand_pins>;
status = "ok";
status = "okay";
cs3 {
#address-cells = <2>;
#size-cells = <1>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/dra7-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@
};

&dcan1 {
status = "ok";
status = "okay";
pinctrl-names = "default", "sleep", "active";
pinctrl-0 = <&dcan1_pins_sleep>;
pinctrl-1 = <&dcan1_pins_sleep>;
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/dts/dra72-evm-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@
};

&dcan1 {
status = "ok";
status = "okay";
pinctrl-names = "default", "sleep", "active";
pinctrl-0 = <&dcan1_pins_sleep>;
pinctrl-1 = <&dcan1_pins_sleep>;
Expand Down Expand Up @@ -499,11 +499,11 @@
};

&dss {
status = "ok";
status = "okay";
};

&hdmi {
status = "ok";
status = "okay";

port {
hdmi_out: endpoint {
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/dts/k3-am642-evm-u-boot.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@
u-boot,dm-spl;
};

&main_mmc1_pins_default {
u-boot,dm-spl;
};

&main_usb0_pins_default {
u-boot,dm-spl;
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/k3-j721e-r5-common-proc-board.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
/delete-property/ assigned-clocks;
/delete-property/ assigned-clock-parents;
clocks = <&clk_19_2mhz>;
clock-names = "usb2_refclk";
clock-names = "ref";
pinctrl-names = "default";
pinctrl-0 = <&main_usbss0_pins_default>;
ti,vbus-divider;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/keystone-k2e-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
};

&mdio {
status = "ok";
status = "okay";
ethphy0: ethernet-phy@0 {
compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22";
reg = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/keystone-k2hk-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
};

&mdio {
status = "ok";
status = "okay";
ethphy0: ethernet-phy@0 {
compatible = "marvell,88E1111", "ethernet-phy-ieee802.3-c22";
reg = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/keystone-k2l-evm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
};

&mdio {
status = "ok";
status = "okay";
ethphy0: ethernet-phy@0 {
compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22";
reg = <0>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/dts/omap3-beagle-xm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
};

&dss {
status = "ok";
status = "okay";

pinctrl-names = "default";
pinctrl-0 = <
Expand All @@ -396,7 +396,7 @@
};

&venc {
status = "ok";
status = "okay";

vdda-supply = <&vdac>;

Expand Down
6 changes: 3 additions & 3 deletions arch/arm/dts/omap3-beagle.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@
};

&dss {
status = "ok";
status = "okay";

pinctrl-names = "default";
pinctrl-0 = <&dss_dpi_pins>;
Expand All @@ -367,7 +367,7 @@
};

&venc {
status = "ok";
status = "okay";

vdda-supply = <&vdac>;

Expand All @@ -380,7 +380,7 @@
};

&gpmc {
status = "ok";
status = "okay";
ranges = <0 0 0x30000000 0x1000000>; /* CS0 space, 16MB */

/* Chip select 0 */
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/omap3-igep0020-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
};

&dss {
status = "ok";
status = "okay";

port {
dpi_out: endpoint {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
};

&dss {
status = "ok";
status = "okay";
port {
dpi_out: endpoint {
remote-endpoint = <&lcd_in>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/omap34xx.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
};

&ssi {
status = "ok";
status = "okay";

clocks = <&ssi_ssr_fck>,
<&ssi_sst_fck>,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/dts/omap36xx.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
};

&ssi {
status = "ok";
status = "okay";

clocks = <&ssi_ssr_fck>,
<&ssi_sst_fck>,
Expand Down
Loading

0 comments on commit 6674eda

Please sign in to comment.