diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-08-22 23:57:59 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-08-22 23:57:59 +0200 |
| commit | e3dbc572fe11a5231568e106fa3dcedd1d1bec0f (patch) | |
| tree | 5e15ee35c77e75d51cb550cb3cb0f6ecafa7b508 /arch/arm/boot/dts/ste-hrefv60plus-tvk.dts | |
| parent | Merge tag 'kvm-arm-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | KVM: PPC: Book3S: correct width in XER handling (diff) | |
| download | linux-e3dbc572fe11a5231568e106fa3dcedd1d1bec0f.tar.xz linux-e3dbc572fe11a5231568e106fa3dcedd1d1bec0f.zip | |
Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue
Patch queue for ppc - 2015-08-22
Highlights for KVM PPC this time around:
- Book3S: A few bug fixes
- Book3S: Allow micro-threading on POWER8
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; + }; }; |