[U-Boot] [PATCH 1/3] poplar: sync up device tree with kernel 4.20
Manivannan Sadhasivam
manivannan.sadhasivam at linaro.org
Fri Jan 18 03:11:56 UTC 2019
Hi Shawn,
On Fri, Jan 18, 2019 at 08:57:03AM +0800, Shawn Guo wrote:
> Hi Manivannan,
>
> On Thu, Jan 17, 2019 at 08:23:08PM +0530, Manivannan Sadhasivam wrote:
> > Hi Shawn,
> >
> > On Thu, Jan 17, 2019 at 12:09:50PM +0800, Shawn Guo wrote:
> > > It adds missing pinctrl headers, updates clock header and sync up Poplar
> > > device tree with kernel 4.20 release.
> > >
> > > Signed-off-by: Shawn Guo <shawn.guo at linaro.org>
> > > ---
> > > arch/arm/dts/hi3798cv200-poplar.dts | 68 ++++++--
> > > arch/arm/dts/hi3798cv200.dtsi | 221 +++++++++++++++++++++++-
> > > arch/arm/dts/poplar-pinctrl.dtsi | 98 +++++++++++
> > > include/dt-bindings/clock/histb-clock.h | 56 +++---
> > > include/dt-bindings/pinctrl/hisi.h | 74 ++++++++
> > > 5 files changed, 482 insertions(+), 35 deletions(-)
> > > create mode 100644 arch/arm/dts/poplar-pinctrl.dtsi
> > > create mode 100644 include/dt-bindings/pinctrl/hisi.h
> > >
> > > diff --git a/arch/arm/dts/hi3798cv200-poplar.dts b/arch/arm/dts/hi3798cv200-poplar.dts
> > > index 964326eae89b..d30f6eb8a5ee 100644
> > > --- a/arch/arm/dts/hi3798cv200-poplar.dts
> > > +++ b/arch/arm/dts/hi3798cv200-poplar.dts
> > > @@ -1,14 +1,17 @@
> > > -// SPDX-License-Identifier: GPL-2.0
> > > /*
> > > * DTS File for HiSilicon Poplar Development Board
> > > *
> > > * Copyright (c) 2016-2017 HiSilicon Technologies Co., Ltd.
> > > + *
> > > + * Released under the GPLv2 only.
> > > + * SPDX-License-Identifier: GPL-2.0
> >
> > This is a malformed license identifier. Eventhough it is being imported
> > from Linux kernel, we need to fix this (on both).
>
> Yes, I'm aware of it. But the approach I would rather take is that we
> only practically maintain u-boot specific changes with
> hi3798cv200-u-boot.dtsi, and for changes maintained in kernel, we should
> push to kernel and sync them down to u-boot.
>
> I just sent a patch [1] to fix this in kernel, and next time we sync
> from kernel, everything should be fine then.
>
Sounds good!
Thanks,
Mani
> Shawn
>
> [1] https://patchwork.kernel.org/patch/10769237/
More information about the U-Boot
mailing list