diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-08-28 22:33:13 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-08-31 00:29:11 +0900 |
| commit | d243c186e5052741ef45cc3b56e5e171391a62f8 (patch) | |
| tree | 2535420d69621493013a32870b6d7095bd2a54d9 /arch/arm/dts/uniphier-ph1-pro4-ref.dts | |
| parent | 6d99cfaee8a6ced4c412a94c0de26f74808b7246 (diff) | |
| download | talos-obmc-uboot-d243c186e5052741ef45cc3b56e5e171391a62f8.tar.gz talos-obmc-uboot-d243c186e5052741ef45cc3b56e5e171391a62f8.zip | |
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-pro4-ref.dts')
| -rw-r--r-- | arch/arm/dts/uniphier-ph1-pro4-ref.dts | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/arch/arm/dts/uniphier-ph1-pro4-ref.dts b/arch/arm/dts/uniphier-ph1-pro4-ref.dts index fd3e8c63ed..ec1117d4a2 100644 --- a/arch/arm/dts/uniphier-ph1-pro4-ref.dts +++ b/arch/arm/dts/uniphier-ph1-pro4-ref.dts @@ -20,15 +20,15 @@ }; chosen { - bootargs = "console=ttyPS0,115200 earlyprintk"; - stdout-path = &uart0; + bootargs = "console=ttyS0,115200"; + stdout-path = &serial0; }; aliases { - serial0 = &uart0; - serial1 = &uart1; - serial2 = &uart2; - serial3 = &uart3; + serial0 = &serial0; + serial1 = &serial1; + serial2 = &serial2; + serial3 = &serial3; i2c0 = &i2c0; i2c1 = &i2c1; i2c2 = &i2c2; @@ -39,11 +39,15 @@ }; }; -&uart0 { +&serial0 { status = "okay"; }; -&uart1 { +&serial1 { + status = "okay"; +}; + +&serial2 { status = "okay"; }; @@ -55,7 +59,15 @@ status = "okay"; }; +&usb2 { + status = "okay"; +}; + +&usb3 { + status = "okay"; +}; + /* for U-boot only */ -&uart0 { +&serial0 { u-boot,dm-pre-reloc; }; |
