From patchwork Fri Oct 28 05:45:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 9401263 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 95247601C0 for ; Fri, 28 Oct 2016 06:02:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 804252A533 for ; Fri, 28 Oct 2016 06:02:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7315E2A55D; Fri, 28 Oct 2016 06:02:56 +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=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 7AC972A533 for ; Fri, 28 Oct 2016 06:02:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c00E9-00037C-EV; Fri, 28 Oct 2016 06:01:17 +0000 Received: from mail-by2nam01on0628.outbound.protection.outlook.com ([2a01:111:f400:fe42::628] helo=NAM01-BY2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c00Bw-0000UX-Oz for linux-arm-kernel@lists.infradead.org; Fri, 28 Oct 2016 05:59:05 +0000 Received: from BN3PR0301CA0013.namprd03.prod.outlook.com (10.160.180.151) by CO2PR03MB2373.namprd03.prod.outlook.com (10.166.93.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12; Fri, 28 Oct 2016 05:58:38 +0000 Received: from BN1BFFO11FD026.protection.gbl (2a01:111:f400:7c10::1:170) by BN3PR0301CA0013.outlook.office365.com (2a01:111:e400:4000::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.693.12 via Frontend Transport; Fri, 28 Oct 2016 05:58:38 +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 BN1BFFO11FD026.mail.protection.outlook.com (10.58.144.89) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.679.5 via Frontend Transport; Fri, 28 Oct 2016 05:58:37 +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 u9S5vuBr032221; Thu, 27 Oct 2016 22:58:29 -0700 From: Yangbo Lu To: , , Scott Wood , Arnd Bergmann Subject: [v14, 4/8] powerpc/fsl: move mpc85xx.h to include/linux/fsl Date: Fri, 28 Oct 2016 13:45:17 +0800 Message-ID: <1477633521-7391-5-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1477633521-7391-1-git-send-email-yangbo.lu@nxp.com> References: <1477633521-7391-1-git-send-email-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131221079182450380; (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)(189002)(199003)(19580395003)(11100500001)(97736004)(104016004)(19580405001)(77096005)(575784001)(8936002)(5003940100001)(50226002)(50986999)(6666003)(5001770100001)(36756003)(86362001)(5660300001)(85426001)(87936001)(626004)(68736007)(33646002)(2950100002)(7416002)(586003)(106466001)(105606002)(81156014)(4326007)(47776003)(229853001)(2906002)(189998001)(92566002)(305945005)(81166006)(76176999)(8676002)(356003)(50466002)(48376002)(7846002)(8666005)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2373; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD026; 1:9kLnanspMuEjBTX/9ElUG+P/wF63KjMozTL4xT1JVDy0DXA8k+jbq3IMs+f2zViLKWGo/1cvEUO9MZlte3jSeOUTMBz1EuFTRM8Wn3t3rqf0PIkhtLkZ/AHxB/1hepVwJWZHea90WjtThj9rA7WZp57eedtcZz8g89Ek0p2+to5QqtlQLOaGAASijP5ifzPZcpXAe29UmvSUG6fCaGL4mHb/Wgro0yfay/6prRJ8H+rHcXhHo/axC4NDEPo3mIfq47F7qUwJTu3nhrMcEfH9ALgBtepEA41nRIOMsxe7XM1XCyhnjB4N5dZl+5CNx9AZHuqFKHu/IdLaelXWlHYDVIReyLrljFBIoPPdxduQ0UNQhxCJ4CTkgRukD1xELNZhlglqd5RzXbPY+mibI4ts4PB1JdUOqDUOzPZ2bBbV86tu+CO9P5se7CF7j16badDaPHAxbzwCY4eL+cnXwlJeB7YkxW3sNUYgey5Xk9DUGN5WTc+tf44awHSx26DEVG54MTp2z5JUvdZ/guINWFD0g92G0JTCY2ncv8x9AIuZzTcHyafa5+2BVCpYyeEG2vPfLQ4yghSSBXTGCtNru+vRdjc1ntamQ6pDuTJJ022oTEMnjlQMDyvBPtKQZhsksXO75n3EDIn0AGeekWsr3F8h8mOCcZ2m8PPqnO/l3WuQO7+SCQuCV8cw6URdkHlayceOt9L6rtbyZo1jEN9vsNTFLuGolt7xo1xPvwJP5KfcNmONNvpZkGMyxJe1Ob5ASRdp MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 6be216c3-bad0-4926-3d6b-08d3fef7762b X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2373; 2:WBQLyQ9fN+Td25/r/SJHMalsiLpkQqa0XnkCTXHQ0mEk3jkLcVFFbyxXTqZ/CepewGN1EGJy6aVeFEXaCqA+2NpurDSYtan1twSaBj9J3RTlU0YYTqPOnvizM3b1Pf1nhbPwLSlXiFvFttZqbdCWdNNynGHpaJXEbV2Vr686ahhRVe1cZRVbnJntkmVoS5czWUgsB7csfkIlSK0gwP2Q+w==; 3:4qNe2HkVHGwl5iFbw4poWcCMDzFeqbKYZ7n3pHH+OsIOlWWWgD71e1n/EpSnlgTs9EvZUBjao98uAn7rVGMZefVM6c8NAaFgVmFp992oBPQhuq0Rp4zWLsC65Uhc/STEY+N5qrF8v2VaRvMpPQHam0FQ6PJ9eCJjWxB/aJYyIlhN57Z0EIp7Rpam4SoiANNX1H0q+5WqDhsAJ2rEhkAfMPDEZ6yE3A2p/xF0auTTju92m7ojIPUSYpyrCpR6nPr5; 25:+nX75vLW9v8PpelCoxMMAycHeFmRc/VRNiejZ2iXm+k9yCir8pBKUKgsGF7BI+YNE1RLoNkeDsQjUiTp49hAgEyHRqZGKov9gxtBWlGEzMECy/7pAhe3ixvL+iR1ci4RLu6Okp633KvL7ohZIfQD7ReXtkwAKUlZx9TxanNmv+RZwKoIheXtu6D0l2UAqO6homLI8muTwPLPDpoKKNdH68GmsR8viM8/gsR575K97JCdyhMdTMhwdk58Qi/z6IKz1lD2MlJSu5ageFt5iUYtHDM7Z5AgAp6G4uy6e69bRax46yxtcxZ/tC7giuiBnfB6ikk58eMIdBPOXjoei2T2/lj9O3SPIT7ZdPcXVCUmTbQEdprdEPPUurYFhOtrWzXBQ6p/o3OADinFZMGpKbhMSK17IG+4EOXtW0QbIRVgY3dQkHi9n672qqFNn6qNA6tS9WeJrYQhZo82iAAXZTxtOA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR03MB2373; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2373; 31:MBsokSmY7GQ2Z0RD2/+a/Q7U9NhxeZSCTT0KUuFlBpXExR4TvJAa+hC+3EVqrkwIBlFDiOR1U+ebKTwzaqeLeldNzwprp3+Tzt4r5rS2ov/tQ2GBI+mJx3Y9ZSXYoIJJMFQMMMyffQXc/LknILBm8yT9qGByEBaVcCTdJUdOhfMY8bwmWliZ97ssYX+6z2btkkdMMd928l9qHw99sk2fInFP+dKuD0M/fKCguPkrm85SHg7Px4h3ZDPYzBFt1CGVgcHKjjSsTSDaZHfw1Ft4A3OBJ/wc8WL+8SJ+euQ2NDfeRRm5yxNHXZ/5E69QYZXm; 4:gq66ySKMTmrvPNlcWXqY9DHseerpblAfHSvgRsTQvCm0JPXFNVMbsD1ds6cOWN1F9dmtx1AoZ4jmYZmVmO2UbSbOJGT+2zKE7Ebiq7wYQN3VG9KihcFTMMcdlWQaSnmSCnPiod5UXPuqq6s11k6sLp28NV3NrmMyPaUvCIZhqPrFQLxu7WaTTUaQU+/ZSucXRF6pJCVIw3h1I09RRCD5lcXzoWhAUz7O95YNY45gmqsoiT+ZpDxZOfJ88fH7jzmQ7pn42MPChTdjK0+xGXFnujlKHg/h36q5BhlGMwq3KFPvErehqTcIiKQ+fviSGNM+hD3h/61ktmsjM/ObBUfAFMMRhohqHsOBf8T7haLJOBh3TDuHaQFY7OpdU2dZSIuob/jq5d/6PBH467Kkhi2EV2yusoWa1FEBO6U39T4kJWwnIhVXmkW061UI+rAfCCHGMXHKdFL7HOypYBeal6wxeDHyQgoKS/Act/o9XqMR4k3l3VOETiPXsRe5nd5lHG9C/ufa/MK1yFqDv1ZD0MomwagM9VcMbl1paaNKdjiCo3RQ7Bvr23Enj90GOliGpA5B 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)(13015025)(13024025)(13017025)(13023025)(13018025)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:CO2PR03MB2373; BCL:0; PCL:0; RULEID:(400006); SRVR:CO2PR03MB2373; X-Forefront-PRVS: 0109D382B0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2373; 23:GJe0XDcBtIqL0csHAEYKhss3lvw7+Ab4eNKYCFjOb?= =?us-ascii?Q?o98QfNyIzhKKodFltqYGuc6SuHzFt4fUOirWDKDrnZIl0R468Mp6mQjxgTdS?= =?us-ascii?Q?xbGQ/ndPsU6AJ+kphHltSlyxriYdqWNCLpRcMDtcaR+8A8wnCU7LiIzhRlZz?= =?us-ascii?Q?HnXXehUPTvNg616OGBbjNebo5VsC8S0A29ndcJegbzWdayzl9Hx/HlqCYc0Q?= =?us-ascii?Q?kP4gjamjgz61O9thb3f/t4JgXAJppFtzWH7NHA8j5YcFpNVZKwqDa8ByE/ic?= =?us-ascii?Q?lDuWZeTzCNrmszSgRQUNJOdoxc3Fxbizg5YunN50spcCavK9K/agalj7XLIO?= =?us-ascii?Q?MkieQ3zVV7OI6MVbsm5LJ0K389MOdgWGeIAXfE+l/HLTpEJJNTB59N1T+sky?= =?us-ascii?Q?Dnxoq/xWsHtQefneJd83LrDfiCRAHWbW0tSLv8K78XEnxp9ykLJbrmLegrV3?= =?us-ascii?Q?9uDFJkeFYdTubiHgwCVDTjBV/d6wBXPfVHbo90HJCwvJXr1o4kDlaVk8WO31?= =?us-ascii?Q?lei3lqGlOfispBZ2L2SsQqW5X/GfwQorJ7k/q9g8Om9rckxfR5RJsi6YViRJ?= =?us-ascii?Q?FFFeO9DZG/C/CBSgaOWTvXIGPsjN9xbA4zrb26szfmumPps7t1lGTjJ5Huw+?= =?us-ascii?Q?FZoAm1ngm0oNvLUlfJ6MycZtJn80O4uES9jg9sVTeJdqwPyZ83NmEektBbDA?= =?us-ascii?Q?4GklEWRo9jgvYHQwEdfqydGFvi7C7NBYCznLrogtzoBSLFqpKqh83iylo9az?= =?us-ascii?Q?gV1D112Z0ZJ9OMdlLsBADPAHA9dohVFAZTuk3G89k5r2d2kwe3ymYkc1toc2?= =?us-ascii?Q?EFPFo6wHmib5cQ7S+uLI3GLrglJ7CN3DhIJN07309NwPyAaCCajx2l7vRULx?= =?us-ascii?Q?DUq2LHQDUAw+sKFepvpyARf+TU4dxE+IWpv/LsFh9VU/IXtCZWTfqCbX9zQi?= =?us-ascii?Q?pcQSqWVtGkyjpNsFkqsJhPXQ0R9NRI/EB6g+o43eLyWvmn/B6gPVWhfw4CUK?= =?us-ascii?Q?vz8F8xzMSGbQDayQ9H24mUuuyIO0r72pdUkSWyicK5Xri7/C8OmLy9pDId4I?= =?us-ascii?Q?G4u9DQMN3B5naEjUrZY0qfveeoYO0jX9Ycl3V5T9UNmIC/ktJf1F2cYVgkKd?= =?us-ascii?Q?QelM737lVUYu3wTWQmQl5F+CPZMilnFoHHytPBx7zBKbTc4nkp75Biayoq8i?= =?us-ascii?Q?5Tjo66zk6808iYjKODIYKhMEk6zthzuglWAPq2QOTfM+aU5ABoTz/DmDw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2373; 6:k+oAqgavPc4yu6QbTV0J+xZzyJpqRqnUlTHftPthsciojmFj76itl5iW5ct/paB7tBe1iADrXtUpHf7gciynrx46QCqvfub+VD4jk6PW9pDWko5Glrkwkk8UGl5xSW25Hhq1BSqr8bg6RMgczS7P6Pm+TECix2cswlqidzwNXYPb6O27doXPiL3awXSvGWOt7V3laiQeqb3QzR0vnz4IFHsiuPLc6Zvfbnu2H/2kD9XSdCOdp6c7bnykRQtlUbRyOTwpk1AJijXxkMfF8/2X5cBM9/UC4paQELCKJ8b1S+lT/rKJ7tlOdoI8dxpzqlrF; 5:07dMINmPraHlIwPTv+flQF5S1d7m81ZQy232hariTmqy6sFxwoL1THgfBxp1tMsK7fpHt+tYTikQMJay3KtVv2aTAkD2hMG2jXuD0ZQxDYMtMrdiE47XJXEdPKqhkEkcgS791oVLO3XDyX6dLIU8OjGTpoetu7z4lhleCFlayPfTs92nYRbzt9m8ryZvRH0w; 24:4YXp8Psn2YE/Pd8zACO9K9ISrMP+z3ku6uFRUW2okVx3eE+7fjEukrap3ITdpoiHVVUUlbFeBTKrWHBg9gbkiDndQgC+i0uJZShK33cJH64= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2373; 7:DfnX0n91QhonvVBQivalPnwO+4mpa7MsxNwuFm0LJwvvenZxCsnsvoedThRrlhd91B1sdtdIffif0lThXJfYzhDpLkYl3zh/2PXxed0DXJzVs0ATQBaUV3n+wXU3JoJom2kGk4iIMvkebu2g5UvmgmX3G/9wzxaTXCBcPRLBGDjhq/2asMffiHk+xYLJmiZ9h42wW3vcmKCtmy2vElgpoOHHvtL3l/9gQ5G0zZHHkgOESnCgAWZzj45x0dZSbjdBQ/mKhyzv9JFrxb12XFq7dps0yn6ZtY6104a49+Mdgn+ZdR3QRrn1Z8rY27WStCJ9vcEfpUgC3iLtzlS9+gvJIfJIwV+4Af9J3P/plmzVPt4= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2016 05:58:37.8238 (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: CO2PR03MB2373 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161027_225901_005277_E66BCCA8 X-CRM114-Status: GOOD ( 18.63 ) 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: Mark Rutland , Greg Kroah-Hartman , Xiaobo Xie , Minghuan Lian , linux-i2c@vger.kernel.org, linux-clk@vger.kernel.org, Qiang Zhao , Russell King , Bhupesh Sharma , Joerg Roedel , Jochen Friedrich , Claudiu Manoil , devicetree@vger.kernel.org, Yangbo Lu , Rob Herring , Santosh Shilimkar , linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Leo Li , iommu@lists.linux-foundation.org, Kumar Gala , linuxppc-dev@lists.ozlabs.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 Changes for v12: - None Changes for v13: - None Changes for v14: - 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 d3a5974..cb0efea 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 20b1055..dc778e8 100644 --- a/drivers/clk/clk-qoriq.c +++ b/drivers/clk/clk-qoriq.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -1153,8 +1154,6 @@ static struct clk *clockgen_clk_get(struct of_phandle_args *clkspec, void *data) } #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 565a49a..e791c51 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*/