diff options
| author | Tom Rini <trini@konsulko.com> | 2020-12-28 07:43:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-28 07:43:28 -0500 |
| commit | 1c3d1aa00617dbbdd92f0d5a2df40d7784dfcc13 (patch) | |
| tree | 244867b24f1556e5928a64b28e3542ce26700177 /arch | |
| parent | e426e2d9360ea4dcdcbb3cd8a229d3a29b6947e8 (diff) | |
| parent | 0eb0eb4ab225fd0ffb3f63429dba8d4fb82cb71c (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Fix "Assert PERST# signal when unloading driver" in a37xx PCI
driver (Pali)
- Fix SPL on armada-xp-gp (add u-boot,dm-pre-reloc and alias) (myself)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/armada-xp-gp-u-boot.dtsi | 19 | ||||
| -rw-r--r-- | arch/arm/dts/armada-xp-gp.dts | 4 |
2 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/dts/armada-xp-gp-u-boot.dtsi b/arch/arm/dts/armada-xp-gp-u-boot.dtsi new file mode 100644 index 0000000000..2422856616 --- /dev/null +++ b/arch/arm/dts/armada-xp-gp-u-boot.dtsi @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/ { + soc { + internal-regs { + serial@12000 { + u-boot,dm-pre-reloc; + }; + }; + }; +}; + +&spi0 { + u-boot,dm-pre-reloc; + + spi-flash@0 { + u-boot,dm-pre-reloc; + }; +}; diff --git a/arch/arm/dts/armada-xp-gp.dts b/arch/arm/dts/armada-xp-gp.dts index 1139e9469a..d46475fe22 100644 --- a/arch/arm/dts/armada-xp-gp.dts +++ b/arch/arm/dts/armada-xp-gp.dts @@ -31,6 +31,10 @@ stdout-path = "serial0:115200n8"; }; + aliases { + spi0 = &spi0; + }; + memory@0 { device_type = "memory"; /* |