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 25e487ae51184886a1c4dd035511bb5c77ca55e9..36de7e3a0f9680c1cec5b6abc52e8df69727080f 100644
(file)
--- a/
arch/arm/dts/uniphier-ph1-ld4-ref.dts
+++ b/
arch/arm/dts/uniphier-ph1-ld4-ref.dts
@@
-1,9
+1,7
@@
/*
* Device Tree Source for UniPhier PH1-LD4 Reference Board
*
/*
* Device Tree Source for UniPhier PH1-LD4 Reference Board
*
- * Copyright (C) 2014-2015 Panasonic Corporation
- * Copyright (C) 2015 Socionext Inc.
- * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+ X11
*/
*
* SPDX-License-Identifier: GPL-2.0+ X11
*/
@@
-11,6
+9,7
@@
/dts-v1/;
/include/ "uniphier-ph1-ld4.dtsi"
/include/ "uniphier-ref-daughter.dtsi"
/dts-v1/;
/include/ "uniphier-ph1-ld4.dtsi"
/include/ "uniphier-ref-daughter.dtsi"
+/include/ "uniphier-support-card.dtsi"
/ {
model = "UniPhier PH1-LD4 Reference Board";
/ {
model = "UniPhier PH1-LD4 Reference Board";
@@
-22,15
+21,14
@@
};
chosen {
};
chosen {
- bootargs = "console=ttyPS0,115200 earlyprintk";
- stdout-path = &uart0;
+ stdout-path = "serial0:115200n8";
};
aliases {
};
aliases {
- serial0 = &
uart
0;
- serial1 = &
uart
1;
- serial2 = &
uart
2;
- serial3 = &
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;
@@
-38,11
+36,19
@@
};
};
};
};
-&uart0 {
+ðsc {
+ interrupts = <0 49 4>;
+};
+
+&serial0 {
+ status = "okay";
+};
+
+&serial2 {
status = "okay";
};
status = "okay";
};
-&
uart1
{
+&
serial3
{
status = "okay";
};
status = "okay";
};
@@
-50,6
+56,10
@@
status = "okay";
};
status = "okay";
};
+&sd {
+ status = "okay";
+};
+
&usb0 {
status = "okay";
};
&usb0 {
status = "okay";
};
@@
-57,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;
+};