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 'mips-pull-2019-11-16' of git://git.denx.de/u-boot-mips
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
zynq-zc770-xm011.dts
diff --git
a/arch/arm/dts/zynq-zc770-xm011.dts
b/arch/arm/dts/zynq-zc770-xm011.dts
index 77e3bb0e631050aeaeae2cfc07d1a312a983e6fb..3fe6eb559ea7193ba9825e258aebc8a75d0dc54d 100644
(file)
--- a/
arch/arm/dts/zynq-zc770-xm011.dts
+++ b/
arch/arm/dts/zynq-zc770-xm011.dts
@@
-1,12
+1,12
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Xilinx ZC770 XM013 board DTS
*
/*
* Xilinx ZC770 XM013 board DTS
*
- * Copyright (C) 2013 Xilinx, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
+ * Copyright (C) 2013-2018 Xilinx, Inc.
*/
/dts-v1/;
#include "zynq-7000.dtsi"
*/
/dts-v1/;
#include "zynq-7000.dtsi"
+
/ {
compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
model = "Xilinx Zynq";
/ {
compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
model = "Xilinx Zynq";
@@
-18,12
+18,11
@@
};
chosen {
};
chosen {
- bootargs = "console=ttyPS0,115200 root=/dev/ram rw earlyprintk";
- linux,stdout-path = &uart1;
- stdout-path = &uart1;
+ bootargs = "";
+ stdout-path = "serial0:115200n8";
};
};
- memory {
+ memory
@0
{
device_type = "memory";
reg = <0x0 0x40000000>;
};
device_type = "memory";
reg = <0x0 0x40000000>;
};
@@
-34,12
+33,6
@@
};
};
};
};
-&spi0 {
- status = "okay";
- num-cs = <4>;
- is-decoded-cs = <0>;
-};
-
&can0 {
status = "okay";
};
&can0 {
status = "okay";
};
@@
-48,12
+41,18
@@
status = "okay";
clock-frequency = <400000>;
status = "okay";
clock-frequency = <400000>;
-
m24c02_
eeprom@52 {
- compatible = "at,24c02";
+
eeprom:
eeprom@52 {
+ compatible = "at
mel
,24c02";
reg = <0x52>;
};
};
reg = <0x52>;
};
};
+&spi0 {
+ status = "okay";
+ num-cs = <4>;
+ is-decoded-cs = <0>;
+};
+
&uart1 {
u-boot,dm-pre-reloc;
status = "okay";
&uart1 {
u-boot,dm-pre-reloc;
status = "okay";