From patchwork Fri Dec 4 10:20:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Mingkai-B21284 X-Patchwork-Id: 7767061 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6C5409F30B for ; Fri, 4 Dec 2015 10:30:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 86E93204E3 for ; Fri, 4 Dec 2015 10:30:33 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 7B289204A0 for ; Fri, 4 Dec 2015 10:30:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a4nav-0002x0-QK; Fri, 04 Dec 2015 10:28:05 +0000 Received: from mail-bl2on0116.outbound.protection.outlook.com ([65.55.169.116] helo=na01-bl2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a4nat-0002vW-CN for linux-arm-kernel@lists.infradead.org; Fri, 04 Dec 2015 10:28:04 +0000 Received: from DM2PR03CA0002.namprd03.prod.outlook.com (10.141.96.12) by DM2PR03MB319.namprd03.prod.outlook.com (10.141.54.18) with Microsoft SMTP Server (TLS) id 15.1.337.19; Fri, 4 Dec 2015 10:27:39 +0000 Received: from BY2FFO11FD036.protection.gbl (2a01:111:f400:7c0c::175) by DM2PR03CA0002.outlook.office365.com (2a01:111:e400:2428::12) with Microsoft SMTP Server (TLS) id 15.1.337.19 via Frontend Transport; Fri, 4 Dec 2015 10:27:39 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD036.mail.protection.outlook.com (10.1.14.221) with Microsoft SMTP Server (TLS) id 15.1.337.8 via Frontend Transport; Fri, 4 Dec 2015 10:27:38 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id tB4ARY5n028650; Fri, 4 Dec 2015 03:27:35 -0700 From: Mingkai Hu To: Subject: [PATCH v2] dts/ls2080a: Update PCIe compatible Date: Fri, 4 Dec 2015 18:20:17 +0800 Message-ID: <1449224417-20753-1-git-send-email-Mingkai.Hu@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD036; 1:NF/h+N4GvrQs/Nfqo5ZGvLz4cdcpFCi0kIX4wLRacOjVtLuk3Kr9C/6lrQOeeGOEbMsaELvfRSQEybk/k7Q0m+KGQzB2W4CxCqwmanHpCRGAVchm8lcvG919L4rB6ZviAIK7UnBpZ/9KC2Fz0n+9d10/41ivHFmTlfIk0GIdr50f0ZpSDthrSWmcubIsJQ/tSMPxl+rqZM9MR6/7K18vyCDoLgY/sT8WmzAIFMjghgSLyFzZTfcWgzo/pkSABaBOLrd5LIveC5F38KH+atCj4U8s55mUGmlnZvJ/5uQ8AQIrt5tpqKel3Ir0oG/TFZudPZvWzJwS6OF3HxxrIRbsywJzgT+4zuF7wkDiI/gGChPyL4g1LgW4pCp8ESzTUu+WsKoIlApJRV/aXDrgKQSB/LNKY1STSmQDPrlVJpvNgfc= X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(199003)(189002)(36756003)(1096002)(77096005)(50226001)(5008740100001)(189998001)(48376002)(586003)(81156007)(107886002)(50466002)(97736004)(1220700001)(92566002)(4001430100002)(104016004)(110136002)(106466001)(6806005)(11100500001)(50986999)(86362001)(5001960100002)(19580405001)(19580395003)(47776003)(87936001)(229853001)(85326001)(5003940100001)(2351001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR03MB319; H:tx30smr01.am.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB319; 2:wy6P+F8Q91AB5HljGPd8tKiujMwUdbszyRURHt8LLZSrmVwECTALEAP1eWXGPFgYEQ1EWGz1N4lljmEgOUW3/rCPePt575Jb0G7pGscJTiX3J4EtyAKe8AnulDgRxhjLsi0XgoHSnfwfMkZa1pX9jA==; 3:Ys7/X+UoE5Qy8OVKLWN2oGXR7wwIv7i5GP0iRuk10gW8s/ASsCxvVeh39WfM1MGEjySU1RxFh67BrAsqHgZdZkfRQmW9/jcxew2EF819Tk0HlBEFzHhdmOopA38qnxl30SKhQRVPYAeJi1H16QYOwvEJLh0o0RMDkiYdT8jXPSQl+EF9Ehs0jHh/10UeUR6erPkZ3+jsMnqrNazzlpvEhlSpi/HTXITnxmrcDTcnbZE=; 25:IZvQWK+KaTnBNJQbHS4ti7Tloi/5MOj/ePk3a9S13VWlUqfVDv+tnHI7sBZrxwJuXc8Ep575bNwq/JkmM30/PCboZNlD0mhBQga6H/wfgw4LV64PJkon4+wyRiNl362/B5pXWqkg2BprzJ6jH9DjdjjcUDbr2Hk5uSJO1rSIIKu7BoelWZV4hOujRUgT9lraTcL0E1qq0VUZPQ+/A0uWp1Ct9Z+ttia0KgmJZ1QE26Ui9sUl5xe7tp05KFu2XA/5PP+ZrxHMVE7ec+TwIiubiA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB319; X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB319; 20:oQhwcsFwEV+rKIjv1lqpEKU/k9OzkpZ24Q3mcqFtWFUN/xhExtFXz1qtAwJPWIyTo6iO5z/PerSKjvLKu+968FmxE8X/h4qOf0CTHIGIHZLamVa1kkVhZFPUPKGsGLP04KThhniieEt28DxMFemQcxHVxXzqcneVetV6AMcvlfd0uKiobnK/R428nEHSc8rMFWNE9mfiCJko0ikDYRGJ0OoZCVokA7xSvB+lGx/4GXjK3Fb2MMcwd4O5c6Tp1jfQTSxVKuwkKx7yQ47BisEOogTy7er+bq3c/touR25wRUOKGC9waWkmAEleaUSfoEnXaQFMcbHqlH3geBNNDzVmkHxjAXT84RJnBdmIqHq1Acs=; 4:5ewqmyYDAs3j2H/1rcngtOFqwUN8tFm9tSH4gHgIQr+wAyP7gIoNvieUYhOZhX6uhorL9eRNh8Or5uzLEashhE9V9IF73h8PW0imihJ/UmuIENu84btbCzuLgq5C9ISqlMGXN8bhNbVyFedCiI5jOm805EM/k/w36vKjUp1lLv3nX4LuTisZe43SmvfLcp3yu3SC88zZYAz7BpBgcN30U1xcCDglWQLt114JsMD6v6C3iSRyzrjs4wh4/f8oDcupMZj3v8UgLUUXXTkd9kIT1DokdAsIeqWvrbpp2CuzLp0JxyTmetRfyqXgC7HbcegCWYSuSuIQ+tvwa7c7WBkXBlTN98fNnvMdjb6uuk79vX9Q6HOJyV3AmJNmtP0Sg7ebu2yOVauS1N4uqTNZVymKCWnT6UWMZfXeg2qiD6AzprHW51bqfNMJ9E753ZW8Ye6a X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001)(10201501046); SRVR:DM2PR03MB319; BCL:0; PCL:0; RULEID:; SRVR:DM2PR03MB319; X-Forefront-PRVS: 07807C55DC X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR03MB319; 23:HqCeW8KwqCCirICpyh+KsWNhblAYu5n5UKqIwCNJgB?= =?us-ascii?Q?fiNbbAbnfkB0PAayusHzGlA9V5Y9qTSlA0durG4pBlkv2Rkjk+OLgqd5uNXi?= =?us-ascii?Q?p2ufKw2wMTaY/sSqSUv28FkuDhuB5b3ntswUjmHQo4OlMN6j2ZAxH0xjE1Ur?= =?us-ascii?Q?irMG0IPxWapmSYLQlTM9qtXvZq7x8/tO5bEWFJ8odC0KmyoA8vhXh3c9HC/N?= =?us-ascii?Q?TM8lqQ6slZd/86CDAdXCXNG/iVMhzuu7XaMgz6LesLvAdZpMIBgnP2MJ5RDn?= =?us-ascii?Q?6Lzh76fN/TAZT9yQq4bfBlO/dgVzfB85R0CSFM+/sn3DArqE0wK0qBFQEGwN?= =?us-ascii?Q?psai23BYhBk6GSN16uQM54N3udu+/9pM/oNUc0wOWzGmwnQ2JQQbGSBDkORk?= =?us-ascii?Q?U8wgtXnVWKwjmp7Cm4g8HJ2SuxrsCsPQ5FotcRfucHfkswQnI0aVztqRnKP2?= =?us-ascii?Q?IslFgWo3NJOpn2StWYukFPqqbuRluiIJb/zGQZ0flRblfZvqeRPpDnO6Jwr0?= =?us-ascii?Q?NW5spdhbR34Ck1tsaZNpENyESxRXZJPxqa3/g2rJqWNC/GwWYvdHrTkyYnK/?= =?us-ascii?Q?FuDOIx9rLjNv0pRhP1bgcXXBKZNudl/7cW+7BQVMzvxtFSHUsPi0QqVApzUl?= =?us-ascii?Q?SKxZzKvp9Q6qhUlMenFH7ltUozaVjJy8huEyuloROCU02F69adIseB2syiL3?= =?us-ascii?Q?q4og2pCj6rIOB6EZH20QNd1E3n+bn56yB0R5z1N2I6z9b00L9RfHnVX+J9mg?= =?us-ascii?Q?K6NY2l2rm8whRPPZd30SL5T3DnyJu+d1EweTMsvfk6JBAa2rxbpDbGVEndvP?= =?us-ascii?Q?UsffWXZz/bax+Hg83B0ejTTel0KhvUXGUG4eeh93Tcyzvzi+h/HFQgBjDGqY?= =?us-ascii?Q?wbOGbO5Qr9RfIex5m/YgvOAh0L+CqDy3B3umwI2JnwUvikAf9bhjAhJNu7Zm?= =?us-ascii?Q?lzR5VIqhZD8DIS4xUL/AbYbFD6NyGsI19RIi9gMJ7FFaYFpCdgAei2sfhU2A?= =?us-ascii?Q?I=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB319; 5:ARWaLcJ6DCoK5eCbQ5JtkRbcKA8lJmcRE4f30c23ZXtqavbpy83Bywch/HOiz3jcziPlj+5CPtiNnDkIccsX0rpsxQ3LolDVMZw90A9mEmJEOh+WoGXU9M5zbOYhEA9as6Ndq9HRuZhpbWQiLY794A==; 24:CQr6q2caLzhMyO/gFKmCV/Mg6PHo7p6hO38Qs6Z+sUwl7T02heFlULvifAQs4MSsylAPBI93nkz+HENet+/ddxCRVjUTM0GuDbU1NC8w9BM= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2015 10:27:38.3625 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR03MB319 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151204_022803_678640_1EEB33AE X-CRM114-Status: GOOD ( 15.56 ) X-Spam-Score: -1.9 (-) 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: devicetree@vger.kernel.org, Mingkai Hu , leoli@freescale.com, linux-arm-kernel@lists.infradead.org, Minghuan Lian Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Minghuan Lian The patch adds LS2085a to PCIe compatible to fix the compatibility issue when using firmware with LS2085a compatible property. Signed-off-by: Minghuan Lian Signed-off-by: Mingkai Hu --- v2 change: - Rebased to latest kernel base Documentation/devicetree/bindings/pci/layerscape-pci.txt | 1 + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt index e376785..4600007 100644 --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt @@ -15,6 +15,7 @@ Required properties: - compatible: should contain the platform identifier such as: "fsl,ls1021a-pcie", "snps,dw-pcie" "fsl,ls2080a-pcie", "snps,dw-pcie" + "fsl,ls2085a-pcie", "snps,dw-pcie" - reg: base addresses and lengths of the PCIe controller - interrupts: A list of interrupt outputs of the controller. Must contain an entry for each entry in the interrupt-names property. diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi index e81cd48..3821bb1 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi @@ -383,7 +383,8 @@ }; pcie@3400000 { - compatible = "fsl,ls2080a-pcie", "snps,dw-pcie"; + compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", + "snps,dw-pcie"; reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */ 0x10 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; @@ -406,7 +407,8 @@ }; pcie@3500000 { - compatible = "fsl,ls2080a-pcie", "snps,dw-pcie"; + compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", + "snps,dw-pcie"; reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */ 0x12 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; @@ -429,7 +431,8 @@ }; pcie@3600000 { - compatible = "fsl,ls2080a-pcie", "snps,dw-pcie"; + compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", + "snps,dw-pcie"; reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */ 0x14 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; @@ -452,7 +455,8 @@ }; pcie@3700000 { - compatible = "fsl,ls2080a-pcie", "snps,dw-pcie"; + compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", + "snps,dw-pcie"; reg = <0x00 0x03700000 0x0 0x00100000 /* controller registers */ 0x16 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config";