Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / Atom feed
From: "Andrew Jeffery" <andrew@aj.id.au>
To: "Rob Herring" <robh+dt@kernel.org>
Cc: "Mark Rutland" <mark.rutland@arm.com>,
	devicetree@vger.kernel.org, "Xo Wang" <xow@google.com>,
	linux-aspeed@lists.ozlabs.org,
	"Ken Chen" <chen.kenyy@inventec.com>, "Tao Ren" <taoren@fb.com>,
	"Adriana Kobylak" <anoo@us.ibm.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"(Exiting) Yao Yuan" <yao.yuan@linaro.org>,
	"YangBrianC.W 楊嘉偉 TAO" <yang.brianc.w@inventec.com>,
	"Joel Stanley" <joel@jms.id.au>,
	"moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE"
	<linux-arm-kernel@lists.infradead.org>,
	"John Wang" <wangzqbj@inspur.com>
Subject: Re: [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed, external-nodes description
Date: Thu, 05 Dec 2019 15:36:04 +1030
Message-ID: <25487d30-d748-445b-aad2-03c4d9241631@www.fastmail.com> (raw)
In-Reply-To: <CAL_JsqJ8p-zs2F-mXkO_egoBtZ8WymM4O-2AaDJMZYeCFS3sLg@mail.gmail.com>



On Wed, 4 Dec 2019, at 01:13, Rob Herring wrote:
> On Tue, Dec 3, 2019 at 6:03 AM Andrew Jeffery <andrew@aj.id.au> wrote:
> >
> > The existing approach lead to an error from the dtbs_check:
> >
> >     pinctrl: aspeed,external-nodes: [[8, 9]] is too short
> 
> This one where we have list of phandles is fixed in dtc. I need to
> update the kernel's copy.

Ah, cool.

> 
> > Cc: Adriana Kobylak <anoo@us.ibm.com>
> > Cc: Brian Yang <yang.brianc.w@inventec.com>
> > Cc: Joel Stanley <joel@jms.id.au>
> > Cc: John Wang <wangzqbj@inspur.com>
> > Cc: Ken Chen <chen.kenyy@inventec.com>
> > Cc: Tao Ren <taoren@fb.com>
> > Cc: Xo Wang <xow@google.com>
> > Cc: Yuan Yao <yao.yuan@linaro.org>
> > Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> > Reviewed-by: Joel Stanley <joel@jms.id.au>
> > ---
> >  arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts     |  4 +----
> >  arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts |  4 +----
> >  arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts         |  9 +++++++--
> >  arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts           |  4 +----
> >  arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts             |  4 +----
> >  arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts             |  4 +----
> >  arch/arm/boot/dts/aspeed-bmc-opp-swift.dts               |  4 +----
> >  arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts         |  4 +----
> >  arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts               |  2 +--
> >  arch/arm/boot/dts/aspeed-g5.dtsi                         |  3 +--
> >  10 files changed, 8 insertions(+), 34 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
> > index c2ece0b91885..de9612e49c69 100644
> > --- a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
> > +++ b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
> > @@ -211,10 +211,6 @@
> >         status = "okay";
> >  };
> >
> > -&pinctrl {
> > -       aspeed,external-nodes = <&gfx &lhc>;
> > -};
> > -
> >  &gpio {
> >         pin_gpio_c7 {
> >                 gpio-hog;
> > diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
> > index 2c29ac037d32..022d0744d786 100644
> > --- a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
> > +++ b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
> > @@ -200,10 +200,6 @@
> >         status = "okay";
> >  };
> >
> > -&pinctrl {
> > -       aspeed,external-nodes = <&gfx &lhc>;
> > -};
> > -
> >  &gpio {
> >         pin_gpio_c7 {
> >                 gpio-hog;
> > diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
> > index c17bb7fce7ff..d69da58476fe 100644
> > --- a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
> > +++ b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
> > @@ -782,8 +782,13 @@
> >         memory-region = <&gfx_memory>;
> >  };
> >
> > -&pinctrl {
> > -       aspeed,external-nodes = <&gfx &lhc>;
> > +&gpio {
> > +       pin_gpio_b7 {
> > +               gpio-hog;
> > +               gpios = <ASPEED_GPIO(B,7) GPIO_ACTIVE_LOW>;
> > +               output-high;
> > +               line-name = "BMC_INIT_OK";
> > +       };
> 
> Seems like an unrelated change?

Yeah, that seems to be a bad rebase conflict resolution.

Thanks,

Andrew

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply index

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
2019-12-03 12:04 ` [PATCH 01/14] dt-bindings: pinctrl: aspeed: Add reg property as a hint Andrew Jeffery
2019-12-03 12:04 ` [PATCH 02/14] dt-bindings: misc: Document reg for aspeed, p2a-ctrl nodes Andrew Jeffery
2019-12-03 12:04 ` [PATCH 03/14] ARM: dts: aspeed-g5: Move EDAC node to APB Andrew Jeffery
2019-12-03 12:04 ` [PATCH 04/14] ARM: dts: aspeed-g5: Use recommended generic node name for SDMC Andrew Jeffery
2019-12-03 12:04 ` [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed, external-nodes description Andrew Jeffery
2019-12-03 14:43   ` Rob Herring
2019-12-05  5:06     ` Andrew Jeffery [this message]
2019-12-03 12:04 ` [PATCH 06/14] ARM: dts: vesnin: Add unit address for memory node Andrew Jeffery
2019-12-03 12:04 ` [PATCH 07/14] ARM: dts: fp5280g2: Cleanup gpio-keys-polled properties Andrew Jeffery
2019-12-03 12:04 ` [PATCH 08/14] ARM: dts: swift: " Andrew Jeffery
2019-12-04 22:29   ` Adriana Kobylak
2019-12-03 12:04 ` [PATCH 09/14] ARM: dts: witherspoon: " Andrew Jeffery
2019-12-03 12:04 ` [PATCH 10/14] ARM: dts: aspeed: Cleanup lpc-ctrl and snoop regs Andrew Jeffery
2019-12-03 12:04 ` [PATCH 11/14] ARM: dts: aspeed: Add reg hints to syscon children Andrew Jeffery
2019-12-03 12:04 ` [PATCH 12/14] ARM: dts: aspeed-g5: Sort LPC child nodes by unit address Andrew Jeffery
2019-12-03 12:04 ` [PATCH 13/14] ARM: dts: aspeed-g6: Cleanup watchdog " Andrew Jeffery
2019-12-03 12:04 ` [PATCH 14/14] ARM: dts: ibm-power9-dual: Add a unit address for OCC nodes Andrew Jeffery
2019-12-03 14:47 ` [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Rob Herring

Reply instructions:

You may reply publically 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=25487d30-d748-445b-aad2-03c4d9241631@www.fastmail.com \
    --to=andrew@aj.id.au \
    --cc=anoo@us.ibm.com \
    --cc=chen.kenyy@inventec.com \
    --cc=devicetree@vger.kernel.org \
    --cc=joel@jms.id.au \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-aspeed@lists.ozlabs.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=taoren@fb.com \
    --cc=wangzqbj@inspur.com \
    --cc=xow@google.com \
    --cc=yang.brianc.w@inventec.com \
    --cc=yao.yuan@linaro.org \
    /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

Linux-ARM-Kernel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/0 linux-arm-kernel/git/0.git
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/1 linux-arm-kernel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-arm-kernel linux-arm-kernel/ https://lore.kernel.org/linux-arm-kernel \
		linux-arm-kernel@lists.infradead.org
	public-inbox-index linux-arm-kernel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.infradead.lists.linux-arm-kernel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git