| Message ID | 20160926122651.22132-7-fvogt@suse.com |
|---|---|
| State | Accepted |
| Commit | ff5d7ae713ac6de37f3a93f3a4fed13ab4ffd154 |
| Delegated to: | Tom Rini |
| Headers | show |
On 26 September 2016 at 06:26, Fabian Vogt <fvogt@suse.com> wrote: > 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> > --- > arch/arm/dts/bcm283x-uboot.dtsi | 22 ++++++++++++++++++++++ > arch/arm/dts/bcm283x.dtsi | 4 +++- > 2 files changed, 25 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/dts/bcm283x-uboot.dtsi Reviewed-by: Simon Glass <sjg@chromium.org> I'd be intrigued to see if Linux would accept a version of this patch.
On Mon, Sep 26, 2016 at 02:26:48PM +0200, Fabian Vogt wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/arch/arm/dts/bcm283x-uboot.dtsi b/arch/arm/dts/bcm283x-uboot.dtsi new file mode 100644 index 0000000..8e4231a --- /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 445624a..e5b4f20 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"
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> --- arch/arm/dts/bcm283x-uboot.dtsi | 22 ++++++++++++++++++++++ arch/arm/dts/bcm283x.dtsi | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/bcm283x-uboot.dtsi