summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood/ts41x-setup.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-11-07 16:10:56 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-11-07 16:10:56 +0000
commit725278e0ecdabbbced6f1b05a23473ec9e4cafee (patch)
tree6f0843aa39f5a2df292613b9ed0b537be5047301 /arch/arm/mach-kirkwood/ts41x-setup.c
parentc947f69fff183e5d2a06160d9262b5dab7359e95 (diff)
parent7350f419724fd9472d3b5cc521538713f9797b62 (diff)
downloadop-kernel-dev-725278e0ecdabbbced6f1b05a23473ec9e4cafee.zip
op-kernel-dev-725278e0ecdabbbced6f1b05a23473ec9e4cafee.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
Diffstat (limited to 'arch/arm/mach-kirkwood/ts41x-setup.c')
-rw-r--r--arch/arm/mach-kirkwood/ts41x-setup.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c
index 8be09a0..3587a28 100644
--- a/arch/arm/mach-kirkwood/ts41x-setup.c
+++ b/arch/arm/mach-kirkwood/ts41x-setup.c
@@ -27,6 +27,10 @@
#include "mpp.h"
#include "tsx1x-common.h"
+/* for the PCIe reset workaround */
+#include <plat/pcie.h>
+
+
#define QNAP_TS41X_JUMPER_JP1 45
static struct i2c_board_info __initdata qnap_ts41x_i2c_rtc = {
@@ -140,8 +144,16 @@ static void __init qnap_ts41x_init(void)
static int __init ts41x_pci_init(void)
{
- if (machine_is_ts41x())
+ if (machine_is_ts41x()) {
+ /*
+ * Without this explicit reset, the PCIe SATA controller
+ * (Marvell 88sx7042/sata_mv) is known to stop working
+ * after a few minutes.
+ */
+ orion_pcie_reset((void __iomem *)PCIE_VIRT_BASE);
+
kirkwood_pcie_init(KW_PCIE0);
+ }
return 0;
}
OpenPOWER on IntegriCloud