diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-07-30 01:13:24 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-07-30 01:13:24 +0300 |
| commit | 4b979e4c611ce750d32b51737f837b485f43c69b (patch) | |
| tree | 3bc56f2a22d2cf29bc183b67e74e1e8c0733efc0 /arch/arm/boot/dts/ste-hrefprev60-tvk.dts | |
| parent | 1559f3b8d0527e24219149c95b3de5e7b2924828 (diff) | |
| parent | cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f (diff) | |
| download | linux-4b979e4c611ce750d32b51737f837b485f43c69b.tar.xz | |
Merge branch 'linus' into irq/core
Pull in upstream fixes before applying conflicting changes
Diffstat (limited to 'arch/arm/boot/dts/ste-hrefprev60-tvk.dts')
| -rw-r--r-- | arch/arm/boot/dts/ste-hrefprev60-tvk.dts | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-hrefprev60-tvk.dts b/arch/arm/boot/dts/ste-hrefprev60-tvk.dts index 59523f866812..24739914e689 100644 --- a/arch/arm/boot/dts/ste-hrefprev60-tvk.dts +++ b/arch/arm/boot/dts/ste-hrefprev60-tvk.dts @@ -16,4 +16,11 @@ / { model = "ST-Ericsson HREF (pre-v60) and TVK1281618 UIB"; compatible = "st-ericsson,mop500", "st-ericsson,u8500"; + + /* This stablilizes the serial port enumeration */ + aliases { + serial0 = &ux500_serial0; + serial1 = &ux500_serial1; + serial2 = &ux500_serial2; + }; }; |