[023/141] Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x

Steven Rostedt
2013-07-03T18:55:18Z

[-- Attachment #1: 0023-Kirkwood-Enable-PCIe-port-1-on-QNAP-TS-11x-TS-21x.patch --]
[-- Type: text/plain, Size: 1193 bytes --]

3.6.11.6 stable review patch.
If anyone has any objections, please let me know.

------------------

From: Martin Michlmayr <tbm@cyrius.com>

[ Upstream commit 99e11334dcb846f9b76fb808196c7f47aa83abb3 ]

Enable KW_PCIE1 on QNAP TS-11x/TS-21x devices as newer revisions
(rev 1.3) have a USB 3.0 chip from Etron on PCIe port 1. Thanks
to Marek Vasut for identifying this issue!

Cc: <stable@vger.kernel.org> # v2.6.36.x
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Tested-by: Marek Vasut <marex@denx.de>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/arm/mach-kirkwood/ts219-setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
index 73e2b6c..3a73fc7 100644
--- a/arch/arm/mach-kirkwood/ts219-setup.c
+++ b/arch/arm/mach-kirkwood/ts219-setup.c
@@ -124,7 +124,7 @@ static void __init qnap_ts219_init(void)
static int __init ts219_pci_init(void)
{
if (machine_is_ts219())
- kirkwood_pcie_init(KW_PCIE0);
+ kirkwood_pcie_init(KW_PCIE1 | KW_PCIE0);

return 0;
}
--
1.7.10.4