diff options
| author | Fabian Vogt <fvogt@suse.com> | 2016-09-26 14:26:48 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-28 20:09:50 -0500 |
| commit | ff5d7ae713ac6de37f3a93f3a4fed13ab4ffd154 (patch) | |
| tree | 981075c428ca54ccfed67118279ccbc14cc8b217 /arch | |
| parent | 460255842cc152753436f96cd6ba9d23ae28c43b (diff) | |
fdt: adjust bcm283x device tree for u-boot
The information currently set via platdata has to be represented in the
device tree now. bcm283x-uboot.dtsi adds the u-boot specific "skip-init"
property to the serial nodes and enables initialization in the pre-reloc phase.
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Signed-off-by: Fabian Vogt <fvogt@suse.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/bcm283x-uboot.dtsi | 22 | ||||
| -rw-r--r-- | arch/arm/dts/bcm283x.dtsi | 4 |
2 files changed, 25 insertions, 1 deletions
diff --git a/arch/arm/dts/bcm283x-uboot.dtsi b/arch/arm/dts/bcm283x-uboot.dtsi new file mode 100644 index 0000000000..8e4231ae6c --- /dev/null +++ b/arch/arm/dts/bcm283x-uboot.dtsi @@ -0,0 +1,22 @@ +/* + * U-Boot addition to keep baudrate set by firmware + * and also initialize before relocation. + * + * (C) Copyright 2016 Fabian Vogt <fvogt@suse.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +&soc { + u-boot,dm-pre-reloc; +}; + +&uart0 { + skip-init; + u-boot,dm-pre-reloc; +}; + +&uart1 { + skip-init; + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/bcm283x.dtsi b/arch/arm/dts/bcm283x.dtsi index 445624a1a1..e5b4f20c2a 100644 --- a/arch/arm/dts/bcm283x.dtsi +++ b/arch/arm/dts/bcm283x.dtsi @@ -19,7 +19,7 @@ bootargs = "earlyprintk console=ttyAMA0"; }; - soc { + soc: soc { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; @@ -319,3 +319,5 @@ }; }; + +#include "bcm283x-uboot.dtsi" |