summaryrefslogtreecommitdiff
path: root/arch/arm/dts/uniphier-ph1-sld3-ref.dts
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-08-28 22:33:13 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2015-08-31 00:29:11 +0900
commitd243c186e5052741ef45cc3b56e5e171391a62f8 (patch)
tree2535420d69621493013a32870b6d7095bd2a54d9 /arch/arm/dts/uniphier-ph1-sld3-ref.dts
parent6d99cfaee8a6ced4c412a94c0de26f74808b7246 (diff)
downloadu-boot-imx-d243c186e5052741ef45cc3b56e5e171391a62f8.zip
u-boot-imx-d243c186e5052741ef45cc3b56e5e171391a62f8.tar.gz
u-boot-imx-d243c186e5052741ef45cc3b56e5e171391a62f8.tar.bz2
ARM: dts: uniphier: sync with Linux
This commit imports device tree updates from Linux. It eventually adds pinctrl-related nodes and properties. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/dts/uniphier-ph1-sld3-ref.dts')
-rw-r--r--arch/arm/dts/uniphier-ph1-sld3-ref.dts32
1 files changed, 23 insertions, 9 deletions
diff --git a/arch/arm/dts/uniphier-ph1-sld3-ref.dts b/arch/arm/dts/uniphier-ph1-sld3-ref.dts
index 2406bfc..c760b6d 100644
--- a/arch/arm/dts/uniphier-ph1-sld3-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-sld3-ref.dts
@@ -16,30 +16,36 @@
memory {
device_type = "memory";
- reg = <0x80000000 0x40000000>;
+ reg = <0x80000000 0x20000000
+ 0xc0000000 0x20000000>;
};
chosen {
- bootargs = "console=ttyPS0,115200 earlyprintk";
- stdout-path = &uart0;
+ bootargs = "console=ttyS0,115200";
+ stdout-path = &serial0;
};
aliases {
- serial0 = &uart0;
- serial1 = &uart1;
- serial2 = &uart2;
+ serial0 = &serial0;
+ serial1 = &serial1;
+ serial2 = &serial2;
i2c0 = &i2c0;
i2c1 = &i2c1;
i2c2 = &i2c2;
i2c3 = &i2c3;
+ i2c4 = &i2c4;
};
};
-&uart0 {
+&serial0 {
status = "okay";
};
-&uart1 {
+&serial1 {
+ status = "okay";
+};
+
+&serial2 {
status = "okay";
};
@@ -55,7 +61,15 @@
status = "okay";
};
+&usb2 {
+ status = "okay";
+};
+
+&usb3 {
+ status = "okay";
+};
+
/* for U-boot only */
-&uart0 {
+&serial0 {
u-boot,dm-pre-reloc;
};