public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Shawn Guo <shawn.guo@linaro.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/3] poplar: sync up device tree with kernel 4.20
Date: Fri, 18 Jan 2019 08:57:03 +0800	[thread overview]
Message-ID: <20190118005700.GA9575@dragon> (raw)
In-Reply-To: <20190117145308.GA5283@Mani-XPS-13-9360>

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@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.

Shawn

[1] https://patchwork.kernel.org/patch/10769237/

  reply	other threads:[~2019-01-18  0:57 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-17  4:09 [U-Boot] [PATCH 0/3] Enable mmc driver model for Poplar board Shawn Guo
2019-01-17  4:09 ` [U-Boot] [PATCH 1/3] poplar: sync up device tree with kernel 4.20 Shawn Guo
2019-01-17 14:53   ` Manivannan Sadhasivam
2019-01-18  0:57     ` Shawn Guo [this message]
2019-01-18  3:11       ` Manivannan Sadhasivam
2019-01-27  3:51   ` [U-Boot] [U-Boot, " Tom Rini
2019-01-17  4:09 ` [U-Boot] [PATCH 2/3] mmc: hi6220_dw_mmc: add compatible for Poplar support Shawn Guo
2019-01-17 14:37   ` Manivannan Sadhasivam
2019-01-27  3:51   ` [U-Boot] [U-Boot, " Tom Rini
2019-01-17  4:09 ` [U-Boot] [PATCH 3/3] poplar: clean up board level mmc initialization code Shawn Guo
2019-01-17 14:38   ` Manivannan Sadhasivam
2019-01-27  3:52   ` [U-Boot] [U-Boot, " Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190118005700.GA9575@dragon \
    --to=shawn.guo@linaro.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox