Re: [PATCH v5 12/13] ARM: kirkwood: remove redundant DT board files
From: Jason Cooper <hidden>
Date: 2013-05-30 19:38:21
Also in:
linux-arm-kernel, lkml, netdev
On Thu, May 30, 2013 at 11:06:08AM +0200, Arnaud Ebalard wrote:
Hi Jason and Sebastian, Sebastian Hesselbarth [off-list ref] writes:quoted
With DT support for mv643xx_eth board specific init for some boards now is unneccessary. Remove those board files, Kconfig entries, and corresponding entries in kirkwood_defconfig. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- Note: board-km_kirkwood.c is also removed, as Valentin Longchamp confirmed the lock-up is not caused by accessing clock gating registers but rather non-existent device registers. This will be addressed by dtsi separation for kirkwood and bobcat SoC variants. Changelog: v3->v4: - remove more boards that don't require board specific setup Cc: David Miller <davem@davemloft.net> Cc: Lennert Buytenhek <redacted> Cc: Jason Cooper <redacted> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org --- arch/arm/configs/kirkwood_defconfig | 16 ---- arch/arm/mach-kirkwood/Kconfig | 117 ------------------------- arch/arm/mach-kirkwood/Makefile | 16 ---- arch/arm/mach-kirkwood/board-dnskw.c | 7 -- arch/arm/mach-kirkwood/board-dockstar.c | 32 ------- arch/arm/mach-kirkwood/board-dreamplug.c | 35 -------- arch/arm/mach-kirkwood/board-dt.c | 62 +------------ arch/arm/mach-kirkwood/board-goflexnet.c | 34 ------- arch/arm/mach-kirkwood/board-guruplug.c | 33 ------- arch/arm/mach-kirkwood/board-ib62x0.c | 29 ------ arch/arm/mach-kirkwood/board-iconnect.c | 10 --- arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 34 ------- arch/arm/mach-kirkwood/board-km_kirkwood.c | 44 ---------- arch/arm/mach-kirkwood/board-lsxl.c | 16 ---- arch/arm/mach-kirkwood/board-mplcec4.c | 14 --- arch/arm/mach-kirkwood/board-ns2.c | 35 -------- arch/arm/mach-kirkwood/board-openblocks_a6.c | 26 ------ arch/arm/mach-kirkwood/board-readynas.c | 6 --Just a stupid note: With Thomas ongoing work to get mvebu-pcie driver in place and enabled for kirkwood, some boards setup files will also lose their pcie init routines, which may allow you to kill those additonal files soon.
Yes, we're very excited about this ;-)
For instance 6bd98481ab34 (arm: kirkwood: NETGEAR ReadyNAS Duo v2 init PCIe via DT) currently sitting in jcooper/mvebu/pcie_kirkwood removes the PCIE init routine in board-readynas.c, and yours remove ge00 init. With both applied, the whole file can go away. AFAICT, this may be the case soon for: arch/arm/mach-kirkwood/board-iconnect.c (36e5722089) arch/arm/mach-kirkwood/board-mplcec4.c (9470fbfb8d) arch/arm/mach-kirkwood/board-nsa310.c (40fa8e5da2) arch/arm/mach-kirkwood/board-readynas.c (6bd98481ab) arch/arm/mach-kirkwood/board-ts219.c (259e234608)
Would you mind putting a patch together (for after v3.10 drops) to do this? If you applied Sebastian's series on top of mvebu/pcie_kirkwood, that should get you almost there. The last half of his series is going in after v3.10... You may want to try merging in mvebu/boards and mvebu/soc. Those have the changes to use dt for the restart and power-off drivers. That'll allow us to empty out a few more board files. mvebu/dt also has a patch from Valentin allowing us to remove the keymile board as well. thx, Jason.