[PATCH 1/2] ARM: DT: Kirkwood: Use symbolic names from input.h

[Jason Cooper]

On Tue, Dec 03, 2013 at 11:28:35PM +0100, Andrew Lunn wrote:
> On Tue, Dec 03, 2013 at 04:56:33PM -0500, Jason Cooper wrote:
> > On Tue, Dec 03, 2013 at 10:50:05PM +0100, Andrew Lunn wrote:
> > > On Tue, Dec 03, 2013 at 09:39:02PM +0100, Arnaud Ebalard wrote:
> > > > Hi Andrew,
> > > > 
> > > > Andrew Lunn <andrew at lunn.ch> writes:
> > > > 
> > > > > Replace the numeric key value with a symbolic name from
> > > > > <bt-bindings/input/input.h>
> > > > >
> > > > > Signed-off-by: Andrew Lunn <andrew at lunn.ch>
> > > > > ---
> > > > >  arch/arm/boot/dts/kirkwood-cloudbox.dts                | 2 +-
> > > > >  arch/arm/boot/dts/kirkwood-dnskw.dtsi                  | 6 +++---
> > > > >  arch/arm/boot/dts/kirkwood-ib62x0.dts                  | 4 ++--
> > > > >  arch/arm/boot/dts/kirkwood-iconnect.dts                | 4 ++--
> > > > >  arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts          | 6 +++---
> > > > >  arch/arm/boot/dts/kirkwood-lsxl.dtsi                   | 6 +++---
> > > > >  arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts         | 4 ++--
> > > > >  arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 6 +++---
> > > > 
> > > > Jason just applied (yesterday IIRC) to mvebu/dt a series which provides
> > > > cleanup for ReadyNAS .dts files. Among other things, it replaces numeric
> > > > key values with a symbolic name. And it also does the same for GPIO
> > > > voltage level. I guess you can remove that specific .dts from your patch.
> > > 
> > > I sore your patches. I did it slightly different to you, in that i've
> > > the includes in the top level kirkwood.dtsi file, where as you put
> > > them into the .dts files. That makes yours redundant, if we keep to
> > > this scheme.
> > > 
> > > Jason, which do you prefer, includes in every .dts file, or once in
> > > kirkwood.dtsi. 
> > 
> > I prefer the kernel standard (is it really?) for includes.  Which is
> > directly in the file needing it.  So, that would mean in both if we use
> > the macros in both.
> 
> We don't directly use the macros in kirkwood.dtsi. We use them in
> nearly every kirkwood-*.dts* file.
> 
> As to kernel standard, looking in arch/arm/boot/*, it seems like
> <dt-bindings/gpio/tegra-gpio.h> is mostly used in .dtsi files, not
> .dts files, meaning it is included once at a higher level. 

hmm, yeah, and I forgot about including dtsi's within nodes and other
such stuff.  The analogy from C code (to which I was referring) doesn't
carry that well.

> That is what my patch does.

Yep, keep it in the .dtsi.

thx,

Jason.