From patchwork Wed May 4 03:24:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 9009261 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 4A2D99F1C1 for ; Wed, 4 May 2016 03:37:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3CE9B20373 for ; Wed, 4 May 2016 03:37:18 +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 3BAA5202FF for ; Wed, 4 May 2016 03:37:17 +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 1axnbD-0001x0-Ko; Wed, 04 May 2016 03:35:43 +0000 Received: from mail-bn1on0089.outbound.protection.outlook.com ([157.56.110.89] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1axnak-0000IA-T7 for linux-arm-kernel@lists.infradead.org; Wed, 04 May 2016 03:35:17 +0000 Received: from CH1PR03CA010.namprd03.prod.outlook.com (10.255.156.155) by CY1PR0301MB0714.namprd03.prod.outlook.com (10.160.159.144) with Microsoft SMTP Server (TLS) id 15.1.477.8; Wed, 4 May 2016 03:34:52 +0000 Received: from BN1BFFO11FD039.protection.gbl (10.255.156.132) by CH1PR03CA010.outlook.office365.com (10.255.156.155) with Microsoft SMTP Server (TLS) id 15.1.466.19 via Frontend Transport; Wed, 4 May 2016 03:34:51 +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 BN1BFFO11FD039.mail.protection.outlook.com (10.58.144.102) with Microsoft SMTP Server (TLS) id 15.1.485.4 via Frontend Transport; Wed, 4 May 2016 03:34:51 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u443Y8X4009000; Tue, 3 May 2016 20:34:44 -0700 From: Yangbo Lu To: , , , , , , , , Subject: [v9, 5/7] powerpc/fsl: move mpc85xx.h to include/linux/fsl Date: Wed, 4 May 2016 11:24:32 +0800 Message-ID: <1462332274-13744-6-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1462332274-13744-1-git-send-email-yangbo.lu@nxp.com> References: <1462332274-13744-1-git-send-email-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131068064920855434; (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)(199003)(189002)(36756003)(5003940100001)(106466001)(229853001)(2906002)(5008740100001)(19580395003)(19580405001)(8936002)(81166005)(11100500001)(6806005)(104016004)(50226002)(33646002)(85426001)(50466002)(76176999)(77096005)(50986999)(2950100001)(1220700001)(2201001)(87936001)(189998001)(48376002)(86362001)(47776003)(105606002)(5001770100001)(4326007)(92566002)(586003)(7059030)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0714; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD039; 1:fuvzyvhQaGoLCPIRGI60fUm/UKfy+uDKVzY0ufbv4ZUM/aFbaGDcwjFfMd2+sm2lr8uE3RibicBL9Y/ORmHOU0LvXoHw/+cYE34x0cYTQNqWiyV2WqrA66AE6YNpFr6ufiUVBquj01T1YxwwsDPugY1O0Kuf91ZMFZK2mYTuFTNnrEisj0dDvJwf5fHe9ane74OGvsiy4/+ch9Vvp25F6HGEIuNDFJHyIu9pNey4z1kLiiW74yjCaLao4prJXDmVjI6hFS/86bgwqGkdq4XrAeITP2+AtasvOUOzT3QzCO++7/py23KB5JVaU2W1RC8AIhqW9AXFKo3bZW7r9Lt8r1Z71gPLKTp6IZBGZ7T29fZADEpRT5CT60SkjIPqeCSrqQSYIGEsZvNv65xu6mtrIiLF+H7ChfRlyUc6+xS/OlMy1xRJjNBLjBW7ztyjsWFSn5yC9AF7Yf6q0eJxuP4vf0bTZv6Qteb1gIfGuYoWQlUORe+JwdU9+LP8DW0Ng+NadNTIRDgchjCibciBqOBcIzF1hc98Qi+GKGN2nJwLK9rBzPeVut8Dozqfuts9YxRst1KbwODsEj1RQpMcdVJ7EXiRA60uuFChzb17voV7mQHxP78ewO1LMVvhWZEtpj76k5sYFGK9QiIWIunTjF7ZNNxNQxxDawHvKCic0uVAKS/1jVtdY13K4DY7zDFOi/UJwy6JybtqwnGhewXuTKyLLWdVGrgCY8q5dHrqAjXxQ6GRX4zrZ0vR3FwVIkDPt74J MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: c652370d-b440-4dfb-0229-08d373cd0d76 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0714; 2:r3cg5vJgalTOMobprvHjvqaAmUWT3wuw2bw4z+F8zSHkmUfY4FD7wgyDHXpoG17TOtJcimfm1gmHNK7q92ep0gcC2VylVM+VzF5ikLrA7D39kT3zPJ9B/SbAM0EEQVdfNbxrmF1oSA5fSztXEN6rNMuIybC0B97A+DbKWXRvYuP2FQ4vkocc7CJ3CLPdxPe1; 3:FFl3itXNT+wCuhdahzMdlyXlAeLPCyUmXiMSUDol9ME1siqZ3CRG3SwI9l3R6L/pVauWqnbmPx5xfhm4Qmf6DZC7AwMK0fQ5ez6y/y8TGrpEKrYcMUWxeHThfFOdXwryJfDeDdyIIC6xpO7W/dsMHj/XCr6CwI/dcF/f/p8aya899dah4m6C/JyFDIysoMy7IkwxRm9S0JLh1JblxhjXy2KngfUcxGR1wIHscF1mMsE= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB0714; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0714; 25:81Nofx7jx8WnW33xE5Ny/+bBxJjDRtNS33L2yL2ZFR1orz3zDD5uhgPG2KQ6c9oqbRee9YdiSsdtSjfLh9M20SUmvF7hyIj5ImQeoWjFhICadRmoWrQ5BjJ01IQ+s4Cnh4yc00L38EmGNrg5by6u1T8eCaZC0IFfQbS6IrLzByoRCvTbmDJFh37E3r+6ZrhOUeT4NhJouj7DWJQ4ZkMOXpKg7frgeNMHwV49L6GhqjJdDrb07db2gyTSP3G90ltS7WQwS1xidYfSLjgBzz7/AcF1cJL+PL5NJ6gGqi+cAiL+xMEzPjj8qIDxqIkz7fmelEL/79GACk9VyU07TN/h008cI149gAUMFVuWlps0FEDOuOgwWX+txzVXnbEahu3CZl3lJ0quzhvEC7XjrrXynXMuHUfopwpALCp0/bDwWhEmC50LvXq/FVgvnjkeHhuutNuaL2Qt21F93CGsNL5pTpMXtvbFM04JXz+ghty/TEV3Lhiqwl1T/zw1I2coQeulEqPmEgydXLjVSTJDKVhFkAWPbYZZpa843JEavjrWAEEFQzEzJ8t2tX7dqhidjTDiqvpl7ribyGH/vaVN7xFp9WnjLKi5wW2BbMTUu2je0sgc7ltN3mco3Vd/vVZ46Exn0X9rRwGgSw8QPBBbfzDI5LZal0bionzlovA76mk/sv0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13024025)(13015025)(13017025)(13018025)(8121501046)(13023025)(5005006)(3002001)(10201501046)(6055026); SRVR:CY1PR0301MB0714; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0714; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0714; 4:4lRHxrpQUavOTFOUO3g3tkrdFhUQi035W8+hUxDkRPXuqve6JPGb7m3NJePG23Wk8mfL10gkR8we2wkIl5+QMM8tnsDBY/rKCNHFDjapzP+eLww6dhQUBtwRoP3gV4kCF8LX8uBlIzJqceDFr9l5dwutUGuedYCJu+aV8EuamW2sxYfjSdpUi+6wskUkjOLrm0pMHq24AEjvTEaj4iaheh2KNsySyO1eYovu9qkZmh6SPBLD2XtFZ5k1aFIVwU7oWlOHhq1kwkM1w68biwVCmPv6wBDAe6fPJG6g3uqoeO4rFhxgYEKvkfVt2n02P4KyCao/l/Sl7TIdsGlC3KpgpexUBD7Dm3z3OHrpS0+R5044cCsNRey/Kbt/Q7+kMkYgfYR0rgHbjCh6wcUVRmztzo1k6aw+ASb1/LrTtGmSMu4GBSFAw4x9yhnMC6boptxMLKzEsSoX61khIqBvjLyeKgI3wUV4Y92vFA9zdQbGLy4= X-Forefront-PRVS: 093290AD39 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0714; 23:q2TxEtS2SF1o+vMbzO69Gec5IoSHmjS3noQoOWj?= =?us-ascii?Q?U3mFIXiTgms7N4DVa0A+gtOSLOC7o0NfahLbRlfUka+8FTXyT94qn4dPh0n5?= =?us-ascii?Q?frgio/M+BVyxjK4uGFQxGQ2dBDdZIB0rTWSoXP0byn3sXYCEHowL49GwrrNy?= =?us-ascii?Q?BVr2IqNXFvAGOeu19v4OuAHyr1GL/WpzReSY26S0jYFVL3GfKV54Ue6WwYVC?= =?us-ascii?Q?VwEwgDbwvSeC1gFCSeYN8qWUqFbtg35Ysq6b77nr9NkUneGo5S7V/VPTLxHR?= =?us-ascii?Q?jEbBnuvSQJoXTdISkNLoM8aAGEqwYbXcXhYNKmIWdYDCm1C38anFIvY7dX3G?= =?us-ascii?Q?hG51V7hll1XZfkG9Jme2l3zyylIUppp6qM5D1GSlZonjYI97YgPK9DBKV3C+?= =?us-ascii?Q?u6Lgi5nhUlDx4UKngg9lMvKYIQlkmQPwkG0W8aTe8NL6YK5G5806woNLK1En?= =?us-ascii?Q?4fulOngk9WvAkYdnnBM3qPw5ACpM1AE011SISg2wyQM7Qljzv+sI9v+Mgzs+?= =?us-ascii?Q?VovbQAAkdDfMRr/rOpaXJ0n05u4kp4HaXFYfUcO1wwF/vYyBJKmrIxwYA34b?= =?us-ascii?Q?17GsW7W37mD7lk+XNvo8kZKsXZp/EDAeqzc6+w36UMtnX6XK+LVNo3T0zPto?= =?us-ascii?Q?tIlRcSXevY954qHYPAa3dVgNg2D6pdD9IX0b2BxrUfNLrQIq/OWpi7OOXgz/?= =?us-ascii?Q?p3GyboQPvBgN8TtdF4vuz4GRINQk59ER6JPkUkx7mVdSPwL9kwarsCquw2OT?= =?us-ascii?Q?mqcIH2FamhdMjnp7340EC3mzr+q07eYXnsu7OAKnc6gBtrFRzZbxtxgQaukN?= =?us-ascii?Q?wuwJ1RtRoXh1hW2ldoi4pXvJ7xooSHf0nwvH/ynTldncCyszGnR6mSsJv1zv?= =?us-ascii?Q?BP/dcr6kvN5+H7uth1L/37s9m1CrExezjDNHDQjOI4zXma7BGbYPN+LeIKM7?= =?us-ascii?Q?g/2tSIfwg7Wu0aDbdfy8sISwpAGmg2bp++5tMK12IKyB010n+bLZNHU3O8EX?= =?us-ascii?Q?JUnGwP3aRWIOVcRMg8FzKFXT5mBSjsxOB7oRQ26rYwOKlG6rxGsO2vwFw6Hv?= =?us-ascii?Q?08SQSWE8m2aK9qgXAYQHFgob/vwsCTzfdoGBJEFM8I9FICapdUg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0714; 5:q7CDkkFFBFnUxMJ9Nl9Rt4xJbuUaQiRE62tgEhGBudC/14FyW6SM/l3fOluPdTuQWNJChAtthND1+9kVMX5p3P/Blkrccb7xSqNIIXxG9p6lWZK4IysbSrJZMx7+mFlAaUpbwxgT0jTACvbJjESEH69J1hexBHVA8067Y2z7yvY=; 24:/kihDHVX+qkW+x58mBO+HI4VGng+i+j3+kBjFWg/wYlRh/4pf09xY5SuEzf9ZYABsHjZmPDjzegCoj0449uaXgWuHMbb2PTdUoFVQemajGM=; 7:bazNtHavgVqUjlz7RRaTL4jsm8NKgvrdBagErAAdLoQ7QYthWcpf8D6BPp1ywaGKsD3i3FH1F1AVAWfINj8f8qj0Dm6Op+sPiRyzmMs2VLTTPjfNQnlsEXdbMBhy1BiblQDoGuieChIIa5MGhnMKV/14RlsQ/tVs1xmNwpDskaCmIRegRSdlf5nsQbpcv0gs SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2016 03:34:51.6799 (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: CY1PR0301MB0714 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160503_203515_355414_6441159D X-CRM114-Status: GOOD ( 13.80 ) 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: Mark Rutland , ulf.hansson@linaro.org, Russell King , Yangbo Lu , Bhupesh Sharma , Joerg Roedel , Santosh Shilimkar , Jochen Friedrich , leoyang.li@nxp.com, Scott Wood , Rob Herring , Claudiu Manoil , Kumar Gala , xiaobo.xie@nxp.com, Qiang Zhao 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 Changes for v9: - None --- 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*/