| Message ID | 20130421161400.GD26943@jirafa.cyrius.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Apr 21, 2013 at 05:14:00PM +0100, Martin Michlmayr wrote: > 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@kernel.org> > Signed-off-by: Martin Michlmayr <tbm@cyrius.com> > Tested-by: Marek Vasut <marex@denx.de> > > diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c > index 283abff..e1267d6 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; > } Acked-by: Andrew Lunn <andrew@lunn.ch> Andrew
On Sun, Apr 21, 2013 at 05:14:00PM +0100, Martin Michlmayr wrote: > 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@kernel.org> > Signed-off-by: Martin Michlmayr <tbm@cyrius.com> > Tested-by: Marek Vasut <marex@denx.de> Applied to mvebu-next/fixes. This branch will be rebased onto v3.10-rc1 once it drops. I'll submit a pull request then. fyi: looks like this can be applied to stable all the way back to v2.6.36.x, updated stable tag accordingly. thx, Jason.
On Mon, Apr 29, 2013 at 01:30:22PM -0400, Jason Cooper wrote: > On Sun, Apr 21, 2013 at 05:14:00PM +0100, Martin Michlmayr wrote: > > 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@kernel.org> > > Signed-off-by: Martin Michlmayr <tbm@cyrius.com> > > Tested-by: Marek Vasut <marex@denx.de> > > Applied to mvebu-next/fixes. This branch will be rebased onto v3.10-rc1 > once it drops. I'll submit a pull request then. > > fyi: looks like this can be applied to stable all the way back to > v2.6.36.x, updated stable tag accordingly. Hi Jason Once we have v3.10-rc1 with the DT PCI patches, i will also make an update to them to enable both PCI ports where available. We should also change the kirkwood_defconfig to enable the PCI USB 3.0. driver. I can do that as well. Andrew
On Mon, Apr 29, 2013 at 08:03:38PM +0200, Andrew Lunn wrote: > On Mon, Apr 29, 2013 at 01:30:22PM -0400, Jason Cooper wrote: > > On Sun, Apr 21, 2013 at 05:14:00PM +0100, Martin Michlmayr wrote: > > > 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@kernel.org> > > > Signed-off-by: Martin Michlmayr <tbm@cyrius.com> > > > Tested-by: Marek Vasut <marex@denx.de> > > > > Applied to mvebu-next/fixes. This branch will be rebased onto v3.10-rc1 > > once it drops. I'll submit a pull request then. > > > > fyi: looks like this can be applied to stable all the way back to > > v2.6.36.x, updated stable tag accordingly. > > Hi Jason > > Once we have v3.10-rc1 with the DT PCI patches, i will also make an > update to them to enable both PCI ports where available. > > We should also change the kirkwood_defconfig to enable the PCI USB > 3.0. driver. I can do that as well. Great! That'll wrap up the other half of the first version of this patch. thx, Jason.
On Mon, Apr 29, 2013 at 01:30:22PM -0400, Jason Cooper wrote: > On Sun, Apr 21, 2013 at 05:14:00PM +0100, Martin Michlmayr wrote: > > 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@kernel.org> > > Signed-off-by: Martin Michlmayr <tbm@cyrius.com> > > Tested-by: Marek Vasut <marex@denx.de> > > Applied to mvebu-next/fixes. This branch will be rebased onto v3.10-rc1 > once it drops. I'll submit a pull request then. mvebu-next/fixes is now mvebu/fixes and has been rebased onto mvebu/fixes. This patch is included. thx, Jason.
On Mon, Apr 29, 2013 at 08:03:38PM +0200, Andrew Lunn wrote: > On Mon, Apr 29, 2013 at 01:30:22PM -0400, Jason Cooper wrote: > > On Sun, Apr 21, 2013 at 05:14:00PM +0100, Martin Michlmayr wrote: > > > 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@kernel.org> > > > Signed-off-by: Martin Michlmayr <tbm@cyrius.com> > > > Tested-by: Marek Vasut <marex@denx.de> > > > > Applied to mvebu-next/fixes. This branch will be rebased onto v3.10-rc1 > > once it drops. I'll submit a pull request then. > > > > fyi: looks like this can be applied to stable all the way back to > > v2.6.36.x, updated stable tag accordingly. > > Hi Jason > > Once we have v3.10-rc1 with the DT PCI patches, i will also make an > update to them to enable both PCI ports where available. > > We should also change the kirkwood_defconfig to enable the PCI USB > 3.0. driver. I can do that as well. Do you have these ready to post? No rush, just didn't want to see it fall off the table... thx, Jason.
diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c index 283abff..e1267d6 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; }