summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2021-02-26 07:55:16 -0500
committerTom Rini <[email protected]>2021-02-26 07:55:16 -0500
commit99bebbd5b2750fc128d8054213bdd6007dd6436c (patch)
tree0b074459411ad3db8c735a990fabf4e983254ac5 /arch
parentd9bc92f5548e3325402e9d6c7bce3fb2de079b9b (diff)
parent2f0c18b1584129d8386f5a18390996f6bea78065 (diff)
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- turris_mox: Enhancements, mostlly defconfig changes (Pali) - pci-aardvark: Set Max Payload Size and Max Read Request Size to 512 bytes (Pali) - pci_mvebu: Minor cleanup and refactoring (Marek) - Upgrade A38x DDR3 training to version 14.0.0 (Marek)
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
index 1b46797583d..af0655daaa0 100644
--- a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
+++ b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
@@ -41,10 +41,7 @@
&spi0 {
u-boot,dm-pre-reloc;
- spi-flash@0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <40000000>;
+ spi-nor@0 {
u-boot,dm-pre-reloc;
};
};