diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2015-10-14 17:52:59 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-14 17:52:59 +0200 |
| commit | a8939d1a2f1a51425a63afad62e007adc85e746b (patch) | |
| tree | 3ff325799aaca6cf12a8caad214fe86724dd281a | |
| parent | ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers (diff) | |
| parent | ARM: hisilicon: DT: Drop console= and earlyprintk bootargs parameter (diff) | |
| download | linux-dev-a8939d1a2f1a51425a63afad62e007adc85e746b.tar.xz linux-dev-a8939d1a2f1a51425a63afad62e007adc85e746b.zip | |
Merge tag 'hisi-soc-dt-for-4.4' of git://github.com/hisilicon/linux-hisi into next/dt
Pull "ARM: DT: Hisilicon SoC DT updates for 4.4" from Wei Xu:
- Drop console= and earlyprintk bootargs parameter in hisilicon armv7 dts
* tag 'hisi-soc-dt-for-4.4' of git://github.com/hisilicon/linux-hisi:
ARM: hisilicon: DT: Drop console= and earlyprintk bootargs parameter
| -rw-r--r-- | arch/arm/boot/dts/hi3620-hi4511.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/hisi-x5hd2-dkb.dts | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/hi3620-hi4511.dts b/arch/arm/boot/dts/hi3620-hi4511.dts index fe623928f687..a579fbf13b5f 100644 --- a/arch/arm/boot/dts/hi3620-hi4511.dts +++ b/arch/arm/boot/dts/hi3620-hi4511.dts @@ -16,7 +16,8 @@ compatible = "hisilicon,hi3620-hi4511"; chosen { - bootargs = "console=ttyAMA0,115200 root=/dev/ram0 earlyprintk"; + bootargs = "root=/dev/ram0"; + stdout-path = "serial0:115200n8"; }; memory { diff --git a/arch/arm/boot/dts/hisi-x5hd2-dkb.dts b/arch/arm/boot/dts/hisi-x5hd2-dkb.dts index 721b09238f58..d13af8437d10 100644 --- a/arch/arm/boot/dts/hisi-x5hd2-dkb.dts +++ b/arch/arm/boot/dts/hisi-x5hd2-dkb.dts @@ -15,7 +15,7 @@ compatible = "hisilicon,hix5hd2"; chosen { - bootargs = "console=ttyAMA0,115200 earlyprintk"; + stdout-path = "serial0:115200n8"; }; cpus { |