From patchwork Thu Oct 29 06:22:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tang yuantian X-Patchwork-Id: 7516521 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 8FC5A9F37F for ; Thu, 29 Oct 2015 06:31:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 69EC120647 for ; Thu, 29 Oct 2015 06:31:13 +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 7A4D620604 for ; Thu, 29 Oct 2015 06:31:12 +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 1ZrgiC-0006s5-BS; Thu, 29 Oct 2015 06:29:24 +0000 Received: from mail-bn1bon0114.outbound.protection.outlook.com ([157.56.111.114] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zrgi8-0006oP-HV for linux-arm-kernel@lists.infradead.org; Thu, 29 Oct 2015 06:29:21 +0000 Received: from DM2PR03CA0002.namprd03.prod.outlook.com (10.141.96.12) by BL2PR03MB564.namprd03.prod.outlook.com (10.141.92.156) with Microsoft SMTP Server (TLS) id 15.1.306.13; Thu, 29 Oct 2015 06:28:58 +0000 Received: from BN1AFFO11FD027.protection.gbl (2a01:111:f400:7c10::199) by DM2PR03CA0002.outlook.office365.com (2a01:111:e400:2428::12) with Microsoft SMTP Server (TLS) id 15.1.312.18 via Frontend Transport; Thu, 29 Oct 2015 06:28:58 +0000 Authentication-Results: spf=fail (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: Fail (protection.outlook.com: domain of freescale.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 BN1AFFO11FD027.mail.protection.outlook.com (10.58.52.87) with Microsoft SMTP Server (TLS) id 15.1.306.13 via Frontend Transport; Thu, 29 Oct 2015 06:28:57 +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 t9T6SrEJ005231; Wed, 28 Oct 2015 23:28:54 -0700 From: Tang Yuantian To: Subject: [PATCH 1/3] ahci: qoriq: Rename LS2085A SoC support code to LS2080A Date: Thu, 29 Oct 2015 14:22:15 +0800 Message-ID: <1446099737-41854-1-git-send-email-Yuantian.Tang@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD027; 1:q3gH7OZFjmANb0agZbihZn70x0aIdGGm+gDqMXJ653xi+qVebjVqRj9FGnTTeI2V47xChBP7zo8Orxcg4En8aTaoacTwH/NAYD7VfhNmXe8bn3wDJpdbqmGM7WYbRwFSIp0Mw2VKHARSxpL2P+Z3Z6gViFYdn/Tw1wC+M+sFKHKujusOFLhG/KtBhu58Dwd43m8EuJMXHR4xRL/Dmwubx8Cl9xLskbV9VNHit3ZR9pVxrAnb8u4usIN/V9axIrD2oW5KyS0g6uKDVrPtlRYByEcLskdSYKlmrhxWg+wH9bGKFspxxGdR0Lcn5NdNvbBcX04nzeicsjRJXrj/R2UUHcZYmDu6+z64ybgHRN9Q/94l4/aTIwXAbBJpQ7hFVQccmGKO/dSVAJoNIIKtA5m0SQ== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(50466002)(5003940100001)(19580395003)(86362001)(85426001)(47776003)(19580405001)(87936001)(4001430100002)(36756003)(50986999)(107886002)(189998001)(110136002)(97736004)(5001960100002)(229853001)(81156007)(48376002)(5007970100001)(2351001)(106466001)(105606002)(77096005)(11100500001)(50226001)(5008740100001)(92566002)(6806005)(104016004); DIR:OUT; SFP:1102; SCL:1; SRVR:BL2PR03MB564; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB564; 2:1atuXFR3boVnCbjOLHLRmiurmXgaqmYHtPFHNhgjgFZCdAd/df9Zl2c3WpDXmDAsoRzPI+cF0a2yXYVLYxYUIa0/IPNmMJwnFJC8HNBs66hAKBCt7rpiGW51Fqio82aUpzPf1IXnWnGdVC4qRM8TZDNf1L8r5bbr/JsePzdH+pA=; 3:swaF68y6aTF7pAOlvAnqYGO6L4ynsEncFflFBg5M4vOfLf4LV/A0tx47UkMs+ObXg2w0UINiFMjify/m2+u7ND/yTmSTQu5FGlmQ421bkmYD5Q3FiToWdUDXCuR4scOgdedi8A1AfUJHSfUe/RPOpQRomGOEAkg63AbMKGE5Pys9qJpI8H9g8tdSlvwTOkpn2BGf15Oj4XEy+4iLyCo8x/tkYsZW4+lSzPJ1pbeXIaE=; 25:0zG0iZQFfbYSUHUwEWtgBBt6hu1CwlcuUJd0miT2Dxwu1bfY4ND/2VbDuIbx3sa45vYEARPL+zkmyqLYo+73mpr+6j+RJypmJdOdEMGjir5aHybi65bVB7GiDKy7RxB8EZWqubpK1zSAhr87XcEbVQLprjQj01Y8aVXr4leGE9VipOip+xtkOfq14bk0FNpM+uWqydzwl7NqW7wjoyXXuge6Bx5w6UQ1qcwlmT4bMxWWGoG95jr5yDmONzlOtPnN X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB564; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB564; 20:jPpa7WSHz5bAAdlZgxVZNEodHHU/BckJj26S+O5RqftTISO4QbGsREQbB0f6/7pDt0FYoEOj/NWi04v+nKhU+SQCZDPK7IiUmvgpdNwZQ8Ia/7I4TgIK0KQmk1gFwcENTkALLyxDpXGYs8wxNMaWLHZJUSXsGKovDPI1wEMQ+RRcHiOVC0TaVv5ELOBbhl8qzZFLw9Avvxu+y5w0L1cWJJcpx09Qnw42aLOvdfw75tGaWKwrsx/t+gmL1x7k3b0zYwcYOL3uuN4mS7a3x9Mey1xlBIcK15xN92oEx34/+hEnHCxl4PJFIntuQ1jOY3Ae192hNVOHAWhf9ScKSDrhbQYz65hWUdR4gkKa+Ek6b80=; 4:9GCdZc7mItyddsR//JWo0ekC6KLabuSznWt0yMJ9ZM0Sj2AFQQtD4JU8P90cijOn3On2P/O4TMBxAlAGU+8yeONRB/0w/tQsSvsoIHPE4/bGoqooY3Pt3EjYoz+VUsYBQOmdWnyMruZvcSO0mUNkTDllzauhbYGXCHatotPIXu73gEPsPv5e64LDe4QYiR6wXEjq/lFSrkK5U+jeK4O7mQIpdABiMbEn8VJv1qwYFEteMikePiE/p+lkCUaXM4/g/2kBWSdgNyoPWWHrMVqsLQu5Qhx3w48CmcrZYEYkzbtJxHqcJZxaSiHW8lLsixPeaFLQoSNdEg2dKQaKmpmAeub5vTcugzHcwDVU3ASjzOv+zcAXKGXcZSR1dZ09w0LEIMogVkWUofPUHKFliqWe9g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(3002001)(10201501046)(102215026); SRVR:BL2PR03MB564; BCL:0; PCL:0; RULEID:; SRVR:BL2PR03MB564; X-Forefront-PRVS: 0744CFB5E8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2PR03MB564; 23:yVMgSwc6yRxFZ3SFt6Tjnxs8wSK1Gb6rYtnYo/39ZB?= =?us-ascii?Q?sNuoYdT2aJdiKrQhCBSgHH0mypj6XE9wyxRn4Y2u3WPsvkdyPJIgJFK2SOeM?= =?us-ascii?Q?cShMEyn5cn/xoC+2IeeX3W/E+wdagIlP1GlZzkxmVbJRVt9a+0Zb8FwvbcBB?= =?us-ascii?Q?Q96SSphLRJI5Xu4XXUybquW3eFoB+ViY8vOOnlUXt4v/BlFHiwTAYNkxEQWz?= =?us-ascii?Q?C/0PUHM8FwDRiKfUbMwJF0XhDjLG+SiApxgutN+JahTSnJLrbEhyQUNxWyfT?= =?us-ascii?Q?MC67P0IBCsvwLstKRc1VYQTbJ7mU2XHwT4f0SshAwtuQrd7a2kkqhxjEjgeU?= =?us-ascii?Q?J1SyZJXe+7hRhmSz4jrFJVf8dY2KZWUs5ARG0mfSbbTklTpbWp8OrQS6OsVw?= =?us-ascii?Q?zhly7fl9t1pw6EPID+vO0Ec8G3wAR36A10UyW4E00Vef4pWtF241FJqpwGi4?= =?us-ascii?Q?Dy92ye8sqUbtNakrAZOI/cjlp9UeOksY5oBGrxuDVI0IqvcmIhf0JlgCySVO?= =?us-ascii?Q?V42lzSqiapwgpBWpHGTPh1xiGxDKveKY/BCY8h8j3YrkDDJwudeLnH/BPl9u?= =?us-ascii?Q?cC7v3JkWvZU58IUUZUwS87a2j8Rm53/ieqBlAqGkzduahf+WGX26ZB4R5bE4?= =?us-ascii?Q?/02EolIst6/gYNkcz6KznSebg/cf9bGJURnpyqXEsmRdichJQHLTlRW56tYR?= =?us-ascii?Q?Qgbjq43+OcG3ZzR45tkW0mwB7nfwL0hUFmw8pJbk9B6jkBS/kl2Dc1LH/RuR?= =?us-ascii?Q?nV9CgJPVnk+1HNExR/aIPf5n6mt/M7BZ/aOPvsy2hvVKBmZKCuYkzSk6Q8ns?= =?us-ascii?Q?V4UOVdBGXehE2Nk6qrOFQE+TWhWZTJkqIhYFv+RoAE0mw65AMP0m715OB7DL?= =?us-ascii?Q?0w7eqkrIRQwjg8VhqXyN53T4ciRhOsw1uOrnTtrzmckGPwT9j+M/cnfdYuC3?= =?us-ascii?Q?IOPzCWZksORix8VASo921pWfJBcNEq0MvKn5C7pYVAmxXt2CbApqoRHEqT8S?= =?us-ascii?Q?wigdbqIleA0vH3HBxmAXIG?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB564; 5:+h6HxPWQ0+h+NazkOE25t4W1cgkBAw2f9AMje901+F3yeIEtx74r/i/9eZChUIfwwZ+x+URaty8DZIA435Kk2l8DkJYP6iAEMRS8MtFH8pSwbn/0BCAsW6ayIoHa1xsjaDGqTA0kePJrdXBpyHt05w==; 24:v94CyTnBAilfet2+330YRHKjMeILAuV47vNuXq/SVDpSXk/QPg0ofsyFVQvtNsOSd0BRWio32zvpuG5ri0J8hp4LfrfSmCTPLMI+Bxg1E5k=; 20:iFXoQTbs0srGBMhnUu9iBZbmYxHJ/WDKP7srcVGzvsGEwea8Cvi1j1ofub3ar8ajwcGS0Ee2oagGMBt6elY7/A== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2015 06:28:57.6966 (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: BL2PR03MB564 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151028_232920_748931_B2708381 X-CRM114-Status: GOOD ( 20.42 ) 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, hdegoede@redhat.com, Tang Yuantian , linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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, 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 Freescale is renaming the LS2085A SoC to LS2080A. This patch addresses the same. Signed-off-by: Tang Yuantian --- Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt | 2 +- drivers/ata/ahci_qoriq.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt b/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt index b614e3b..3aafe27 100644 --- a/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt +++ b/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt @@ -3,7 +3,7 @@ Binding for Freescale QorIQ AHCI SATA Controller Required properties: - reg: Physical base address and size of the controller's register area. - compatible: Compatibility string. Must be 'fsl,-ahci', where - chip could be ls1021a, ls2085a, ls1043a etc. + chip could be ls1021a, ls2080a, ls1043a etc. - clocks: Input clock specifier. Refer to common clock bindings. - interrupts: Interrupt specifier. Refer to interrupt binding. diff --git a/drivers/ata/ahci_qoriq.c b/drivers/ata/ahci_qoriq.c index 58c1a94..b9b691e 100644 --- a/drivers/ata/ahci_qoriq.c +++ b/drivers/ata/ahci_qoriq.c @@ -45,7 +45,7 @@ enum ahci_qoriq_type { AHCI_LS1021A, AHCI_LS1043A, - AHCI_LS2085A, + AHCI_LS2080A, }; struct ahci_qoriq_priv { @@ -57,7 +57,7 @@ struct ahci_qoriq_priv { static const struct of_device_id ahci_qoriq_of_match[] = { { .compatible = "fsl,ls1021a-ahci", .data = (void *)AHCI_LS1021A}, { .compatible = "fsl,ls1043a-ahci", .data = (void *)AHCI_LS1043A}, - { .compatible = "fsl,ls2085a-ahci", .data = (void *)AHCI_LS2085A}, + { .compatible = "fsl,ls2080a-ahci", .data = (void *)AHCI_LS2080A}, {}, }; MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match); @@ -159,7 +159,7 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv) break; case AHCI_LS1043A: - case AHCI_LS2085A: + case AHCI_LS2080A: writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1); break; }