diff options
author | Chris Zankel <chris@zankel.net> | 2015-08-29 23:55:58 +0000 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2015-08-29 23:55:58 +0000 |
commit | 650c919798c71fb34b77a6f2ba03a06907f06a76 (patch) | |
tree | d1c60012d4d86846d25f1d0b783b5122c26a2e31 /arch/arm/boot/dts/ste-hrefv60plus-tvk.dts | |
parent | 895fb3159280fe7695b35ec7c87ec19e13ca5b6e (diff) | |
parent | 64291f7db5bd8150a74ad2036f1037e6a0428df2 (diff) |
Merge tag 'v4.2' into for_next
Linux 4.2
Diffstat (limited to 'arch/arm/boot/dts/ste-hrefv60plus-tvk.dts')
-rw-r--r-- | arch/arm/boot/dts/ste-hrefv60plus-tvk.dts | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-hrefv60plus-tvk.dts b/arch/arm/boot/dts/ste-hrefv60plus-tvk.dts index d53cccdce776..ebd8547e98f1 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus-tvk.dts +++ b/arch/arm/boot/dts/ste-hrefv60plus-tvk.dts @@ -18,4 +18,11 @@ / { model = "ST-Ericsson HREF (v60+) and TVK1281618 UIB"; compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500"; + + /* This stablilizes the serial port enumeration */ + aliases { + serial0 = &ux500_serial0; + serial1 = &ux500_serial1; + serial2 = &ux500_serial2; + }; }; |