On Thu, 24 Oct 2019 10:26:50 +0000, Thomas Hämmerle wrote: > From: Michael Tretter <m.tretter@xxxxxxxxxxxxxx> > > The firmware node will be added to the mainline device tree. As it will > eventually enter Barebox via a device tree sync, add it to the src tree > already. Not sure, but I think that we should wait with the device tree changes until they arrive via a sync with the kernel tree. Michael > > Signed-off-by: Michael Tretter <m.tretter@xxxxxxxxxxxxxx> > --- > arch/arm/dts/zynqmp-zcu104-revA.dts | 1 - > arch/arm/dts/zynqmp.dtsi | 17 ----------------- > dts/src/arm64/xilinx/zynqmp.dtsi | 7 +++++++ > 3 files changed, 7 insertions(+), 18 deletions(-) > delete mode 100644 arch/arm/dts/zynqmp.dtsi > > diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts > index c03112d..8b8dd84 100644 > --- a/arch/arm/dts/zynqmp-zcu104-revA.dts > +++ b/arch/arm/dts/zynqmp-zcu104-revA.dts > @@ -8,5 +8,4 @@ > */ > > #include <arm64/xilinx/zynqmp-zcu104-revA.dts> > -#include "zynqmp.dtsi" > #include "zynqmp-clk.dtsi" > diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi > deleted file mode 100644 > index 59984ee..0000000 > --- a/arch/arm/dts/zynqmp.dtsi > +++ /dev/null > @@ -1,17 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * dts file for Xilinx ZynqMP > - * > - * (C) Copyright 2014 - 2015, Xilinx, Inc. > - * > - * Michal Simek <michal.simek@xxxxxxxxxx> > - */ > - > -/ { > - firmware { > - zynqmp_firmware: zynqmp-firmware { > - compatible = "xlnx,zynqmp-firmware"; > - method = "smc"; > - }; > - }; > -}; > diff --git a/dts/src/arm64/xilinx/zynqmp.dtsi b/dts/src/arm64/xilinx/zynqmp.dtsi > index 9aa6734..9115eae 100644 > --- a/dts/src/arm64/xilinx/zynqmp.dtsi > +++ b/dts/src/arm64/xilinx/zynqmp.dtsi > @@ -115,6 +115,13 @@ > method = "smc"; > }; > > + firmware { > + zynqmp_firmware: zynqmp-firmware { > + compatible = "xlnx,zynqmp-firmware"; > + method = "smc"; > + }; > + }; > + > timer { > compatible = "arm,armv8-timer"; > interrupt-parent = <&gic>; _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox