kirkwood: combine support for openrd base/client support
Subsystems (2)
PATCH v4 1/1 kirkwood: combine support for openrd base/client support
Inspired by the mach-ep93xx flattening work, there is really not much difference between the OpenRD base and client board support so they should be merged together.
v0 - initial release
v1 - added I2C/PCIe support
v2 - removed un-necessary ifdef's as recommended by Nico v3 - fixup GbE1 to work (PHY address incorrect, hex 18 *not* dec 18) v4 - pci_init only to be called if openrd base/client as suggested
by Simon Kagstrom
--- arch/arm/mach-kirkwood/Kconfig | 11 +++ arch/arm/mach-kirkwood/Makefile | 2 +- arch/arm/mach-kirkwood/openrd-setup.c | 118 ++++++++++++++++++++++++++++ arch/arm/mach-kirkwood/openrd_base-setup.c | 96 ---------------------- 4 files changed, 130 insertions(+), 97 deletions(-) create mode 100644 arch/arm/mach-kirkwood/openrd-setup.c delete mode 100644 arch/arm/mach-kirkwood/openrd_base-setup.c
arch/arm/mach-kirkwood/Kconfig +11 -0
@@ -46,12 +46,23 @@ config MACH_TS41X QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS devices. +config MACH_OPENRD + bool + config MACH_OPENRD_BASE bool "Marvell OpenRD Base Board" + select MACH_OPENRD help Say 'Y' here if you want your kernel to support the Marvell OpenRD Base Board. +config MACH_OPENRD_CLIENT + bool "Marvell OpenRD Client Board" + select MACH_OPENRD + help + Say 'Y' here if you want your kernel to support the + Marvell OpenRD Client Board. + config MACH_NETSPACE_V2 bool "LaCie Network Space v2 NAS Board" help
arch/arm/mach-kirkwood/Makefile +1 -1
@@ -7,7 +7,7 @@ obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o -obj-$(CONFIG_MACH_OPENRD_BASE) += openrd_base-setup.o +obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o
arch/arm/mach-kirkwood/openrd-setup.c new file +118 -0
118 lines not on this page · raw message
arch/arm/mach-kirkwood/openrd_base-setup.c deleted +0 -96
96 lines not on this page · raw message
PATCH v4 1/1 kirkwood: combine support for openrd base/client support
Quoted 3 lines · On Mon, 18 Jan 2010 23:38:19 +0000 Alexander Clouter <[email protected]> wrote:
Inspired by the mach-ep93xx flattening work, there is really not much difference between the OpenRD base and client board support so they should be merged together.
Yes, this is a good idea and looks well done, so: