[PATCH 1/2] arm64: dts: armada-3720-espressobin: sync with downstream

[Peter Robinson]

On Fri, Sep 4, 2020 at 1:35 PM Andre Heider <a.heider at gmail.com> wrote:
>
> Hi Stefan,
>
> On 04/09/2020 14:02, Stefan Roese wrote:
> > Hi Andre,
> >
> > On 31.08.20 09:53, Pali Rohár wrote:
> >> On Monday 31 August 2020 05:34:07 Andre Heider wrote:
> >>> This adds the disabled eMMC node.
> >>>
> >>> Signed-off-by: Andre Heider <a.heider at gmail.com>
> >>> ---
> >>>   arch/arm/dts/armada-3720-espressobin.dts | 63 +++++++++---------------
> >>>   1 file changed, 23 insertions(+), 40 deletions(-)
> >>>
> >>> diff --git a/arch/arm/dts/armada-3720-espressobin.dts
> >>> b/arch/arm/dts/armada-3720-espressobin.dts
> >>> index 4534f5ff29..a66ab814eb 100644
> >>> --- a/arch/arm/dts/armada-3720-espressobin.dts
> >>> +++ b/arch/arm/dts/armada-3720-espressobin.dts
> >>> @@ -1,3 +1,4 @@
> >>> +// SPDX-License-Identifier: GPL-2.0+
> >>>   /*
> >>>    * Device Tree file for Marvell Armada 3720 community board
> >>>    * (ESPRESSOBin)
> >>> @@ -5,53 +6,15 @@
> >>>    *
> >>>    * Gregory CLEMENT <gregory.clement at free-electrons.com>
> >>>    * Konstantin Porotchkin <kostap at marvell.com>
> >>> - *
> >>> - * This file is dual-licensed: you can use it either under the terms
> >>> - * of the GPL or the X11 license, at your option. Note that this dual
> >>> - * licensing only applies to this file, and not this project as a
> >>> - * whole.
> >>> - *
> >>> - *  a) This file is free software; you can redistribute it and/or
> >>> - *     modify it under the terms of the GNU General Public License as
> >>> - *     published by the Free Software Foundation; either version 2
> >>> of the
> >>> - *     License, or (at your option) any later version.
> >>> - *
> >>> - *     This file is distributed in the hope that it will be useful
> >>> - *     but WITHOUT ANY WARRANTY; without even the implied warranty of
> >>> - *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> >>> - *     GNU General Public License for more details.
> >>> - *
> >>> - * Or, alternatively
> >>> - *
> >>> - *  b) Permission is hereby granted, free of charge, to any person
> >>> - *     obtaining a copy of this software and associated documentation
> >>> - *     files (the "Software"), to deal in the Software without
> >>> - *     restriction, including without limitation the rights to use
> >>> - *     copy, modify, merge, publish, distribute, sublicense, and/or
> >>> - *     sell copies of the Software, and to permit persons to whom the
> >>> - *     Software is furnished to do so, subject to the following
> >>> - *     conditions:
> >>> - *
> >>> - *     The above copyright notice and this permission notice shall be
> >>> - *     included in all copies or substantial portions of the Software.
> >>> - *
> >>> - *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> >>> - *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> >>> - *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> >>> - *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> >>> - *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> >>> - *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> >>> - *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> >>> - *     OTHER DEALINGS IN THE SOFTWARE.
> >>>    */
> >>
> >> You are changing license of whole file. Have all contributors and
> >> copyright holders agreed with it?
> >
> > First I though that you have been syncing the file with the Linux kernel
> > version. But now I see that its sync'ed with downstream U-Boot most
> > likely. As for the license of the file: The Linux kernel version has
> > this SPDX tag:
> >
> > // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> >
> > Changing this to this tag would haven been fine (AFAICT). But using a
> > diffent one from a downstream U-Boot repository is a bit troublesome
> > for my taste.
> >
> > Can't you sync with Linux dts/dtsi files instead at some point?
>
> at some point, yes. As far as I understand that's not yet possible due
> to the comphy driver. Quoting Marek's cover letter "[PATCH
> u-boot-marvell 00/11] Armada 37xx: port comphy to generic-phys (PLEASE
> TEST)" from 19th April:
>
>  > I have ported the COMPHY and UTMI PHY drivers from Linux to U-Boot.
>  > With this we are able to abandon the current comphy_a3700 driver, which
>  > is incompatible with Linux' device trees. So if we want to have DTS
>  > files for A3720 boards identical to Linux', we have to do this.
>
> So unfortunately we can't use Linux' dts files for a3700 yet. Marek said
> he plans to work on that set again in the near future, so hopefully that
> lands rather sooner than later ;)

The way U-Boot usually deals with this is syncs as much of the Linux
ones as possible and if there's bits not in the Linux one that's
needed to make/keep U-Boot working they add it in a XXX-u-boot.dtsi
file. There's a number of examples in the arch/arm/dts directory.