diff options
| author | Rob Herring <robh@kernel.org> | 2018-12-13 20:20:36 +0300 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-12-13 20:20:36 +0300 |
| commit | acc2038738bd6f881e7a277ba14fa7c589fd3058 (patch) | |
| tree | fd56524867a9b726b3e5d2cb040ff16b2f2a67a0 /arch/arm/boot/dts/vf610m4-colibri.dts | |
| parent | cd1cc0bef46fc8d8f9ebe82d2064d4f4bd5ecf16 (diff) | |
| parent | 2c9b0b00af23cdc70d28d82e077dc1d280bcb84a (diff) | |
| download | linux-acc2038738bd6f881e7a277ba14fa7c589fd3058.tar.xz | |
Merge branch 'yaml-bindings-for-v4.21' into dt/next
Diffstat (limited to 'arch/arm/boot/dts/vf610m4-colibri.dts')
| -rw-r--r-- | arch/arm/boot/dts/vf610m4-colibri.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/vf610m4-colibri.dts b/arch/arm/boot/dts/vf610m4-colibri.dts index 41ec66a96990..ca6249558760 100644 --- a/arch/arm/boot/dts/vf610m4-colibri.dts +++ b/arch/arm/boot/dts/vf610m4-colibri.dts @@ -50,8 +50,8 @@ compatible = "fsl,vf610m4"; chosen { - bootargs = "console=ttyLP2,115200 clk_ignore_unused init=/linuxrc rw"; - stdout-path = "&uart2"; + bootargs = "clk_ignore_unused init=/linuxrc rw"; + stdout-path = "serial2:115200"; }; memory@8c000000 { |