<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"><head><meta http-equiv=Content-Type content="text/html; charset=windows-1257"><meta name=Generator content="Microsoft Word 14 (filtered medium)"><style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{mso-style-priority:99;
mso-style-link:"Plain Text Char";
margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
span.PlainTextChar
{mso-style-name:"Plain Text Char";
mso-style-priority:99;
mso-style-link:"Plain Text";
font-family:"Calibri","sans-serif";}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 90.0pt 72.0pt 90.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]--></head><body lang=LV link=blue vlink=purple><div class=WordSection1><p class=MsoPlainText>Initialize PCIE1 on the 6282-based QNAP TS-419P+ since it has a Marvell 9125 SATA chip on each PCI bus.<o:p></o:p></p><p class=MsoPlainText><o:p> </o:p></p><p class=MsoPlainText>Signed-off-by: Zintis Pçtersons <<a href="mailto:zintis.petersons@abcsolutions.lv">zintis.petersons@abcsolutions.lv</a>><o:p></o:p></p><p class=MsoPlainText><o:p> </o:p></p><p class=MsoPlainText>diff --git a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c<o:p></o:p></p><p class=MsoPlainText>index 9a44029..11f23c3 100644<o:p></o:p></p><p class=MsoPlainText>--- a/arch/arm/mach-kirkwood/ts41x-setup.c<o:p></o:p></p><p class=MsoPlainText>+++ b/arch/arm/mach-kirkwood/ts41x-setup.c<o:p></o:p></p><p class=MsoPlainText>@@ -153,6 +153,8 @@ static void __init qnap_ts41x_init(void)<o:p></o:p></p><p class=MsoPlainText> <o:p></o:p></p><p class=MsoPlainText> static int __init ts41x_pci_init(void)<o:p></o:p></p><p class=MsoPlainText> {<o:p></o:p></p><p class=MsoPlainText>+ u32 dev, rev;<o:p></o:p></p><p class=MsoPlainText>+<o:p></o:p></p><p class=MsoPlainText> if (machine_is_ts41x()) {<o:p></o:p></p><p class=MsoPlainText> /*<o:p></o:p></p><p class=MsoPlainText> * Without this explicit reset, the PCIe SATA controller @@ -161,7 +163,11 @@ static int __init ts41x_pci_init(void)<o:p></o:p></p><p class=MsoPlainText> */<o:p></o:p></p><p class=MsoPlainText> orion_pcie_reset((void __iomem *)PCIE_VIRT_BASE);<o:p></o:p></p><p class=MsoPlainText> <o:p></o:p></p><p class=MsoPlainText>- kirkwood_pcie_init(KW_PCIE0);<o:p></o:p></p><p class=MsoPlainText>+ kirkwood_pcie_id(&dev, &rev);<o:p></o:p></p><p class=MsoPlainText>+ if (dev == MV88F6282_DEV_ID)<o:p></o:p></p><p class=MsoPlainText>+ kirkwood_pcie_init(KW_PCIE1 | KW_PCIE0);<o:p></o:p></p><p class=MsoPlainText>+ else<o:p></o:p></p><p class=MsoPlainText>+ kirkwood_pcie_init(KW_PCIE0);<o:p></o:p></p><p class=MsoPlainText> }<o:p></o:p></p><p class=MsoPlainText> <o:p></o:p></p><p class=MsoPlainText> return 0;<o:p></o:p></p><p class=MsoPlainText><o:p> </o:p></p><p class=MsoNormal><o:p> </o:p></p></div></body></html>