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 https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
kirkwood-dreamplug.dts
diff --git
a/arch/arm/dts/kirkwood-dreamplug.dts
b/arch/arm/dts/kirkwood-dreamplug.dts
index a647a65c20a0dbd3331445956a489f4b38c1f6fa..e9eea22fc93ba8ffce7a8d595e8d264345496f76 100644
(file)
--- a/
arch/arm/dts/kirkwood-dreamplug.dts
+++ b/
arch/arm/dts/kirkwood-dreamplug.dts
@@
-18,6
+18,10
@@
stdout-path = &uart0;
};
stdout-path = &uart0;
};
+ aliases {
+ spi0 = &spi0;
+ };
+
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pmx_led_bluetooth: pmx-led-bluetooth {
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pmx_led_bluetooth: pmx-led-bluetooth {
@@
-43,7
+47,7
@@
m25p40@0 {
#address-cells = <1>;
#size-cells = <1>;
m25p40@0 {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "mxicy,mx25l1606e", "jedec,spi-nor"
, "spi-flash"
;
+ compatible = "mxicy,mx25l1606e", "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
mode = <0>;
reg = <0>;
spi-max-frequency = <50000000>;
mode = <0>;