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 branch 'master' of http://git.denx.de/u-boot-sunxi
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
uniphier-ph1-ld4-ref.dts
diff --git
a/arch/arm/dts/uniphier-ph1-ld4-ref.dts
b/arch/arm/dts/uniphier-ph1-ld4-ref.dts
index 08bbd032c99056950fab8e6d3e7df4f2a1a2f06e..36de7e3a0f9680c1cec5b6abc52e8df69727080f 100644
(file)
--- a/
arch/arm/dts/uniphier-ph1-ld4-ref.dts
+++ b/
arch/arm/dts/uniphier-ph1-ld4-ref.dts
@@
-1,18
+1,19
@@
/*
* Device Tree Source for UniPhier PH1-LD4 Reference Board
*
/*
* Device Tree Source for UniPhier PH1-LD4 Reference Board
*
- * Copyright (C) 2014 Panasonic Corporation
- * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0+
X11
*/
/dts-v1/;
/include/ "uniphier-ph1-ld4.dtsi"
*/
/dts-v1/;
/include/ "uniphier-ph1-ld4.dtsi"
+/include/ "uniphier-ref-daughter.dtsi"
+/include/ "uniphier-support-card.dtsi"
/ {
/ {
- model = "
Panasonic
UniPhier PH1-LD4 Reference Board";
- compatible = "
panasonic,ph1-ld4-ref", "panasonic
,ph1-ld4";
+ model = "UniPhier PH1-LD4 Reference Board";
+ compatible = "
socionext,ph1-ld4-ref", "socionext
,ph1-ld4";
memory {
device_type = "memory";
memory {
device_type = "memory";
@@
-20,15
+21,14
@@
};
chosen {
};
chosen {
- bootargs = "console=ttyPS0,115200 earlyprintk";
- stdout-path = &uart0;
+ stdout-path = "serial0:115200n8";
};
aliases {
};
aliases {
-
uart0 = &uart
0;
-
uart1 = &uart
1;
-
uart2 = &uart
2;
-
uart3 = &uart
3;
+
serial0 = &serial
0;
+
serial1 = &serial
1;
+
serial2 = &serial
2;
+
serial3 = &serial
3;
i2c0 = &i2c0;
i2c1 = &i2c1;
i2c2 = &i2c2;
i2c0 = &i2c0;
i2c1 = &i2c1;
i2c2 = &i2c2;
@@
-36,20
+36,28
@@
};
};
};
};
-&uart0 {
+ðsc {
+ interrupts = <0 49 4>;
+};
+
+&serial0 {
status = "okay";
};
status = "okay";
};
-&uart1 {
+&serial2 {
+ status = "okay";
+};
+
+&serial3 {
status = "okay";
};
&i2c0 {
status = "okay";
status = "okay";
};
&i2c0 {
status = "okay";
- eeprom {
- compatible = "i2c-eeprom";
- reg = <0x50>;
-
}
;
+};
+
+&sd {
+
status = "okay"
;
};
&usb0 {
};
&usb0 {
@@
-59,3
+67,12
@@
&usb1 {
status = "okay";
};
&usb1 {
status = "okay";
};
+
+/* for U-Boot only */
+&serial0 {
+ u-boot,dm-pre-reloc;
+};
+
+&pinctrl_uart0 {
+ u-boot,dm-pre-reloc;
+};