[PATCH 4/4] arm: dts: chameleonv3: Add 270-2 variant

[Simon Glass]

Hi Paweł,

On Mon, 29 Aug 2022 at 02:23, Paweł Anikiel <pan at semihalf.com> wrote:
>
> On Sat, Aug 27, 2022 at 2:22 AM Simon Glass <sjg at chromium.org> wrote:
> >
> > Hi Paweł,
> >
> > On Fri, 26 Aug 2022 at 01:54, Paweł Anikiel <pan at semihalf.com> wrote:
> > >
> > > Add devicetree for chameleonv3 with the 270-2I2-D11E variant of the
> > > Mercury+ AA1 module
> > >
> > > Signed-off-by: Paweł Anikiel <pan at semihalf.com>
> > > ---
> > >  arch/arm/dts/Makefile                                |  1 +
> > >  .../socfpga_arria10_chameleonv3_270_2-u-boot.dtsi    | 12 ++++++++++++
> > >  arch/arm/dts/socfpga_arria10_chameleonv3_270_2.dts   |  5 +++++
> > >  3 files changed, 18 insertions(+)
> > >  create mode 100644 arch/arm/dts/socfpga_arria10_chameleonv3_270_2-u-boot.dtsi
> > >  create mode 100644 arch/arm/dts/socfpga_arria10_chameleonv3_270_2.dts
> > >


> > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> > > index 7330121dba..36d5d65595 100644
> > > --- a/arch/arm/dts/Makefile
> > > +++ b/arch/arm/dts/Makefile
> > > @@ -425,6 +425,7 @@ dtb-$(CONFIG_ARCH_SOCFPGA) +=                               \
> > >         socfpga_agilex_socdk.dtb                        \
> > >         socfpga_arria5_secu1.dtb                        \
> > >         socfpga_arria5_socdk.dtb                        \
> > > +       socfpga_arria10_chameleonv3_270_2.dtb           \
> > >         socfpga_arria10_chameleonv3_270_3.dtb           \
> > >         socfpga_arria10_chameleonv3_480_2.dtb           \
> > >         socfpga_arria10_socdk_sdmmc.dtb                 \
> > > diff --git a/arch/arm/dts/socfpga_arria10_chameleonv3_270_2-u-boot.dtsi b/arch/arm/dts/socfpga_arria10_chameleonv3_270_2-u-boot.dtsi
> > > new file mode 100644
> > > index 0000000000..05b4485cf3
> > > --- /dev/null
> > > +++ b/arch/arm/dts/socfpga_arria10_chameleonv3_270_2-u-boot.dtsi
> > > @@ -0,0 +1,12 @@
> > > +// SPDX-License-Identifier: GPL-2.0
> > > +/*
> > > + * Copyright 2022 Google LLC
> > > + */
> > > +#include "socfpga_arria10_chameleonv3_480_2_handoff.h"
> > > +#include "socfpga_arria10-handoff.dtsi"
> > > +#include "socfpga_arria10_handoff_u-boot.dtsi"
> > > +#include "socfpga_arria10_mercury_aa1-u-boot.dtsi"
> > > +
> > > +&fpga_mgr {
> > > +       altr,bitstream = "fpga-270-2.itb";
> > > +};
> > > diff --git a/arch/arm/dts/socfpga_arria10_chameleonv3_270_2.dts b/arch/arm/dts/socfpga_arria10_chameleonv3_270_2.dts
> > > new file mode 100644
> > > index 0000000000..5f40af6eb9
> > > --- /dev/null
> > > +++ b/arch/arm/dts/socfpga_arria10_chameleonv3_270_2.dts
> > > @@ -0,0 +1,5 @@
> > > +// SPDX-License-Identifier: GPL-2.0
> > > +/*
> > > + * Copyright 2022 Google LLC
> > > + */
> > > +#include "socfpga_arria10_chameleonv3.dts"
> >
> > Can you create a common .dtsi file instead? We should not be including
> > a .dts file into another file.
> >
> Do you mean renaming chameleonv3.dts to .dtsi? In Linux it's a .dts,
> because nothing includes it (no handoff headers are needed). Is it
> fine to have the names differ across U-Boot and Linux?

Ideally not, but we should not include a .dts file in another one and
it is probably more important to follow that rule. But why is Linux
not getting this variant?

Regards,
Simon