From patchwork Wed Sep 21 06:57:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 672621 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sfB3q0dmrz9ssP for ; Wed, 21 Sep 2016 17:25:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755515AbcIUHZP (ORCPT ); Wed, 21 Sep 2016 03:25:15 -0400 Received: from mail-sn1nam02on0062.outbound.protection.outlook.com ([104.47.36.62]:4352 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755302AbcIUHZH (ORCPT ); Wed, 21 Sep 2016 03:25:07 -0400 Received: from BY2PR03CA078.namprd03.prod.outlook.com (10.141.249.51) by BY2PR0301MB0712.namprd03.prod.outlook.com (10.160.63.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.629.8; Wed, 21 Sep 2016 07:09:58 +0000 Received: from BL2FFO11FD019.protection.gbl (2a01:111:f400:7c09::126) by BY2PR03CA078.outlook.office365.com (2a01:111:e400:2c5d::51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.629.8 via Frontend Transport; Wed, 21 Sep 2016 07:09:58 +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 BL2FFO11FD019.mail.protection.outlook.com (10.173.161.37) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.629.5 via Frontend Transport; Wed, 21 Sep 2016 07:09:58 +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 u8L79HVn027711; Wed, 21 Sep 2016 00:09:50 -0700 From: Yangbo Lu To: , , Scott Wood , Arnd Bergmann CC: , , , , , , , , Mark Rutland , Rob Herring , Russell King , Jochen Friedrich , Joerg Roedel , Claudiu Manoil , "Bhupesh Sharma" , Qiang Zhao , "Kumar Gala" , Santosh Shilimkar , Leo Li , Xiaobo Xie , Minghuan Lian , Yangbo Lu Subject: [v12, 4/8] powerpc/fsl: move mpc85xx.h to include/linux/fsl Date: Wed, 21 Sep 2016 14:57:16 +0800 Message-ID: <1474441040-11946-5-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1474441040-11946-1-git-send-email-yangbo.lu@nxp.com> References: <1474441040-11946-1-git-send-email-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131189153982994608; (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)(1110001)(1109001)(339900001)(199003)(189002)(305945005)(356003)(8666005)(92566002)(2906002)(4326007)(86362001)(189998001)(586003)(104016004)(76176999)(7416002)(50466002)(626004)(50986999)(33646002)(7846002)(87936001)(68736007)(36756003)(5001770100001)(85426001)(77096005)(48376002)(229853001)(106466001)(2950100001)(5660300001)(97736004)(11100500001)(50226002)(5003940100001)(8936002)(105606002)(19580395003)(19580405001)(81166006)(47776003)(81156014)(8676002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0712; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD019; 1:y1xoGlWMg+quC38HuDSgDB18XRriTN/1nBW1yZdLTxTorALSSBTkliAk1snKv3Lrsvd9JEWelZVvfAYVX9VV/g7pfrALmqC24wHiwibakPckvh1O67XIBiskChVO1GUUTmN2UKsaIH3d7gypAsstba1S4eQebS+QjOWWNVamauig3pCiI0d6x0NCK8QuoR4mV1hF4h6qDWCxcKQwe7ampr7AS9NFLEdkCTLjM0VeV8BlHPFEk+C5mlyGUYXqS5ceIddQg+yntYmZB4/zyJtBucSdyVioOG9nfhaEfI6xD+o20gsuWLJRCvaYdfUsGCfe2QlZK2BtUBGpEestfsf1lziUX6H8Qakpj4DsA2jdIQfgPEBuq+ZIWxV3kaIyUSdAkFcbcaSmZtczSF8ufwbX1x0MAg+bWL+6iX8EGCsp21SLbrj1qcxV1Xq+NMPLwuYaXa4DjzT2HBNWzj4ktZUP4Vi4Kxvso3DNdZ/zwjg/19kdSwzuK381HSLIThG+DnxYGy/RPqMtoF8FEMOJeF0INTEYjiR18cMGlBiBQL/fDJdU26JOGP3h8G2vkjFCllcsNFFGXhFzsOgTJNpKoDqxpLAdukXl8od1jfevedpyVDA0Oz411NiSKqjVJ++t1ur/QhHUv27H2OJMT56+rN8/a1XboZ+hQeQotnMc6feDpbiz1hU22vdqgNIIPbPxCBBRInLPwiPt6/t2JS3uya6tsC/TmK7vgI6EOg9AHJlYlpByK0R4eA66HA/FK8dqltoH MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 11c26df7-fd94-4994-f74f-08d3e1ee4bfe X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0712; 2:F9BZZ2RPTFO7/aJpD6R5sGluL+cRJt3lg5MG77WyJvvEZDeLLlwqn/UR8M6x4iezLCJCuWdPFpUzLsRlyk7s6kSjv8rmxZ9NbY95yn5oTBHx3n/9oiUJRLsHWhy4gkPzgMjhGna9Y1qk+mNStmA6LyVTP4VdP9SOGIf8rx1512WpLoCOvLKvm2qRPnb1CO7p; 3:T4ZX/CIDc8tcbbSckhf3N6rNr607Koff5UH72EJrSFUcJGmSOON2XIkR8HE/V95xRT4u5cVvvPq7CPYntIgauDmfvIDuj2dZTye/dt8OFt/b19dFgiv6Qcq7NhRUOs3DJaUCHXQWBBtqq5GZmjqqUaqUdgDsDqkCHYae+7OJ7Ge7BJCTz45f51jGyPmJreQKFHJlemoEZdPLWmCiW6kMs7WKsUh8qrCgy7X4VA6zliI= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0712; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0712; 25:IS5dk0Ncc/MyEnTnzsE2W3YVcRhDXNcsJIEcA61AxGc4wPc/M866149vDHqE7YjOVjI/dxzcfpBC6lNWtCAdtRndC7qMBSvMpXqPQ69IkE6g5ab78n4tC282r3i11zU+PoaYeZUBKBWNsrmphtW4WaA34I6OU9R6XF+2FqSyCWHFh9s1e+oYc09eEoRJ9bRgTHitKVxrvXWkTEyy3liBx/iPjY35YNI19/b9IFrJtEzdSL82dhPkk1XXJEHqsgF0PJMTaiZT+r3VZJ2+MUw5RzGALs8EyaB1th88WXz0kqgAo0mH5Sv46N8lxgUDUsStnZr1PFBz2VSWjqecv7tLm8ngG7gQV559hIi5Kples5xPU7XD/11Ouc7gDf6/1iTItE9Ndgd9GP/tj4WiI8LzFnUQi1Mn87xRjnGMkNSqTMvNrEz5KPwhYe24wJdeXnF9twIwidZPK+xa0aG/FjxMDHTIit0FwkQDXeeQN6Qfcm+rVTINxuUnTRui5l9lYQY9zjLaVcMhtY5BKpOxmSDa4q8lFVpxljsXNpEVGfypG84G81Vx2yeC0pw2GevXIDfzEHvJukxQId41fS8jELKyjUeEKm5D6DQdaBamr4CROY6P7mBzdOmwaWndEh1wEP1eZIVp6wcO9XndK4X99LsIqus6bXmqjhDHjjKNfWcQJrDY/1kn0IK6BmkASr0vn6nOmFZG0s7f7ORWCAjUazOEMmAiRtkrfyRU/Xh/2Ew17sQ= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0712; 31:5eOmWIrFDdhLK2bbXiGeEYOtocIR3ac7NSpL+Pp08PXiWTYPcOW5ALPv2LK4D15pAkxT6vM/6O5lVnpTqcK0h8FciYhmPR5irnjdQ8f3x1sw98gaCY1LplGWxZeIh+P10IbuH2TMj2YbNsHxhuzxwqJ+dKjRfelMFR47AFJp2pwWTfR6AqTLyIilHo/NU/glDaUXQy7C4wMDvlpfVI2mAfR48q2mh4ngGrPm+r6odP8=; 4:cmPqJwDxk7VKoYQpfWVuyssjggOwX8Y3A7M6gGuxfHFxcb1Tymih5VSOTVi5ykAQyEq8GiLDc+VJKjruc6rs7Q4OZcH3XpLQ/Fo0oohhhWJibLoZQiqOPl6xHe0KhQqtHbqd6XRTvjo4P+hg9o4dmuTDnpYKWeFnytSFJsx/kbVSLROGbJxjxFOZcfYUNj7CDfKnnMpiGlrLFtR3kBXyfXEf1KALEDrylqiJDW1e5gCEIHE/1/2QCwMJqHNNjHm9w+wPL3uw9ZPqs3/qX/TPRYrLw8BzLut1vTLYIJOCT0MYw3A6ORy6T7rxlUBhFSyU/Q71mE2qC3KoDJEBzY6yvSIjYhuFbZbo/qEdNo1jPHKjoDZRy90Iu2aKkx+kfd9n7zGKk2aziP3b0WanLec/D1w2fAGuq0pAgiJGiWv37b/fUCDYYrO/6GJsRy8mP77i4ERRNNGvjkmiyS6KOHQFzRDlMmESbiMwrMSZhDQL1aru/8dmzO2Xre0H2ndKwPzS2QR8rJeJBbnI5jXW2M6FkG0Qr6Ei5aoH6WAOQWG3000= 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)(13018025)(13017025)(13015025)(13023025)(13024025)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:BY2PR0301MB0712; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0712; X-Forefront-PRVS: 007271867D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0712; 23:9MS6ti4lCFsfM3yevn5/iZy5bFMzHpkpdRDk0FP?= =?us-ascii?Q?fCYOu+0cA38T1Iz9B+dVzqFhlc67jjZkrCypHLk6OvbArAkHkcIB2FfYK7Ae?= =?us-ascii?Q?FHlttj72EulFSx8PAU/A/al1IzHZmFG0Pw0gnt6AuSylBHF4AI5euTrmoANS?= =?us-ascii?Q?D4qAkxKz9Cyy6gzpgcjwvY9ARDdUKApbkiG3fe99Z+k5CCX7hgzt042R1woP?= =?us-ascii?Q?dNZlI2Ams2QT6UPGokdLv+H7AICcLSjXO5SB0kvN4MCk172N8mCqhbYSPc3f?= =?us-ascii?Q?I47fpBaQma6jBnrzgIbbnIIR5Tx/pHWU5YMtmYIDDVa47ZpeQikzlGlDl/m2?= =?us-ascii?Q?rMYpwpp9fvRbz6cmUA2MYnWUfB+oPgdWdvb9/ykJw3FjxnLEffoF+Ewhw3pA?= =?us-ascii?Q?UbPoAwBXwOjo6uxq+9ZnNTuoiaE6qyVEL7f/nfMdT+mEdp6wG1i5j20ccqwT?= =?us-ascii?Q?O82VW2BrLFebxaa4bbZR49Vfr8accn8itgkOWT7UWnkrvJ5YAkGmaLcTsjjx?= =?us-ascii?Q?wmhEMjDXWMsPt3+RGg+RjLA13FIfnKWElm1S5LZge8LVP5tH1jFNWo2vurOg?= =?us-ascii?Q?vmFejYS1IAUj++M7jFzsekZHxIaEUt+0eJ0jbw6PQnfS4DO3iLlJVgUYGedz?= =?us-ascii?Q?xmIOAP/VfLDXyD69Nz1VdbfU8yJL2RjmZL1c3KdzmJEkZOkfdQ928P1AoSrl?= =?us-ascii?Q?k8wSX2kR03MyAAEI2RSZu6Kg76XejWCfVNLLaDzr3j9q78y0CEwBJba1hgJg?= =?us-ascii?Q?jAxxW9weCdVCdstj+EVtFpWIi1W8l17u8WgHXlx6DLZh5JFvzBy6aomsFWSH?= =?us-ascii?Q?TlpeMfyOHaH+4nvVamh/SHmenjcfKHi4+O7Y8ejecOeOTaXW04st3uTU/KYI?= =?us-ascii?Q?Hw56hqw5z+ag5vJJDOL5PP3r1T8tKj6/HYFFT7Hm4n/RFRzdTSxJ0ZvFc3iK?= =?us-ascii?Q?DTF2Rub/X/GTrD+3+eboYBuQTEZnq1TDZJVyX0wlswRRpbPMK/ouMW2y60ab?= =?us-ascii?Q?YnmcOMncb22qQaxX5U5RS6LQE0/naGOHy3sUP4e1o7I096ZBL6mKNy90KMrp?= =?us-ascii?Q?UVdepAG5QI4GVu4TcKb7ApLAp/OoI+G7kJyRsIrN1BpE9PSPcGOv9ZjnfzxX?= =?us-ascii?Q?oHYW1DgpYbVtfnjCp/sN4GWTfLJSJ6juaT+unEfIUEvXV0/JwaY5HQIQOeGY?= =?us-ascii?Q?snOyzz28Yk4abfCc=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0712; 6:+7UUNZEcU4sDFShaFhltAw7RlbuyPL4k+YR8RUoujjGIiv1pJ2Uc0LZyMP+RlvrI7ZUShQaeA1aIFHf7zYvj/hub1LF3a1Nb+jUsRqbicoswk6thKQ1SFJPiFu4FS6UrE+cx1UBGyzuAMzniMNHyKkiSoBGzNQen5NjRoMI+PfopCxjuxlAUjNiMK5M5cx7hFnK3rxiTeo7TTbylMU+1WkrvKgO4J/pPBjr6TA46NgWGzCIFw9RrZdoDyWP1bCBAOY8rkqEH7fPZ74NxBZPeCcjWy+XjvfAmXW2aopKFw0Q=; 5:fynyU+762vdsntIn5/G3oogx3n2z4un/CqXiLdwCFZz/6or8dGAJAHoZfrvhsMCw9H5/tfwwHe8LMqwJ6ZKNJzNO1W/d6eF+V/nKedFh1TqPPu+KixfJQw2qDofnWfPwWhyJQCAbfDGMc4fEWEJAqz9rlfLOdJd05AskuFwy+XY=; 24:q1tj1ve9Qky+bWyZdl61HmauX014JOflk8J/6R4akQhExCztwic5piXA6Z0uLGgw1VsLhy7LfEuWIn+yN0d8zy5M8jIU4HQM/ewBF4kxXSo=; 7:vkzcA9rE2lnmGxkIGC81xNC6E24CdzmU8qE6VJhgvx0PPMpqufJNwx3NJax9X0Yrsy3yAQRlyE4RdtC+G/iVBdk/SDD6+F+Ue51paEE1xMgorK/OKem+r7FDsXeLRuWbWdkXE+y+J285IzPZfogXEWx59sgt8dm2ESCb4W40TKKvQ/XcsBSPNSHwvA49viiwAp1mez7OJlZXINUXTe5yVSYoSzQixs8n2d5npLh31JTae/iBRBgTXd7lkUGI0gtt7kC0CvzoKpd/HKTL4IZVFIqUt1rjkfggfT51Ai8LcmLcC0FCCzc32LLjQZPF8h2p SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2016 07:09:58.0654 (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: BY2PR0301MB0712 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move mpc85xx.h to include/linux/fsl and rename it to svr.h as a common header file. This SVR numberspace is used on some ARM chips as well as PPC, and even to check for a PPC SVR multi-arch drivers would otherwise need to ifdef the header inclusion and all references to the SVR symbols. Signed-off-by: Yangbo Lu Acked-by: Wolfram Sang Acked-by: Stephen Boyd Acked-by: Joerg Roedel [scottwood: update description] Signed-off-by: Scott Wood --- 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 Changes for v9: - None Changes for v10: - None Changes for v11: - Updated description by Scott Changes for v12: - None --- arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +- arch/powerpc/sysdev/fsl_pci.c | 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 ++-- 7 files changed, 8 insertions(+), 10 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/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 0ef9df4..0fd1895 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -37,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c index 58566a17..4b6c438 100644 --- a/drivers/clk/clk-qoriq.c +++ b/drivers/clk/clk-qoriq.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -1149,8 +1150,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 4b4f5bc..55be5ce 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*/