From patchwork Fri Apr 22 06:27:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 8906301 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 AAB619F1D3 for ; Fri, 22 Apr 2016 06:40:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A473820254 for ; Fri, 22 Apr 2016 06:40:04 +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 970A32020F for ; Fri, 22 Apr 2016 06:40:03 +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 1atUjY-0001ir-A7; Fri, 22 Apr 2016 06:38:32 +0000 Received: from mail-bn1on0056.outbound.protection.outlook.com ([157.56.110.56] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1atUj6-00016p-PC for linux-arm-kernel@lists.infradead.org; Fri, 22 Apr 2016 06:38:06 +0000 Received: from BN3PR0301CA0021.namprd03.prod.outlook.com (10.160.180.159) by BY2PR0301MB0710.namprd03.prod.outlook.com (10.160.63.152) with Microsoft SMTP Server (TLS) id 15.1.466.19; Fri, 22 Apr 2016 06:37:42 +0000 Received: from BL2FFO11OLC003.protection.gbl (2a01:111:f400:7c09::188) by BN3PR0301CA0021.outlook.office365.com (2a01:111:e400:4000::31) with Microsoft SMTP Server (TLS) id 15.1.466.19 via Frontend Transport; Fri, 22 Apr 2016 06:37:42 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11OLC003.mail.protection.outlook.com (10.173.161.187) with Microsoft SMTP Server (TLS) id 15.1.472.8 via Frontend Transport; Fri, 22 Apr 2016 06:37:42 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u3M6b1CY016375; Thu, 21 Apr 2016 23:37:35 -0700 From: Yangbo Lu To: , , , , , , , , Subject: [v8, 5/7] powerpc/fsl: move mpc85xx.h to include/linux/fsl Date: Fri, 22 Apr 2016 14:27:42 +0800 Message-ID: <1461306464-19521-6-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1461306464-19521-1-git-send-email-yangbo.lu@nxp.com> References: <1461306464-19521-1-git-send-email-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131057806626125748; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(87936001)(48376002)(5003940100001)(76176999)(50466002)(5001770100001)(4326007)(50226001)(586003)(189998001)(5008740100001)(2201001)(1220700001)(104016004)(1096002)(6806005)(2950100001)(50986999)(36756003)(85426001)(19580405001)(19580395003)(92566002)(11100500001)(77096005)(2906002)(229853001)(81166005)(86362001)(105606002)(33646002)(106466001)(47776003)(7059030)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0710; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC003; 1:e/TESx3Z7eNEVaS9vFXEIwqlUpAkXQ5sS8PTLPqvRpn4ux9lxYXaD5AQHK1NOZr0jsKarUy+jft0HQcSR9zwg4EMiBN7r+6GbdUm9btt/yl9rBgEH0Xzo5IYumsUcJHDfNtaWMMAN9zqSiCUN+aXTe22D2SbCwNZbSVAPisK46xP+jrTqyiQz7PQcUwjfQl3XZh8bmGubv27wrDNQ/TURAS8mqr+s+QNNasfAe2oqgJEuDOqO/sm2xKnAbbTdm5IaSsDTCS1aToUkXjTGXeU1mfOvNXKWsIyTcSWwnOMFtMoIVihJQZg/vqOLsWDjpqLRlecYsDG4/5dW485nkVaC1SWEhPt1xKi8yJt/Wxx0x6ZQt/8NZXDOjPWNNBV4yCnWCVklENu51b3VheSpCMop8dydDSV+uflw3fKELUCyJYiCRlwdAhdKJ5H9LCfl/QTS61svCY/V+AsIO28Pf/e6CSFrFDMJL+wR4EX58eGc93IkWN7u2viB5jE4sn/iA7FMGVpXYvS/1nJxACbLzPGSIDvNajBatrhgC1/6eWBGPxNvxLreu5TGLrwO6L0WazHWG8wVW8+3PJL4LDTQ/98tNF0DVtvljrNRKF+u/OGhpB3J4BlJ/FaLlIfbqdZ812sV/2Gud2vNuxHBt8MJ4bxRQ8doat1DpUTznmNDuJflAEwKtLB/XVKUgi+0UIonwUIN0Jw5UJgkNGy9EK6H1NEJHqBaSpO/RhUY60SFFCusU4= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 78c9629b-37a0-4760-9655-08d36a789b72 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0710; 2:TzzPy0Z/K/256CGCeZN6W/klxA9lGrd1KFoa3VFoQU5FyuOtimzbwFSqpaixQ0r8NZXZ0viU5dJi5/l6Fan3VNc9jjgS2/Erl8jz+LmOCaJ7VMUSPfz1chsFqSfeWaJ0ShqODnzthFAQ+cPNAwCsdyKLK+dBT+N3ENz6/qJceJoH9e5qDjYbH4pgZkH8Kk9j; 3:64j65XX/QQKJW6Njb0ipFqQMvIAKQ5MhfwUOCJN8joIOH1fY7gFSqKXu6+H93jEoEmGHnglPF0+UWbDt7rrVJVzLN20d2jxH1ioHbmxyrT/TpzWk0ogu9IxSpRMEv3A3CcycnmmXcd/JhLqbJ7QWsWENkYCIMlE2wx1rxYp9RNzWoMr2KlgKkdjxNC8S6uusdi/sKfVt3LdzPUcUivkPifjXPJogT8ALoLam3TCGf5Q=; 25:EE/W77yikRP1LusJCxeaWTI71ZuYlmj0rvLIPMQSS7i3NEjVFDNj6GfnY6HtgFE3XX6sCOiIva9Z7tCc1OdZy3APd3+ia2fZClNjixr8FlfrgzymRr86e4rzBBEtBKdVlhj6XzcCh6dDmBeL373W466qUegNAnGsHPecrFrPO7WF/49SQr7Z9hUuLRvT7MxoURABRA3WZeQzNzi9GtavEQI5UJNOjadyGEhaY3YJkD1GEOSWz7IeniZwdCX2VrBgHKgCxsGPVwDkM8L4sHru/9bvekOxWNQjGxm83J6jrWDp8ikgfqLImvUKq8pYP569501MdgCDu4zR5GP6TE20fQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0710; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13017025)(13024025)(8121501046)(13018025)(5005006)(13015025)(13023025)(10201501046)(3002001)(6055026); SRVR:BY2PR0301MB0710; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0710; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0710; 4:ytQngnSoRn+ZF19mrwC+VRaaOwWrZw+nHo0jn9KEjYFj6LFpobdynf9SZqdk+hD3SHc+KV/FBmDgsEYReG52JyGNaxCXl4U0Rdx4enGg0no1X9gKXj2/hkcgijSLUL5JhBKq2O0OyvYH3QgIZQYH/ERZTQlay1bTZ7F9ejJOiC6LHLJeooZFN9v84TdMjalubaBfOqTJpQBPgsFIB4mTwXyiCDu3v4r9mjGRqKKUnBIiav96iSQWvnB5vhwHguakwJAojH8gQ9RqQa20ATiwmX9WBjoNLZQbjJ9Sw9jCplx46ifhRui2F65Djw4kl1zQoUS260P2cwe5m9NuWDwYRfnnXOGMjjy7bBzXFL0s0lXM0H2Gsi8M/A1zEsCHu1PrmopRxCrDt0lIfjl7lynYCXuUQo/wDId87zNXwRHV96oajCrfl2lJ6fHup6teeEVRNlllWLPWm21zdlZecr/GeqO3NmdZii9iyZ7V+MOuX5M= X-Forefront-PRVS: 0920602B08 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0710; 23:pAvWlCImweGvhKVcYNNrCVAwfznq7/LvPFTHvH5?= =?us-ascii?Q?jEZn1IhcGtSZnNlL5Z7n0dUzSVH/FglZhYssGOlhNI5OV9Vy9/gzJjYkM2Zt?= =?us-ascii?Q?W/G2OV2PLTKJSsI+e6cZut+DyL1TjM2Jggd5y0hCH+hbk1ihEsJ+U6J1FfQh?= =?us-ascii?Q?B3zBuDUoTcueIPJK5SJUzD3yGVxU0GbG6TeocIsghbY3hQLCUsiDkqLGv1DV?= =?us-ascii?Q?9eLT4X8h/6rb11G9EFJGFvgeMUlJvo2CKZBvC5nLQZjx1W2jB52o8tGYYTga?= =?us-ascii?Q?/qwsE5IZ3LWso5KK18LQ+27paAtdH3hQVK7Kd75nk5avRQ155dk2YgDOmtrf?= =?us-ascii?Q?ufwGxwXEvpedkndcfy3kQqkIMPn/ZZzk2Zz9059ok45VDf3SmDJ16cL6WB3r?= =?us-ascii?Q?Zet236k+DQVEd44UEycbYUng9T4zLWdcugXRwqnXchJY7WnStGTDlleDlNck?= =?us-ascii?Q?oFvBOXre0uHAW2kypeMHWJcEWjpj5gE1LHz+BXlIsrCF4hgfUgUbK5BzPcGD?= =?us-ascii?Q?1YQl8s85SuAfdQFlRYm2yKGwWMve/p66++OuYEKrjUpcMeeqSMiy048auVZs?= =?us-ascii?Q?7a0cR6Hzmwk0HCPx8qWihxLOaoLcSxZskvj6Eqf58Fi44gkq4tY7l0VjQh48?= =?us-ascii?Q?HljuN2r6oJHTTUGfk9mmA0UF6pd5SGbG7l00ddx99FrM0lud6pFu8/sQS50I?= =?us-ascii?Q?ybCXCQI1AlZE0weB+QZs2SoKBCqdrUzfcAf8I6/7zvJm5lbdHCgRhS/HCOn/?= =?us-ascii?Q?88hNq7sCktypkGnP9a6mBMpIS04inudDcg4N8hQkPr4SWmNdCV+KAmbgGPTH?= =?us-ascii?Q?086DO1KYus4FVJPrKOMsBdTXX554mlD4LqwV8V87cErvyysxkPQdT1C1wVgh?= =?us-ascii?Q?fjs85sGroUiQ/R2kth5nZcEKW1Sz+Wqpm57l9QO0t6JRRw4x1WlEcIVtJnyM?= =?us-ascii?Q?QbEE5zm5CEHxhOcSZUE1jaDixviypPknjBbHT+3oL7jv+UpIGbALX1Xr/3Df?= =?us-ascii?Q?v0/xlvzZcYDHDbPDU2ZaW2NRow8//fGVQgQdPeO5MSCus3pP5hqeDX+yQy3H?= =?us-ascii?Q?b6Ftw7rjJmas6z7CY7+LvzqN3TzRlyDl4OIGF8cHDExJXlMFe6g=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0710; 5:UdF5k75Hxj2xIJTxiyU7uV0BkOl0QxcVLBIl8v+UskVVtm++QAtWlhfHcmUExP7qlvC9xvMAmBvT2eUUXKasw6KkXZf+NaCVfAWSzmiiFBS4r9748gEe2IqM/yNsoXpcmFPHqb5S/re4PnTSpB+hnh5I9eCVFfWMm69cECHn9RQBC+VJlkd2PlprKEaGrTEe3c4srsc4gbMB1Z/Wh71yPw==; 24:161OHCUmnRQHIEHmyEOIMpVipqZjsXqdPTsNjGVoxUCjGRiU8qdS55p3COMfOx9+QLTTw0ZzHBGXsKE6QGWEA4bWnJ2Y6hvP5A1ZJuQHtsQ=; 7:58zAAlunvcZyNUULnbelZdbtuYFzF/k6g+s/1cOQmOdVJuJ9HyRBMkDWGl+RX1tJpzyxlwMQgKqbd+oH5sGViqrsNcw6uF4nQNKfgjO55+e3YVrpHuGvfOxHrLkNcuaUWRsn6sWMj8xxrcafOPpSbsjW5qT1t/w+nis3BO3hLMCb4dpMJEl3eEkw99fXEDS+1Hor/bHKuSDctUi3uEjKlh5zubQEpBJM3bN7RUfoqd4= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2016 06:37:42.3005 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB0710 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160421_233805_155175_62C3F553 X-CRM114-Status: GOOD ( 12.19 ) 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: ulf.hansson@linaro.org, Zhao Qiang , Russell King , Yangbo Lu , Bhupesh Sharma , Joerg Roedel , Santosh Shilimkar , Jochen Friedrich , scott.wood@nxp.com, Rob Herring , Claudiu Manoil , Kumar Gala , leoyang.li@nxp.com, xiaobo.xie@nxp.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.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 Move mpc85xx.h to include/linux/fsl and rename it to svr.h as a common header file. It has been used for mpc85xx and it will be used for ARM-based SoC as well. Signed-off-by: Yangbo Lu Acked-by: Wolfram Sang Acked-by: Stephen Boyd Acked-by: Scott Wood Acked-by: Joerg Roedel --- Changes for v2: - None Changes for v3: - None Changes for v4: - None Changes for v5: - Changed to Move mpc85xx.h to include/linux/fsl/ - Adjusted '#include ' position in file Changes for v6: - None Changes for v7: - Added 'Acked-by: Wolfram Sang' for I2C part - Also applied to arch/powerpc/kernel/cpu_setup_fsl_booke.S Changes for v8: - Added 'Acked-by: Stephen Boyd' for clk part - Added 'Acked-by: Scott Wood' - Added 'Acked-by: Joerg Roedel' for iommu part --- arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +- drivers/clk/clk-qoriq.c | 3 +-- drivers/i2c/busses/i2c-mpc.c | 2 +- drivers/iommu/fsl_pamu.c | 3 +-- drivers/net/ethernet/freescale/gianfar.c | 2 +- arch/powerpc/include/asm/mpc85xx.h => include/linux/fsl/svr.h | 4 ++-- 6 files changed, 7 insertions(+), 9 deletions(-) rename arch/powerpc/include/asm/mpc85xx.h => include/linux/fsl/svr.h (97%) diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S index 462aed9..2b0284e 100644 --- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S +++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S @@ -13,13 +13,13 @@ * */ +#include #include #include #include #include #include #include -#include _GLOBAL(__e500_icache_setup) mfspr r0, SPRN_L1CSR1 diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c index 7bc1c45..fc7f722 100644 --- a/drivers/clk/clk-qoriq.c +++ b/drivers/clk/clk-qoriq.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -1148,8 +1149,6 @@ bad_args: } #ifdef CONFIG_PPC -#include - static const u32 a4510_svrs[] __initconst = { (SVR_P2040 << 8) | 0x10, /* P2040 1.0 */ (SVR_P2040 << 8) | 0x11, /* P2040 1.1 */ diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 48ecffe..600704c 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -27,9 +27,9 @@ #include #include #include +#include #include -#include #include #define DRV_NAME "mpc-i2c" diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c index a34355f..af8fb27 100644 --- a/drivers/iommu/fsl_pamu.c +++ b/drivers/iommu/fsl_pamu.c @@ -21,11 +21,10 @@ #include "fsl_pamu.h" #include +#include #include #include -#include - /* define indexes for each operation mapping scenario */ #define OMI_QMAN 0x00 #define OMI_FMAN 0x01 diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index d2f917a..2224b10 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -86,11 +86,11 @@ #include #include #include +#include #include #ifdef CONFIG_PPC #include -#include #endif #include #include diff --git a/arch/powerpc/include/asm/mpc85xx.h b/include/linux/fsl/svr.h similarity index 97% rename from arch/powerpc/include/asm/mpc85xx.h rename to include/linux/fsl/svr.h index 213f3a8..8d13836 100644 --- a/arch/powerpc/include/asm/mpc85xx.h +++ b/include/linux/fsl/svr.h @@ -9,8 +9,8 @@ * (at your option) any later version. */ -#ifndef __ASM_PPC_MPC85XX_H -#define __ASM_PPC_MPC85XX_H +#ifndef FSL_SVR_H +#define FSL_SVR_H #define SVR_REV(svr) ((svr) & 0xFF) /* SOC design resision */ #define SVR_MAJ(svr) (((svr) >> 4) & 0xF) /* Major revision field*/