projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
sama5d27_som1.dtsi
diff --git
a/arch/arm/dts/sama5d27_som1.dtsi
b/arch/arm/dts/sama5d27_som1.dtsi
index 0c44a97f64b8a576ee7e2ea216660b604db1625f..ea7540bcfcf7278ba73167002a860051ddb4dc83 100644
(file)
--- a/
arch/arm/dts/sama5d27_som1.dtsi
+++ b/
arch/arm/dts/sama5d27_som1.dtsi
@@
-55,7
+55,6
@@
aliases {
spi0 = &qspi1;
- u-boot,dm-pre-reloc;
};
ahb {
@@
-67,7
+66,7
@@
u-boot,dm-pre-reloc;
spi_flash@0 {
- compatible = "
spi-flash
";
+ compatible = "
jedec,spi-nor
";
reg = <0>;
spi-max-frequency = <50000000>;
spi-rx-bus-width = <4>;