73 lines
2.7 KiB
Diff
73 lines
2.7 KiB
Diff
From: John Holland <john.holland@cellent-fs.de>
|
|
Date: Fri, 19 Feb 2010 22:10:58 +0000 (+0100)
|
|
Subject: [ARM] eSATA SheevaPlug basic board support
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d8ecb3490050b33bf46ce77c7f239e0fc51a6835
|
|
|
|
[ARM] eSATA SheevaPlug basic board support
|
|
|
|
Allow basic eSATA SheevaPlug board configuration and build.
|
|
|
|
Signed-off-by: John Holland <john.holland@cellent-fs.de>
|
|
Signed-off-by: Nicolas Pitre <nico@marvell.com>
|
|
--
|
|
---
|
|
|
|
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
|
|
index f6c6196..1b8adda 100644
|
|
--- a/arch/arm/mach-kirkwood/Kconfig
|
|
+++ b/arch/arm/mach-kirkwood/Kconfig
|
|
@@ -32,6 +32,12 @@
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell SheevaPlug Reference Board.
|
|
|
|
+config MACH_ESATA_SHEEVAPLUG
|
|
+ bool "Marvell eSATA SheevaPlug Reference Board"
|
|
+ help
|
|
+ Say 'Y' here if you want your kernel to support the
|
|
+ Marvell eSATA SheevaPlug Reference Board.
|
|
+
|
|
config MACH_TS219
|
|
bool "QNAP TS-119 and TS-219 Turbo NAS"
|
|
help
|
|
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
|
|
index d4d7f53..704b892 100644
|
|
--- a/arch/arm/mach-kirkwood/Makefile
|
|
+++ b/arch/arm/mach-kirkwood/Makefile
|
|
@@ -5,6 +5,7 @@
|
|
obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o
|
|
obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o
|
|
obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o
|
|
+obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
|
|
obj-$(CONFIG_MACH_TS219) += ts219-setup.o
|
|
obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o
|
|
obj-$(CONFIG_MACH_OPENRD_BASE) += openrd_base-setup.o
|
|
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
|
index c7319ee..629ce84 100644
|
|
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
|
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
|
@@ -96,6 +96,7 @@ static void __init sheevaplug_init(void)
|
|
platform_device_register(&sheevaplug_leds);
|
|
}
|
|
|
|
+#ifdef CONFIG_MACH_SHEEVAPLUG
|
|
MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board")
|
|
/* Maintainer: shadi Ammouri <shadi@marvell.com> */
|
|
.phys_io = KIRKWOOD_REGS_PHYS_BASE,
|
|
@@ -106,3 +107,16 @@ MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board")
|
|
.init_irq = kirkwood_init_irq,
|
|
.timer = &kirkwood_timer,
|
|
MACHINE_END
|
|
+#endif
|
|
+
|
|
+#ifdef CONFIG_MACH_ESATA_SHEEVAPLUG
|
|
+MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board")
|
|
+ .phys_io = KIRKWOOD_REGS_PHYS_BASE,
|
|
+ .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc,
|
|
+ .boot_params = 0x00000100,
|
|
+ .init_machine = sheevaplug_init,
|
|
+ .map_io = kirkwood_map_io,
|
|
+ .init_irq = kirkwood_init_irq,
|
|
+ .timer = &kirkwood_timer,
|
|
+MACHINE_END
|
|
+#endif
|