From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751952AbcFNItm (ORCPT ); Tue, 14 Jun 2016 04:49:42 -0400 Received: from mail-bn1bon0087.outbound.protection.outlook.com ([157.56.111.87]:51376 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751624AbcFNIti (ORCPT ); Tue, 14 Jun 2016 04:49:38 -0400 X-Greylist: delayed 905 seconds by postgrey-1.27 at vger.kernel.org; Tue, 14 Jun 2016 04:49:38 EDT Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com;nxp.com; dkim=none (message not signed) header.d=none; From: Po Liu To: , , , CC: Bjorn Helgaas , Shawn Guo , "Marc Zyngier" , Rob Herring , Roy Zang , Mingkai Hu , Stuart Yoder , Yang-Leo Li , Arnd Bergmann , Minghuan Lian , Murali Karicheri , Po Liu Subject: [PATCH v3 1/2] nxp/dts: add pcie aer interrupt-name property in the dts Date: Tue, 14 Jun 2016 16:24:04 +0800 Message-ID: <1465892645-32381-1-git-send-email-po.liu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1464242406-20203-1-git-send-email-po.liu@nxp.com> References: <1464242406-20203-1-git-send-email-po.liu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131103668716838464;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(229853001)(11100500001)(36756003)(189998001)(5003940100001)(47776003)(356003)(106466001)(87936001)(2201001)(86362001)(92566002)(68736007)(5008740100001)(77096005)(2950100001)(48376002)(4326007)(586003)(19580395003)(19580405001)(50986999)(81166006)(50226002)(2906002)(8666004)(97736004)(5001770100001)(33646002)(8676002)(105606002)(76176999)(8936002)(81156014)(104016004)(50466002)(6806005)(85426001)(7059030)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR03MB2378;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;CAT:NONE;LANG:en;CAT:NONE; X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD054;1:JaLmSAHrN859Er9fK4/DKKgpHkY+ZV8Hk8v9Pr3Uu9GY4mmZ4UHb6AAtzrxIQuzs2DyjNvr6UWFlHkW6VjmrkQD662pqMuYXtQri9naGB4kxVM/EEIsh33TJ6xwjh10JFDIALIU5XNbBophncVwx6+0LVdHARODCU1I/yYTfZaHO9o5Y9G3744e8QTspbX8OFs9Q4Ghz+QIwxgUV0Y3DyKb3q0d/jGGDyRmqTt0xTFZBjETrz12ReSr7cVYDDR4/swUEDOXts2t2FwAdRjqAsbopjLgXCte2KwgIRZrU+JEuPtAwLJekfH5AL7X9Kys6piUalDnyPxJsixrFiabyFCr9AEkMPz6xrAJ+J0aDdUclSKf3VUxXMU3EgDUIN94Su0VKmAFmqgN397+9S3gwSNdmCWvbN9HUzYVI3rHv+lhxqab6OdSHxug19aL8JSTa8XseYBtj/5jLxbFP0wvtoHer9OCBYX1eCfWIHaUaU/auUOofiMeDtUUVZykouHd7/y8EscVNV8VyHSM4/xVClfa08Py3kjyQMGwLV7GsDs0FHyCq5Kh6kVbBbVCLrYoEz1eYfYUaR/N7aseuXbjXozUIYLIROSWxQcAoW2QNuQEbyVq2rcv+aXMy+scTjSNfF02mdyDoK6yAqPISrrAbxENG36a+cvxYi3YLphDaq5KnUda6PtQyOqr0LKs59zb6btnCPZUfxFw0D1UayFvGhFKAXF2p9y7Yd22qagM3vG8= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: e848bd8f-0f54-491e-bce1-08d3942eb512 X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2378;2:R2PT7vRtmREyO0ZpXIw3jMT9iOUL1ujTkUfarKy+rEXqg60xrPywx3/DJy9nXiqS6Fps1J0iAl//mpGJKNfxHoz/ZQyWdMyAlbn897KSNddoMqV0mEt3wNeaucT1YA05lSLZYualn0eeqvHkQyeaqiaEY6TAma2nGktlFazR9NXru/W7xxCTOj1hC8l9AkxF;3:3JeAOIiGbZffAR+677mhLlcg+OFWSnD87pt/swpUGl3AEcCbP8jXr/RzK6NZy8FCZqECGfUAqrrjRrfwisWIRjPscSpY2eVd1ByNoXx/adcOKSFsET8SfTfpqY3JuelU6dRUoqjUv8zd8wMuo5cZrXQF59wNgmfjY0jf63et1dRxNUPX/0+CxEUQtoP+/8TP+tPOV9yyUQ/ud6h71CtKYBLbqqH3q37UQ7gnnBBoLV4=;25:9TgIY9icYKm/vmGD7frW35+qzdpMUVeWc/XXaLJIukeYIp/IzgUZ8b+D+sTWYl08juU7PcBdaSWp31/Ahm5tVP+BuLPtBjAezA+nlhQ6pX0oUhqMty7oGWrilEc16w1NJVnRxrjs+vay004HIaQv2FvUykx/PWhUtl+y8k6iBCBzGwTRgJsNkXkmDsWVJjUyon7url/XN5FrHUKouasxlqWgN9P/VAWw1S7o0y6IlOpOVXH0Iec0UtuAZXMnpkXavyxn/rotdv7hNlz9D5WvyMx26/TPCRlmWjRyThnOTRR05KOhTJexhiP1tEjXmPIqzBW0Ugq2uxCIWokWpBzWQIF9+oIJVu66d38LhAf498bfeFuy8DuM1p/onKBQonDMjNusby5FArqf0AAI19WGDUJcUgyUXQaetO1cX2Z/BO4= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB2378; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13018025)(13017025)(13023025)(13024025)(13015025)(5005006)(8121501046)(3002001)(10201501046)(6055026);SRVR:CY1PR03MB2378;BCL:0;PCL:0;RULEID:(400006);SRVR:CY1PR03MB2378; X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2378;4:STcv/bRQZL8bsJ83H3oMfsY6OCQkZ3O++cxg0WXlm5PHU4ofx0zSHM+tmpuno29TS/EkwIPTePmycsA9GAlVfB2FfRZFHNKDa5QRHroGwxIhAT5qhdaKRd2peTLhUKLN3tB9P+g/2WNfH3vxdsGEfS6FpVfFUQ4fg6blXc5Y6XJdO2fFIgkrWlyIxsXDsZSZtnow86CaCVD3fkVqpBcCSpSE2zvvnKCu8PAuefRLHT9dl5nyWsQ0YP5J30xsVBOUyzAIpkULpVxMlv+mGk6JIh7z3nrD3ALxJy3EEkJQJNGDl4kvnCrMybaV81sKtRBbRI59+6i6VGA/Wk/qrj0X3nWE5iAY2AWzZbuJdbg5wMd1qZ2fn9Ifzok4BMuh4cai2sW02QZmZXTuqxFdEr7Z5+lGx7rwuGlq6F6/vpDIG4jrHU2ps4jUfyknDEtqAUmsEoQTiIbz7AfdwhQhB3zjD2uPiHfAnrCRnOFQO4VEKbLhFgXi+SqCnvBuJB+i6RoxOZTEbuqIZtP0qMYmS39/VQ== X-Forefront-PRVS: 09730BD177 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR03MB2378;23:P7YCIayapjmUekmSNJHKz0GclbqrQEJ6K3Q105Qu9?= =?us-ascii?Q?lLQw7Nfi6TwhZTiQipoyzKrN/JsRZP10OMScFh6igfr9xRr04XZSNLBsCFTv?= =?us-ascii?Q?pfh30jJxM2ERD77PHJq00aqnP5nx1UBbB8UgqpsNTj3A+z67dCaepie2xhhg?= =?us-ascii?Q?VUHW9N3NMN0T5cgPu+G7zNprGTC75keEqBrXX6psIrIobVf10SlY48KmluyQ?= =?us-ascii?Q?GPptJdg2xEVtnIJcJ1uuglcnsbpPNrutOMid6CbplKysSZ48Dj02PIpQWg7R?= =?us-ascii?Q?nkNvo2qy5rzgwJIDLIv9u58RfZTn9/9SUWvgPbMDZ5fSHj2YHVX2i+HoyiUF?= =?us-ascii?Q?VjHkjVAvTPXzcPML6YW3syO1hAF9fUB08THwtKNfkQaq1wbypZNL6xe2Ns3M?= =?us-ascii?Q?ZETw7K44T0z9KLAiv+M0PS0L5cPLLoyBzG2pswaV2E/qKhEXey99Uz6cKQ9D?= =?us-ascii?Q?bot4mUFnTwA0KrXd+Ms+qAdHRaOgefrgnzijv+qeEWIpaFduR0phJFpBww2H?= =?us-ascii?Q?a/5nweaJTm/Qi1NtDjzqzWSmv1ADWbJrrsYUHxtrTPpDtsB6h8KEM5YhtMDi?= =?us-ascii?Q?7ywZHlmNcV3QysABHocnxjzgc2d3rMmbkZnJJtRXyebKcnYiKbTQYVewZav6?= =?us-ascii?Q?eo7tN9y195ePrGlbuLPOl0KYf84RMV8vLwU2nyHNu1Oaezx4AOjDEYWI31KE?= =?us-ascii?Q?DY3wiI5poXjb5ds4H9S+gg3F90Z+TT8vn9QvsXXWkl3yTBRSfbh+yH6j/VlI?= =?us-ascii?Q?X1Sf88cIQXTXbpt7c0kXeSvF7CHtPTGOvbzPQ9S386B12WfYM/Z45IsyEgtM?= =?us-ascii?Q?RL57SBcx4dmQwt7tPREqJHeFqLZRGE6tkUDE7vyPYJY7rkva7UqLkZj+hXbl?= =?us-ascii?Q?rfsSQQfjDq08NTpokdjP+Slx+2PB+KMPJM7PRz/We2FmcFjLLqqbK4PMIdEv?= =?us-ascii?Q?SXf3SyE54kdQd3zwVxxAZc+GyMDb0zKJkIzbCqviEaYHDMfsqXLgAqwFurYL?= =?us-ascii?Q?C8eTvI4rdQwQvoh6oYHbZPVwmHv1TH0s8tTQcQfsdlCrtnWgYMCaKS1FZ9RT?= =?us-ascii?Q?tOmNTiqUd+9zbxdYDJ5Opnbb6pHNDgZjAPC/JVJPj9mzZ0WObnC+N+p9l0tc?= =?us-ascii?Q?L1sJ4gbu2hvYbBJ1JqcALBh+IrWTtjgH9hOYkFFbxvQEM3Uer8iSzqgfJP+3?= =?us-ascii?Q?ZLXdX5YyGmgno0WkZGuy4SuqxJiasH3uWK6?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2378;6:yNC+keeyfrScLLwPpoQKNER3Peqcp63cb1zxlo6QCsdlH2zjlg54c5bkCEuj4XrhRTg34VOxvN5z4d4e+AMGEdfWy18d41gh30skKkkzTkbAc9LFnmQirs0Gcwr12lrH6RrrMwV9jldfp7L18S9B3oWyR3Kk+0BeQY0KRziRw2haez/Xee8GnlftyHb3qSFcqxwyD/8rzL0faAxHMxT9qGlrGknZZ33Q4relETlyRgEoga7IM+NFWeS4Baso1O4QCsqyqKxp+gr7CL2xbaTWIs3k39T1UxZ5T3XGpveVB6g=;5:hnhgOxl1YrkIVmFL4J2tKXw8JByT4vBbQh/l6XDUDjpfyPmDLMzXcBTIl6ihBLUzq8srO024jrZzflqPDdeC9ukAOHpgPl6fmygWKIBmpCe6lB7RsAwfZU/avrXSK1LZbIUd1Vzpi6AVwNoD8Nk83F82Mp7b4CFjN8Kdrb9qknU=;24:sHDanyKu88iDzntAbderSM3oclBIgvMZKULOSH2y4VKXujT2jyCR/N7y19x8YA3ro/VcUMRYYIlGimc39EZMU00jkYxLS9aame4d5qHFKyo=;7:4C/tSkToWAdBI2yqpGxoFzpsTrQE9RQGQBObXdDgixCE5fY7DwmZk7hiL7Z8zPw9UQMG2+I2jLf+hYmKQWbJcVuFcJadW9POyJjaqZYsPhF3/3quRWGCHyiHSp3qTQJzk+N2bTAC+2T+U9Ncn53646G3IQ1TUnnvcWoMQmS2sz7GZ5dzdi1NFNjgkOU779rFHDXT4N7QBD13cwJh/uuM3I90xDezRK/YVCjmfGrrguI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2016 08:34:31.3562 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2378 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org NXP some platforms aer interrupt was not MSI/MSI-X/INTx but using interrupt line independently. This patch add a "aer" interrupt-names for aer interrupt. Signed-off-by: Po Liu --- changes for v3: - None; .../devicetree/bindings/pci/layerscape-pci.txt | 4 ++-- arch/arm/boot/dts/ls1021a.dtsi | 6 ++++-- arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 18 +++++++++--------- arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 16 ++++++++-------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt index ef683b2..d27973a 100644 --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt @@ -19,7 +19,7 @@ Required properties: - interrupts: A list of interrupt outputs of the controller. Must contain an entry for each entry in the interrupt-names property. - interrupt-names: Must include the following entries: - "intr": The interrupt that is asserted for controller interrupts + "aer" : The interrupt that is asserted for aer interrupts - fsl,pcie-scfg: Must include two entries. The first entry must be a link to the SCFG device node The second entry must be '0' or '1' based on physical PCIe controller index. @@ -33,7 +33,7 @@ Example: 0x40 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; interrupts = ; /* controller interrupt */ - interrupt-names = "intr"; + interrupt-names = "aer"; fsl,pcie-scfg = <&scfg 0>; #address-cells = <3>; #size-cells = <2>; diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi index 5ae8e92..b638697 100644 --- a/arch/arm/boot/dts/ls1021a.dtsi +++ b/arch/arm/boot/dts/ls1021a.dtsi @@ -633,7 +633,8 @@ reg = <0x00 0x03400000 0x0 0x00010000 /* controller registers */ 0x40 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = ; /* controller interrupt */ + interrupts = ; /* aer interrupt */ + interrupt-names = "aer"; fsl,pcie-scfg = <&scfg 0>; #address-cells = <3>; #size-cells = <2>; @@ -656,7 +657,8 @@ reg = <0x00 0x03500000 0x0 0x00010000 /* controller registers */ 0x48 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = ; + interrupts = ; /* aer interrupt */ + interrupt-names = "aer"; fsl,pcie-scfg = <&scfg 1>; #address-cells = <3>; #size-cells = <2>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi index de0323b..4beb760 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi @@ -473,9 +473,9 @@ reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */ 0x40 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 118 0x4>, /* controller interrupt */ - <0 117 0x4>; /* PME interrupt */ - interrupt-names = "intr", "pme"; + interrupts = <0 117 0x4>, /* PME interrupt */ + <0 118 0x4>; /* aer interrupt */ + interrupt-names = "pme", "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; @@ -497,9 +497,9 @@ reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */ 0x48 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 128 0x4>, - <0 127 0x4>; - interrupt-names = "intr", "pme"; + interrupts = <0 127 0x4>, + <0 128 0x4>; + interrupt-names = "pme", "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; @@ -521,9 +521,9 @@ reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */ 0x50 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 162 0x4>, - <0 161 0x4>; - interrupt-names = "intr", "pme"; + interrupts = <0 161 0x4>, + <0 162 0x4>; + interrupt-names = "pme", "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi index 3187c82..6edf24b 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi @@ -559,8 +559,8 @@ reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */ 0x10 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 108 0x4>; /* Level high type */ - interrupt-names = "intr"; + interrupts = <0 108 0x4>; /* aer interrupt */ + interrupt-names = "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; @@ -583,8 +583,8 @@ reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */ 0x12 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 113 0x4>; /* Level high type */ - interrupt-names = "intr"; + interrupts = <0 113 0x4>; /* aer interrupt */ + interrupt-names = "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; @@ -607,8 +607,8 @@ reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */ 0x14 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 118 0x4>; /* Level high type */ - interrupt-names = "intr"; + interrupts = <0 118 0x4>; /* aer interrupt */ + interrupt-names = "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; @@ -631,8 +631,8 @@ reg = <0x00 0x03700000 0x0 0x00100000 /* controller registers */ 0x16 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; - interrupts = <0 123 0x4>; /* Level high type */ - interrupt-names = "intr"; + interrupts = <0 123 0x4>; /* aer interrupt */ + interrupt-names = "aer"; #address-cells = <3>; #size-cells = <2>; device_type = "pci"; -- 2.1.0.27.g96db324