50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From: John Holland <john.holland@cellent-fs.de>
|
|
Date: Fri, 19 Feb 2010 22:11:01 +0000 (+0100)
|
|
Subject: [ARM] eSATA SheevaPlug: configure SoC SATA interface
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d7b222d708e6eff0cf47928f439c8bcf49f10bb6
|
|
|
|
[ARM] eSATA SheevaPlug: configure SoC SATA interface
|
|
|
|
Enable the kirkwood SATA SoC interface on the eSATA SheevaPlug.
|
|
|
|
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/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
|
index 629ce84..bb9bc70 100644
|
|
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
|
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
|
@@ -11,6 +11,7 @@
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
+#include <linux/ata_platform.h>
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/mv643xx_eth.h>
|
|
#include <linux/gpio.h>
|
|
@@ -42,6 +43,10 @@ static struct mv643xx_eth_platform_data sheevaplug_ge00_data = {
|
|
.phy_addr = MV643XX_ETH_PHY_ADDR(0),
|
|
};
|
|
|
|
+static struct mv_sata_platform_data sheeva_esata_sata_data = {
|
|
+ .n_ports = 2,
|
|
+};
|
|
+
|
|
static struct mvsdio_platform_data sheevaplug_mvsdio_data = {
|
|
/* unfortunately the CD signal has not been connected */
|
|
};
|
|
@@ -91,6 +96,11 @@ static void __init sheevaplug_init(void)
|
|
kirkwood_ehci_init();
|
|
|
|
kirkwood_ge00_init(&sheevaplug_ge00_data);
|
|
+
|
|
+ /* honor lower power consumption for plugs with out eSATA */
|
|
+ if (machine_is_sheeva_esata())
|
|
+ kirkwood_sata_init(&sheeva_esata_sata_data);
|
|
+
|
|
kirkwood_sdio_init(&sheevaplug_mvsdio_data);
|
|
|
|
platform_device_register(&sheevaplug_leds);
|