From patchwork Tue Oct 25 12:35:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "M.h. Lian" X-Patchwork-Id: 9394459 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 221126077F for ; Tue, 25 Oct 2016 12:36:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 12BD7284CB for ; Tue, 25 Oct 2016 12:36:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0750B2958D; Tue, 25 Oct 2016 12:36:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DB18A284CB for ; Tue, 25 Oct 2016 12:35:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bz0w1-0002jN-HQ; Tue, 25 Oct 2016 12:34:29 +0000 Received: from mail-bl2nam02on0083.outbound.protection.outlook.com ([104.47.38.83] helo=NAM02-BL2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bz0vd-0002ZF-Rg for linux-arm-kernel@lists.infradead.org; Tue, 25 Oct 2016 12:34:07 +0000 Received: from BY2PR03CA073.namprd03.prod.outlook.com (10.141.249.46) by BN3PR03MB2369.namprd03.prod.outlook.com (10.166.74.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.16; Tue, 25 Oct 2016 12:33:43 +0000 Received: from BY2FFO11FD012.protection.gbl (2a01:111:f400:7c0c::110) by BY2PR03CA073.outlook.office365.com (2a01:111:e400:2c5d::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.16 via Frontend Transport; Tue, 25 Oct 2016 12:33:43 +0000 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=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD012.mail.protection.outlook.com (10.1.14.130) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.669.7 via Frontend Transport; Tue, 25 Oct 2016 12:33:42 +0000 Received: from lmh.ap.freescale.net (lmh.ap.freescale.net [10.193.20.63]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u9PCXY8U029187; Tue, 25 Oct 2016 05:33:38 -0700 From: Minghuan Lian To: , , Subject: [PATCH 2/6] arm: dts: ls1021a: update MSI node Date: Tue, 25 Oct 2016 20:35:41 +0800 Message-ID: <1477398945-22774-2-git-send-email-Minghuan.Lian@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1477398945-22774-1-git-send-email-Minghuan.Lian@nxp.com> References: <1477398945-22774-1-git-send-email-Minghuan.Lian@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131218724227250752; (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)(8936002)(68736007)(6666003)(356003)(2906002)(4326007)(50986999)(7846002)(305945005)(8666005)(5003940100001)(189998001)(105606002)(586003)(47776003)(76176999)(19580405001)(36756003)(19580395003)(5001770100001)(48376002)(229853001)(106466001)(11100500001)(626004)(87936001)(7416002)(92566002)(5660300001)(97736004)(85426001)(2950100002)(2201001)(86362001)(81156014)(50466002)(81166006)(104016004)(50226002)(77096005)(8676002)(7059030)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2369; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD012; 1:2idaIuOXegpkSGxzUenr/gruuYoZtvYJxNB5ytlUrSAiHfLtFgXh1DaN9UVshNQPiDOuSGLdWz1moJ3S1OeMI4v8pCLV/hLpVzhGIDbZsLdox8wEarjS8eKeh8hMc9kjrOraerXt9x2BXi5suRNp5KbB+Ncnca3wT4IP5IyD8SX27ZFgDmh9P5rf7FBZb9JEC7QMXrnZhE0KeX0bViOQjEwdksBBtRnshWli0VfnPjqt38mFcbin8B4sKUdCAzasYYDvTQoqzySbO0Sa7HA93BM1MOg/gYKfir7q0N+G7McK/Wu0C8kOTQZQkGAlLwHuYSqB/G7/+m5zQm58GCwM3mnR5d4aqa6wBvCPASQcdCQH6a2DWzZ92Q/+rWOBTtqm9VscGiPrAQ7WDTw8/ye+X+ZpHLAo9SMhtnGyJIrlVgXnqGQvwCoKXXa9Svrb06fiaReOMDVWHyWHSxRYWsBawDC0vuQHv/nfjbGM5nNFiDtCi7X2QFFn1wHh8hL1OzvQaxoarheYecSpd4+VSvaA4gswjZXxWtXuXvweplFnoGRa19zLXUYtjC+I4vu2FD4jJdwRrEOLd+n4qNfk23sEQCwVdQy0FWNfJ/QBn9jZ6x1lPHeN9i6M0eTkTwP3mtOKUnPYz8r4a3WDNt0/gQhhVtGxd/qtONZbs0anIItdjIkCDW7TjedwGIqYE/ThobAvRpv7WConGmLUVibApmxpKu1V4L150ptGM56WhLo68WlstdlrJ7f4mwf9RvwRxUUG MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 301a969e-02ac-416c-fa40-08d3fcd327e8 X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2369; 2:ynQpJe/gDvvJFHua2mQ0mfaqS7giFs26570pavEcP2e2pyQ+Kk87CNDKeMKLaN5awimxpkYHXD9EWcW5pHOMALaEJwMVUolGjFS2dwIqxpTFGN0uIA/C/dr68E7mu6zlnWLh64LmuYFGsT3o6fzhpk5zkwnoeLxkFB6P30P38mFJboC1yoICy9eboefGMsLbp0GkRb2MQLJ9vkWvcPCSEw==; 3:O4//02GYzamhMQvhtAeSNrL5VsNDk3cYem/Niq7GAFupuVhVRBRnFEJaUF37BAyCLeJm1HUVHtiIaaZDKOEIGIgKVGPGGaagBkwYiFb/NTKb3J6An08SyzFZzkUGnXb8+JgQsLOz8/N/hOVWC3/+zZgkoIVYUYaeIib4s71N2nZjmQJHUPaVIcksi/05dEOl/p1xOxPjjrz7ibRXc8N3BeSoxTTr8FVddqOwVjB0oVweidYxTkZTwBeptGV+nmSx; 25:furqjJbFISqAUt3J4L5YmS3SoZ/99aYakYUVNPpBgKluHHJsp494LU+I1LYk6dXnUHGsXa2OBcf9IjJjr3EO1AT6Ftqkib14DiZGRziA5XgfAWBp8X1hVXvOydRVnmgAVfcJl3sj92uvTVxnXeNkuhNIUeKJPgZ/8P2PQTRC+/7tG0ScvjROxPS1vDkVpKUSHZaDi7AT4X/8zT3/KR9ZnF6zg7LZX4s1qziP9yj7Tg39yi8A2yCYD8lb1RGL9aGsHx3cR+vC+KD8egZoS5DEUjGZXhIeU3LFSEm2h28PNXfz0PMkQhX4nehK4pzPz2Hw1NV90b2S1PebMNE7ZeSOnHqMiRQI/Ec7F4zx6iDoAJhkdTXiy5ziifnC8CFWDYmdOg0QkGZ7mr/vcn62Rhy6O5CdvVWat687Hrhcnu71sVdenYWMM3d7Wdd3jRRbMZ9WwBR02nfflYcguzHTA+EE2Q== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB2369; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2369; 31:dIQ/pj5TZz0Vw00elkGqrcBRrk9dE+wgr0/p9nkEgca2dnEyolVZRgJ/1NSXSFFNW7Fk2b1Zf4ixlb7n5v8HrcuNvT3vTjy/8nVyIj6tL0viFPVvNbOcZRrQfbDkSpCzugHh9wBezJE3TcaAiKGHmARbO9VvM+bkTwwLZ2Ta/x1dpgGvAcxu8otjgBFXUSus6//Qe0sY4jSH4hgU4u1DcuYSSUM8M8MybMYruXc1b9M8snlNOBDiAezOmhOCIgQ7ObHsmn9rdzJ5U82NyiYNDvPPeA5yNigTOs5TUqbkSN5e1TyHEzbRDRAU9WQfJwom; 4:1qMtBTe9Bj1s9aMnr+xJlhkjlJ1Zza3UuZt2IVNloBF3qhRUaPCA0OHezJJUaljl/U0P0O+mmVbfkOpyo1AnvjKFXwv/pYLmK/GrtrelKjwvM76OFt7OVOHsuQTF3bTCGOAyui7mrBo23Cp7w9GdHTHCrtY/GPaOu9bfI09vLO2GDwVoOsLJGHEVpMr+yXPAsMuv67xkvFCq4JunjH2zY6YasE8XdHvpmJLJl7ADOMXn24KcIluZeF0jGnhJoyG3QZHm4dmCCXTO7ae2SW48yiTuH+ccoWBuwbbqSDzKZuDilDtwgN5bA4ZFI/Iy1cj8oOPkwvojo2umod+KK2xVDue4mVwlRjVPdoR/tsWOOzX5rZCLM1wciePlCRpYNZawXFfmoW8bZwltkqtufiLGekz7zCmTXtGcaGX16i/UmY1q7v35uDiyspX6ZlMBxQYke7Jgk7MdMA3YxBSlrECwoPqa6ny/3DWr4rw4IvoBg/m5yQ8C47Pz7+5Gyhs2gVbs/o7nf7h0guk+ToWm89+FqcomPfEPAgIP6FXnyOrczrGHN7HU74Zmn/DLX2RjOgZi X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(13023025)(13018025)(13015025)(13024025)(13017025)(3002001)(10201501046)(6055026); SRVR:BN3PR03MB2369; BCL:0; PCL:0; RULEID:(400006); SRVR:BN3PR03MB2369; X-Forefront-PRVS: 01068D0A20 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB2369; 23:hEZ+1+OD3coXSbJWQOw9VDpajBmmt/pC3hTHcupti?= =?us-ascii?Q?VpYI8pgl29Oo0rKwBlVaPeI9E68QG17VJYKWwI6ey5PFia15kKSaRMz7hEjj?= =?us-ascii?Q?0eNGUnTOoS+ACt2+mgeE92JLH6z6bUSPBciG01ArnC/g8zD5GUf3TVWFwmYw?= =?us-ascii?Q?OYgIKFjIgKycBAV8FHB0hInDGwY9xF51ia9uDp1tkUpfbtP5/hmenlK1NaZH?= =?us-ascii?Q?JnZmT61bjxBNIQ4O0+yqt068aRkyMfmKAXgU1r8jeoYIjzRNy//6Zye2ROvV?= =?us-ascii?Q?XZRE+UjlGg21WctLynv3ktN3U6/hbVHClfLk5YJGoqxW/M24Df3yUjX8sJtz?= =?us-ascii?Q?5S1zEckEKjATQVe4uUnPjR6n4HLaoLmCRwBJMaOyKmCgqPNY7P/4PVYRT4zG?= =?us-ascii?Q?EgeF3G8Guf/HtGnSDjFRTd2JvKOcuNqIJMpOVCSLonLai/778ALmMawRt8fk?= =?us-ascii?Q?Qaj+N4ckh2cOtdVXxiAFJDYTlOVIXYNKYsZOpQ+34aWxJW4z4bAHmzrknNUW?= =?us-ascii?Q?/q/O1EccYl5nqHUyW92/Es0WWgY0rY378UllU0qgWqP4aQCGymGk0XRteFOn?= =?us-ascii?Q?oW+COGUc6GN9V+HGdF721Yr7B7kD5qFrC6Nb7kLMIvnPOHTW+S1gvlWe0Nqg?= =?us-ascii?Q?f6V/W5L22dKw6kneC2JxBAMSSJYA4/p5P+j0TUWr7Jkms4M2uPEtiIYQ31fv?= =?us-ascii?Q?5n1VCQ8CcS721RfYw8ZHgv1/fvY7hd2Fy74CxO7lnucozditTjRLchldD6G/?= =?us-ascii?Q?v+vR9LGAU/FzPz/G4WjJUEZGjN5PU+Ejt45STPIWJoCs+hmRY+0eV2emjcU/?= =?us-ascii?Q?/EkMycGF0wj0xZP2vqL7yfxxEl51MFCdOUiR3/bI4ebkmCIxkCkjEtpN0wTO?= =?us-ascii?Q?GJSMmGkPJWOoZCN6I+5IIYEd7PsD/Wqt1kweKagAmQIgNqZ9Sdb4dpAOMUUu?= =?us-ascii?Q?zqu9WYeySayFwYjjXsW0YYWtbBG3tzwwHdcm5bPYQLDqEoqofKqWu8gZlARi?= =?us-ascii?Q?8HUPlbAAF4/euzaTMFvaaGESN9DR4pLSXCgOLmZdbY5yKcjXGHsWC2OmdlKd?= =?us-ascii?Q?KYL7weXQTLVOkQjEiEIuMCq2LExmtPi2udytMReLufpKBBwv5rryuTMF+Uz0?= =?us-ascii?Q?Jv451jWcldo7cJc90AXoyUIS54Pq633hjKZpjlLqkQCqO5rjPjBZvgbP97HH?= =?us-ascii?Q?elUNCYm6UO2r1OFco7rkD4vUDgHyR4NUeU8rhv+68H2tRanqCM1HkYEvg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2369; 6:WxzJHgCcBR490GdEw6LeZ2Znjh5wjKCmemKN9GY2IJsk9YJp4TMijS35kI54NaQGulZKTLHAeFNelwnqDz5uv97ZtNI0q1JiVEWYohSHO1jLtvXI8q8JeFKbMTxtNpd7hVhnXi7RGG3ADgM15u8NIaOO4nN2chOVYHu2MmYxwxy3LzGwfBxUM6eJBPdC/F9s9oZvaYEuI60kDv5mNCcUqNk5h+jg/kh6WLskXLaqL6aEo70namzVcoYpDy9Nh/Mj8RH3FC6QmdDmn2l6zdYyFTUezGEZPUkiX3ZI2Y3BkbMyM8WvfThytCO+JBj6oz1L; 5:Ico/N+dBgoz4qcCh7/k14QggfQg/jK8dwU7qWSB3/Hur0OdxMVjntJmwsr7K+jgbmjFm+rkgeCnHw4g+dcL9/x3i6+BbTpqBsXy4yh9NCHTADIFPwiUl5lo3kru2yXU/kuGiltvNezKsqCzQPn0GPORBZInxPU+c2l4JUbVsvE0/Uc2fwP1fh098wReZgY/a; 24:GCUhKtX0azasCak+nwGAkqinewZ5DJbtmTXVHXt3vRatkYXZMtpM/ZBXD+fiM57z85sV6S0jw5UPJA8mQb5SO+dsITCJO5Yx229Q8J82BwA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2369; 7:3cCrafBZ1XaVVrAjc3dmLWPiUu04x9av+qI1mdUr7M7uLrA3mA1sfUtWxUhBNUKMhaLki/QZ4InCbCHPL1C6u2uOo6seuhMhk+SuLvlslpTEHpJpurdZQ5DEMenm6mrqMcLHoGLXHAtQ4bQvcLXNxZHLk1iORvWWBYgu0RXFiWc3AOwT06LDc5SbPGCQVvfRLi68mrsD5QhRug88KnO5CR7wy1qmfkS1XGYQDQhHZUqZDukfS2K72usXBCjliN67wLezeaAj1gTkjNnGOatibWvsqs+maJ5WrIS8BAfpc97Rma/3gSTbp7iygRSxVZIVJzG9YpKUEB6mFS4NdBBKRAG11Jn0yBXfv47fqrI8keg= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2016 12:33:42.5378 (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: BN3PR03MB2369 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161025_053406_162975_62F73E18 X-CRM114-Status: GOOD ( 13.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Stuart Yoder , Yang-Leo Li , Minghuan Lian , Scott Wood , Shawn Guo , Mingkai Hu Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 1. Change compatible to "fsl,ls-scfg-msi" 2. Move two MSI dts node into the parent node "msi-controller". So a PCIe device can request the MSI from the two MSI controllers. Signed-off-by: Minghuan Lian --- arch/arm/boot/dts/ls1021a.dtsi | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi index 368e219..7a3b510 100644 --- a/arch/arm/boot/dts/ls1021a.dtsi +++ b/arch/arm/boot/dts/ls1021a.dtsi @@ -119,18 +119,22 @@ }; - msi1: msi-controller@1570e00 { - compatible = "fsl,1s1021a-msi"; - reg = <0x0 0x1570e00 0x0 0x8>; + msi: msi-controller { + compatible = "fsl,ls-scfg-msi"; + #address-cells = <2>; + #size-cells = <2>; + ranges; msi-controller; - interrupts = ; - }; - msi2: msi-controller@1570e08 { - compatible = "fsl,1s1021a-msi"; - reg = <0x0 0x1570e08 0x0 0x8>; - msi-controller; - interrupts = ; + msi0@1570e00 { + reg = <0x0 0x1570e00 0x0 0x8>; + interrupts = ; + }; + + msi1@1570e08 { + reg = <0x0 0x1570e08 0x0 0x8>; + interrupts = ; + }; }; ifc: ifc@1530000 { @@ -643,7 +647,7 @@ bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */ 0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */ - msi-parent = <&msi1>; + msi-parent = <&msi>; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; interrupt-map = <0000 0 0 1 &gic GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>, @@ -666,7 +670,7 @@ bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000 /* downstream I/O */ 0x82000000 0x0 0x40000000 0x48 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */ - msi-parent = <&msi2>; + msi-parent = <&msi>; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; interrupt-map = <0000 0 0 1 &gic GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>,