[PATCH v3 2/4] ARM: kirkwood: DT board setup for Network Space v2 and parents

[Jason Cooper]

On Mon, Nov 26, 2012 at 04:18:11PM +0100, Simon Guinot wrote:
> On Mon, Nov 26, 2012 at 01:02:53AM -0800, Olof Johansson wrote:
> > Hi,
> > 
> > This is more directed at Jason and the other maintainers than you, Simon --
> > it's something I noticed when looking at his pull request.
> > 
> > On Wed, Oct 17, 2012 at 12:09:04PM +0200, Simon Guinot wrote:
> > 
> > > diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
> > > index 50bca50..847e0c2 100644
> > > --- a/arch/arm/mach-kirkwood/Kconfig
> > > +++ b/arch/arm/mach-kirkwood/Kconfig
> > > @@ -130,6 +130,27 @@ config MACH_KM_KIRKWOOD_DT
> > >  	  Say 'Y' here if you want your kernel to support the
> > >  	  Keymile Kirkwood Reference Desgin, using Flattened Device Tree.
> > >  
> > > +config MACH_INETSPACE_V2_DT
> > > +	bool "LaCie Internet Space v2 NAS (Flattened Device Tree)"
> > > +	select ARCH_KIRKWOOD_DT
> > > +	help
> > > +	  Say 'Y' here if you want your kernel to support the LaCie
> > > +	  Internet Space v2 NAS, using Flattened Device Tree.
> > > +
> > > +config MACH_NETSPACE_V2_DT
> > > +	bool "LaCie Network Space v2 NAS (Flattened Device Tree)"
> > > +	select ARCH_KIRKWOOD_DT
> > > +	help
> > > +	  Say 'Y' here if you want your kernel to support the LaCie
> > > +	  Network Space v2 NAS, using Flattened Device Tree.
> > > +
> > > +config MACH_NETSPACE_MAX_V2_DT
> > > +	bool "LaCie Network Space Max v2 NAS (Flattened Device Tree)"
> > > +	select ARCH_KIRKWOOD_DT
> > > +	help
> > > +	  Say 'Y' here if you want your kernel to support the LaCie
> > > +	  Network Space Max v2 NAS, using Flattened Device Tree.
> > 
> > It would be nice to get away from these config options. The whole point with
> > device tree is to no longer have to do code changes for new similar boards.
> > 
> > And even then, since they share the same init function, there's no need for
> > three options, just one.
> > 
> > > diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
> > > index 294779f..1f63d80 100644
> > > --- a/arch/arm/mach-kirkwood/Makefile
> > > +++ b/arch/arm/mach-kirkwood/Makefile
> > > @@ -31,3 +31,6 @@ obj-$(CONFIG_MACH_GOFLEXNET_DT)		+= board-goflexnet.o
> > >  obj-$(CONFIG_MACH_LSXL_DT)		+= board-lsxl.o
> > >  obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT)	+= board-iomega_ix2_200.o
> > >  obj-$(CONFIG_MACH_KM_KIRKWOOD_DT)	+= board-km_kirkwood.o
> > > +obj-$(CONFIG_MACH_INETSPACE_V2_DT)	+= board-ns2.o
> > > +obj-$(CONFIG_MACH_NETSPACE_V2_DT)	+= board-ns2.o
> > > +obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)	+= board-ns2.o
> > 
> > Same here.
> 
> Hi,
> 
> All this configuration options (plus those for ns2 lite and mini) are
> indeed useless as we are using a single init function. Moreover there
> is no code relying on this options in the file  board-ns2.c. All the
> checks are made at run-time.
> 
> I will send a patch to remove this options.

No need to jump on it just yet.  Nothing more is going into 3.8.  We
plan on cleaning up a lot of this as the first part of stuff for 3.9.
It'll be easier to have one series knocking it all out as opposed to
several board-specific patches from individuals.

Unless, of course, you're volunteering to do the whole cleanup.  Then by
all means, don't let me stand in your way.  :-)

Otherwise, I'll put this series together near v3.8-rc1.

thx,

Jason.