From patchwork Tue Sep 6 08:28:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 9316071 X-Patchwork-Delegate: sboyd@codeaurora.org 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 BEA5860869 for ; Tue, 6 Sep 2016 08:55:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5139284F9 for ; Tue, 6 Sep 2016 08:55:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B590D28BCB; Tue, 6 Sep 2016 08:55:22 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F7FE284F9 for ; Tue, 6 Sep 2016 08:55:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754068AbcIFIzT (ORCPT ); Tue, 6 Sep 2016 04:55:19 -0400 Received: from mail-sn1nam01on0076.outbound.protection.outlook.com ([104.47.32.76]:15424 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752190AbcIFIzO (ORCPT ); Tue, 6 Sep 2016 04:55:14 -0400 X-Greylist: delayed 894 seconds by postgrey-1.27 at vger.kernel.org; Tue, 06 Sep 2016 04:55:14 EDT Received: from BN6PR03CA0027.namprd03.prod.outlook.com (10.175.124.13) by SN1PR0301MB2013.namprd03.prod.outlook.com (10.163.225.30) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.609.9; Tue, 6 Sep 2016 08:40:46 +0000 Received: from BN1AFFO11FD052.protection.gbl (2a01:111:f400:7c10::181) by BN6PR03CA0027.outlook.office365.com (2603:10b6:404:10c::13) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.609.9 via Frontend Transport; Tue, 6 Sep 2016 08:40:45 +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 BN1AFFO11FD052.mail.protection.outlook.com (10.58.53.67) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.587.6 via Frontend Transport; Tue, 6 Sep 2016 08:40:45 +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 u868e7No032344; Tue, 6 Sep 2016 01:40:38 -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 , , , Yangbo Lu Subject: [v11, 4/8] powerpc/fsl: move mpc85xx.h to include/linux/fsl Date: Tue, 6 Sep 2016 16:28:19 +0800 Message-ID: <1473150503-9550-5-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1473150503-9550-1-git-send-email-yangbo.lu@nxp.com> References: <1473150503-9550-1-git-send-email-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131176248458773014; (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)(586003)(87936001)(7416002)(305945005)(68736007)(2950100001)(85426001)(77096005)(92566002)(189998001)(626004)(11100500001)(48376002)(104016004)(50466002)(2906002)(36756003)(5003940100001)(4326007)(97736004)(356003)(105606002)(8666005)(7846002)(106466001)(50986999)(5001770100001)(229853001)(47776003)(86362001)(76176999)(33646002)(81156014)(5660300001)(8676002)(19580405001)(81166006)(19580395003)(8936002)(50226002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB2013; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD052; 1:228grr+bkU9tX1KzuYgwGebPA2Pw2zNS3u70Hik/5hQVyKxVYGnXvhBDknNMoZ5czsGia7Gik5dMaYu5rRRQmwMXLU1FCTWyPYcjDH+AyFVIRo+bGmtr5EYokswaIoSGhQCGqRins+eulVVmdnCx/O7A60AP5maeq3Hzz1dzItCxydFK+NCHIltxT+Ix3n9uNm48pw/Ia4v+Wp22Wu9186Zy2G5IsJnkzYupfbmIhoUO3JR1TNgY3XKI6NUNfTvFHMVmg0slBnJUuJ+u5563DC4NdFpulIWZV7WMLOBtCQAF7cV0iullQ6g0bzqikUk4ihUH8DCjtcpX/6y+Wus0Xque+1q/HwXEAOwuSxcv7+Q769ODHyinHo4BbW2+1h71VUHjlXz3v6nNF29Zrh/1FWR2ZvSmkiBPO9/gn6B3rMKX7AqWCr4CFbiGVkR4YIwnRksB0e1r0BlwZe7HBcFTwaTENK4D91fEkqBFj+2MelRIu3WZRZ1EdyWj7pze5DfXtyZdrfTjqlFPq1vVSvJIoYMGcmnjU4lg+o+o3qLF3gC++tLUDiTsTMT8XQICRWQZ/hbZMcAhNw1eI8cCRZAixAEDFDGwha6bCPAw2KkmZpHiWSykGaHHUXCDbhdWrfeJLdeAoxplRMp3eq+Y/dn7c+uUiJWdAkhU9TI9cqyzcjwGcGJn+8qd9kN/PEohGfKnWzapvExYIfgN3xXThuntFSJZPRmDdAF4xGUMAflptIbjWgrbf+b1cWK8b+d0jwlU MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 7beac701-fabf-4bc0-20b7-08d3d6317ecf X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2013; 2:MYqfewWXbeBEZXACbXSBsZoI6UoZ6Ki2AJu9A1NGnxWV9jl0vebadl8L+0nr7zka+96bcsK+AhCpFnU4bg5t74F1kQxSnOaNDOFyEpo51b/jGfiCg43roplDYDrJNz525/vunls3p0JgJBpU4AuMTZM0LSkyEogjaXYPTQoiF3F02XQIDvuo19MRj+vF2t+J; 3:74My0SLIPV9QfplVX+lvyJLUkobpk5Hugt0VGMH95x7GubFlgBWPIDveBr942zI4WRgaWTJAgCDVTJRv1L1BflxzqGZfyFUB8gtl2wrolkPIXTs8NtCoQ4eoSd6jQ4r+bkC3quUax9gz2AhjAUM6mWa54EshvD2STvCB5xJ4yLA6FXydQF4975j3QQSmjP2XUqYh31rHPq3JdADo7Mgg/r+BbZShSdcemuV6adHHFbs=; 25:jMos/9biQYX/6pdJq8kyh8QZZKq6RPiLxYZhIzZMkwrgXsyudzIlVHPDgQcOXzy5jLMF5s9xePhPRE0ywyVvgGUE8/ZLE+7sKON2zfZLY9B4d/SBRkUWf8ItTaCGiIwGPeT0YGcqVMSu5yzvF4/SNdNVcppeaBByJ8uErWtk+jAFy8LRd4qnFT0ptRC+Nm319MNA2y2SIZGf0q8kJNH+Gr18hO5C5PAc8txbA0m5igZlH2zi5WYoalcrpUC2PLvyzVWBkWI08n0LTMuM4i0+jMWi5vr00lHA2RS4iWsoypOM15atFbz1R+7WYCUFG91toW47FkB6gAU+lkiVCoW+Jd/W3nGYxigsqifsrQfyjSh4H39e826Bnv6DUrJP8vZPz6K8P+KkrMhA3QNZxavQ2u/hjC5SSCnQC1SzOKhZjH4= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB2013; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2013; 31:ZpGCUOT4XSVR1AjUPJYdnp91tZYU+cyxPXmZUIoW0yl+Owh80Kc6Yc+94rOI/Zx8GNhxJDKqryPJ5J9A8zGY56pthGeLU9wN0uTMlB5dN4c/XuYMaGD8CycchfI16RcX/fma2WNbJnUCsgEF4gMvbIomI2W4HVuiRJhXT1S+VdXBp//5clZMLBwWQkJXko+2D0sojR4phZrFrgs0/mkzLXOFj5ODidoirUbb0Pc4Q/o=; 4:srmf7Peg69wyfEZOnOR2YUO1DJpS9+gGOBDlqh4nBs1vbi8XRD9O6fVcng07zlXT/3077bi3vfZA+3DXkZ1Ccc14Jo2MdKswWHmnwx+PJPFOcZ4wdFMGZSQWmBeFs58W9S4J/KCfoYCF70YnNGY3ZcL4dL3hquhAnwL+1JlKZW8h/FJHgHcoQf47NCbQpCKt7XXerYleEsNKMF9jntvav6l7UAisqNloAOc6GdTKLK1lEw/sXwuXqeELXRz3lxCSHAXJ4QiwK0QQI1y/DuDKKzVl9ufWOQzoQu/P/XSeBwz3wCefz97JQLMUNNCUQATqz23sJvK72m/eWYQ/owqKpAujNYnh6qgcxJB057OWEuo5wwGZ8J2dWJE6bgreoMBttpkBKg6REuYgPbXXLOOfY/dobRiACTPTRe6jSrkqwihEXvxsLIYwcaIX/U7YW4tdAHrrl2SAKHrm3LRbpcMQf2gHvE2llNRZNw68pVapnrasQzgjheljDxF6x/gpojDg0jO8cUWH/j7NDfEU0mYTVYbrdWzER9JX4+QCQ7fcTc4= 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)(13017025)(13018025)(13015025)(13024025)(13023025)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:SN1PR0301MB2013; BCL:0; PCL:0; RULEID:(400006); SRVR:SN1PR0301MB2013; X-Forefront-PRVS: 0057EE387C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0301MB2013; 23:9Vw/72l61VKG37lhBOxfu+R+aC8q+IXiGVLBRXV?= =?us-ascii?Q?7DA3Oimhv2i8Pgr6Mhb9LO80ler2wAgTuyl40KCdgTPHhQpaOUUHLALCUBc8?= =?us-ascii?Q?1F1dG+Lk4RBcmRANNcWIt+gOnzkgSB92SDlNnNGL9NaWsO/hKmhZ+YWRdJrc?= =?us-ascii?Q?bQgH8DHCmfIQ6Zr/8YWTXRdiQx47oaLu9NIHjQ+hjSAwZC/Fs0QRaGIfN+V7?= =?us-ascii?Q?+REK5yqaFXY8a47d3eR7KsO18+MO8xMDYfiJNmzcIdvQkEsz7Ij4Agkuo9Hr?= =?us-ascii?Q?HS7PiggX/Ib0VbPGgr6yfLPMAnP8SGDvrvsQktl925UtuwjgBDalPjfxRdgi?= =?us-ascii?Q?8SgNerJvrcf/aWsLBCJg0Tpind9Lsjg5ZSsmsBOvOPFjTgGtJe7Ad83XIT0B?= =?us-ascii?Q?/bOP975ouWQkKYKn0qJ9pAaFMLV2xiaQqiRksPl2DMH/lYx9hsZxiGdohdUZ?= =?us-ascii?Q?1mFmyjbRWvShwAez4b3mTRzWUszL4kqmZoh42l078ZLh5ZjVVc5MzWbK1hqz?= =?us-ascii?Q?oqiOBM92zGyzcySokXd45p/THmHNKO4MsmWIysqyLkfwF9I2+d4q+NYkBf5m?= =?us-ascii?Q?1VUPoE+ZDcpYGOthCBgzeQtVsdzbQAmaH8HsBRa1firAqGg5lNUr9aF7ymVB?= =?us-ascii?Q?dqUNceQBRflUTwDI1pViM0nPbxz9WDG2n7H9D5kqyzuPJzTv26+oO6RoW5rr?= =?us-ascii?Q?+jehgp2279rsBXWz4V/CUmHWkCwEOEFcQGVeYCdj6wqfLDW9ZOVJd+4nGs3g?= =?us-ascii?Q?/yx/s2UHGgHXRLMSw6hOsemL3JvK/S8Y3yviHn6QPtCLOyvsS9FczwzcQfQ+?= =?us-ascii?Q?cEnz5Hhkuq6HFYfsF6iSAv48/3ZqioU2UGweQIB8xi3nfsAokAzj3GfUXwRb?= =?us-ascii?Q?fdBCepbBtV80qly6NfU2qSpADdogK3z9UWByomkgFv8jXq0qDuSuRdmy6/du?= =?us-ascii?Q?rjLGZh9hcWefc0FpUN23N4DWJ9rX1Ko/i7SQTCcSckN81ItGyOfffv4nL8e0?= =?us-ascii?Q?cG6KAnmkXBEmr5XCE80VEL0jvGBnKvz2PmXz7RKGTX16In3daFUia/bmGJEP?= =?us-ascii?Q?B9qCINE584GWaqtyzn5xeRuCR5LrQDRU0SeTPwOHlWrlDfcujFQvWgLADMKf?= =?us-ascii?Q?cCGzHRlw1tEyri4csehWXFD0ILqYgmLvE6KqESt0fmrNnRBd4t8uc7NXosz6?= =?us-ascii?Q?SB8DtLY+Jz0wwrmY=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2013; 6:QCJ3OE4Nrlsk7InhV52o2Sr7kRsXVObb9bis/izgvnp9aogBKMcbkraIlvyHA6aMRgHHDCmLcczTVCYKlgUVr7Zv6hARzpK5+Q/HBd9EPnq+6l49tCf9mG49JrTJWialFO/+DvXxL3D/rdUxftIJIHufNpGiDMJ4G6ArO9EQ4L2wxyc/r4JTRZUE50wEtbhUYXQFLMj7LNnw2N82auUC+5/GpfWhJvxZkM9entdTIdCJWPPsUzH5H4hE3FTWIvP06aUu9NXljOH6NI8WXsPQrGheMaij9lyQmg6tPIk0VOQ=; 5:5XevtlpPfVhdRKJuH7Dk4Sv1Xgj71hDpGSOL/pPKf0TKWdc80nhItsfyQ069eQEjXfnss+NEDyj7EukfP2nOd1DXpwWocD/DWht7Iwz2wARF0m6wIIo4HCaDuipj1Nu/i3l0ilge4zw9sWjPIZbe5MWA1Is0Vvt4stxTPHyjBrY=; 24:vUjZrWAYhDDm5FyXLFSiuoRjQw3LQf7X4n6FqcU4TMcd/xd3eB5/xKqcQaTGZEUjSSp981SGDzeDZskOn4msNckZ8ujur5rh03biT10K8Y4=; 7:AineKxFkQye2yK58pZlHFnlwIawesdzA5Up2PfNnlO2oBulKTJfn4AGqJSVqgUTIzpbaOquMEJUBNJriSv0v8cKlX6CuKyYVJRWElIoDJz++fEO2iZOQ4WaDCP+GszF7cy5zyR3CwSpA91Y+qiha2wl9GstL3EGXYqsP0V8Mbs9k9dN7I2KF8AWmRFV0a5kRsmBfZgxClguRmo7+U+qv22IXMCt4KILSiUO8eAijuNbDMUtq5+ZBnTV15eQHQK0I SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2016 08:40:45.5809 (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: SN1PR0301MB2013 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.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. 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 --- 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 d20935d..b8dac84 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*/