diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-04 18:16:39 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-04 18:16:39 +0200 |
| commit | 04782ca20a8ebb5acf0c35756a38964ae5ea7321 (patch) | |
| tree | ebf475793bb17444d3a1e21974617f27e8ff3a4b /arch/arm/boot/dts/ste-nomadik-s8815.dts | |
| parent | regmap: Support bulk reads for devices without raw formatting (diff) | |
| parent | regmap: fix a NULL pointer dereference in __regmap_init (diff) | |
| download | linux-04782ca20a8ebb5acf0c35756a38964ae5ea7321.tar.xz linux-04782ca20a8ebb5acf0c35756a38964ae5ea7321.zip | |
Merge branch 'topic/smbus-block' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-core
Diffstat (limited to 'arch/arm/boot/dts/ste-nomadik-s8815.dts')
| -rw-r--r-- | arch/arm/boot/dts/ste-nomadik-s8815.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts index 85d3b95dfdba..3c140d05f796 100644 --- a/arch/arm/boot/dts/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts @@ -15,6 +15,10 @@ bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk"; }; + aliases { + serial1 = &uart1; + }; + src@101e0000 { /* These chrystal drivers are not used on this board */ disable-sxtalo; |