diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-22 00:26:37 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-22 00:26:37 +0200 |
| commit | d033de5ceee8333e4fee3d59a956244d3736102a (patch) | |
| tree | 5bdebcac18ed67890571632570c324e0c41a7223 /arch/arm/boot/dts/ste-ccu8540.dts | |
| parent | ASoC: topology: Change pass number of DAI smaller than graph (diff) | |
| parent | Linux 4.2-rc6 (diff) | |
| download | linux-d033de5ceee8333e4fee3d59a956244d3736102a.tar.xz linux-d033de5ceee8333e4fee3d59a956244d3736102a.zip | |
Merge tag 'v4.2-rc6' into asoc-topology
Linux 4.2-rc6
Diffstat (limited to 'arch/arm/boot/dts/ste-ccu8540.dts')
| -rw-r--r-- | arch/arm/boot/dts/ste-ccu8540.dts | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-ccu8540.dts b/arch/arm/boot/dts/ste-ccu8540.dts index 32dd55e5f4e6..6eaaf638e52e 100644 --- a/arch/arm/boot/dts/ste-ccu8540.dts +++ b/arch/arm/boot/dts/ste-ccu8540.dts @@ -17,6 +17,13 @@ model = "ST-Ericsson U8540 platform with Device Tree"; compatible = "st-ericsson,ccu8540", "st-ericsson,u8540"; + /* This stablilizes the serial port enumeration */ + aliases { + serial0 = &ux500_serial0; + serial1 = &ux500_serial1; + serial2 = &ux500_serial2; + }; + memory@0 { device_type = "memory"; reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>; |