From patchwork Wed Mar 9 10:08:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 594989 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7D9A4140297 for ; Wed, 9 Mar 2016 22:14:12 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 5E2A31A1A24 for ; Wed, 9 Mar 2016 22:14:12 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0096.outbound.protection.outlook.com [157.56.111.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41CF41A0008 for ; Wed, 9 Mar 2016 21:53:40 +1100 (AEDT) Received: from DM2PR03CA0026.namprd03.prod.outlook.com (10.141.96.25) by CY1PR0301MB1322.namprd03.prod.outlook.com (10.161.213.156) with Microsoft SMTP Server (TLS) id 15.1.427.11; Wed, 9 Mar 2016 10:18:43 +0000 Received: from BL2FFO11FD025.protection.gbl (2a01:111:f400:7c09::182) by DM2PR03CA0026.outlook.office365.com (2a01:111:e400:2428::25) with Microsoft SMTP Server (TLS) id 15.1.434.16 via Frontend Transport; Wed, 9 Mar 2016 10:18:42 +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=none action=none header.from=nxp.com; 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 BL2FFO11FD025.mail.protection.outlook.com (10.173.161.104) with Microsoft SMTP Server (TLS) id 15.1.434.11 via Frontend Transport; Wed, 9 Mar 2016 10:18:42 +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 u29AHmbL007157; Wed, 9 Mar 2016 03:18:33 -0700 From: Yangbo Lu To: , , , , , , , , Subject: [v6, 4/5] powerpc/fsl: move mpc85xx.h to include/linux/fsl Date: Wed, 9 Mar 2016 18:08:50 +0800 Message-ID: <1457518131-11339-5-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1457518131-11339-1-git-send-email-yangbo.lu@nxp.com> References: <1457518131-11339-1-git-send-email-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131019923225310508; (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)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(6806005)(104016004)(81166005)(2201001)(586003)(5003940100001)(19580405001)(106466001)(1220700001)(11100500001)(19580395003)(105606002)(5008740100001)(50226001)(4326007)(86362001)(2906002)(76176999)(36756003)(189998001)(33646002)(85426001)(229853001)(2950100001)(50466002)(48376002)(92566002)(77096005)(5001770100001)(1096002)(87936001)(50986999)(47776003)(7059030)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB1322; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD025; 1:QOlicovOsESFv23TP4apVabIHcZWAnPx7mxFb21/xVa0l1XRvGpFMCBVWmuliewGpdwdlksI5T/fg4nZlgGIANSttyeikSj5QCnNJHRiJa/FVKvhvTJ6ICIpOrKtoLpINqEMUJnicKvkgXzIfez69Tsrc2FrKYVtWY1/RFKdDpHPtsh8EGNoS1DF/FdiJnNQeWe2Xk/37JAH8NE4vFjz1fhUq9JlRpw1i6ykWWLjIf6GOU1f2S6UBXxDmSPc9u2rSKC+qQJZ6xfhU5EIJ6bilLTe176fximD7vTOsJqd/KbQN/fRS1FkC7J39bOIOWLuRCvQUORERaaey/8iSVFwOylKYBFXUC8e5E6sI0RxpesPJgQH581aiLsBSuQ7jwyw5m47/ppLg2c4zxYg7ltf1dQDN98x6zC2IJ7B99WACAWd6ChgNh48eUJoWvFRsKMgksb81gt0A1i7zaXfIEjlNM/DE/AgeWA4g879NT5NW5E/0Hr0R91x4gps58whOAkkX85flHZzwHGzBTd9VpCyjTMEJFkSy1+xsqqJvTNP0QGetVkBarVyI/Gr02xLerVuY1FFXGlUuzxyKmA4pas+0wNZVKZkuG2cZJ2vJoucF1A8oW46VIBL9lXXLt5weBAzpmEnRUqxSpLg4B8CiZzFtQ== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 9a7d5a3e-2a90-488d-93cc-08d3480430cc X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1322; 2:cF2wJ4dksGU8+cl/mtNFxIxJ1xTke8GM2oMlDAVPTp/6q6B5ccQlRJ1NvbgopcMe7JxZyUh7qAzyYkeQdP8gsGu6VVkrLE52zxebBXU4LQ+b1yJaN24OMaepN1JRYRVVKiueEGPoTU1CC1Y96m/HR7dc4MDnV/GLxGaFnV+F/1kMZazR6WJ7OMw4MbemvdV4; 3:7zANG8Nij87GGkBI1mi8th8SknrF6joRA+fRGsiJmEuhxIQ0YeYNRkEV3VvkyaczFGWaOg2lnlf12abm7pBYNI4X7lgRmNmfCKRPKdU5lx3eWb+kkBnOSkO22zDLR7uLgsm2yJeoJAIX0wzD3FOfABjzJNSjEZd9za7Ims9qWhEpyt4nx0/Z2aJ5eHBFssby2SyY6jAkp9Fla/MtCxaoarEfFAHyELn2+MVJIKtPLJY=; 25:XL1SoP1fM+OmC1Y1JLwPrSkq469pziZpy17CqJh2MSQBqKoUWr4FQSZI3cRHHmX0i4MTbgqfQiYdjKuZRhjHSg8e3aKhp9Rx+ml2T9kGyNOeItq9xo/gdQQch+cgFEkYEmd2apRtTI+jscMFSPnDPt22Oc46/a9Rnjj/bb9R/hrfaNgRScEVsa8WphGy3zG5QB6gzzGeajCEqDGY4tGIPw4rv8B2E/ErrfA9Wd48hVPON56PZT99e21/YkxVGqfW0h0h43hsnXZc/qiQSWckD0K+7U2vLopugysDcaKWLzDlUzpeSsq6gNXBBnLhCgohx/xhfTmaPohn9r8mz7kYuv51Xo9I7YPAjPk0qvEeP3T9vq7Nir63IfmifJ660eFnYW/GbHJ0N1Qh9mP15BV8Nw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1322; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13015025)(13017025)(13023025)(13024025)(5005006)(13018025)(8121501046)(3002001)(10201501046); SRVR:CY1PR0301MB1322; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB1322; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1322; 4:xnhPAiAnlepJ28QSUg16DF6ir8OxhFJC2tNCSroCqJZ+7rYxxDo+XwR1qk9zzahPvOBua8Nz9ya/31KT9Nhd4T9RAOBEKQn+tNH6yEuYlSkHweBfMRGBMfvfNs6Om0ehTyNqBKcT8n3PztgMpO5DzxtPWvTG1qiBgvnMGr1PNd5JgGItdDCkAzKtp4P482cXemrfng2I2NFDbvXy08tuU+ZE0Rhqd6UMXcZ/hOagVYOkBFmSWJiuQG6FVkeAcnD+AKjGMD/klL66BB+E0qSGCWYkDXi8wycsIS3dQ42AqsVEDS0QE4t8Ka/+HYXIQYbovoPtD1DqBOyE6mqYJMD240xbq+uqlWRzLCA/y5T1VZh8funPM9aAjCendh5eHhynQ7h+k47RwS+XFHwsgO2NmethnG2+hIrjHpyGBKQJj5sa0SGkV3TserxABBgRHKRazxdWHdRnTAp13GlNG4MaEw== X-Forefront-PRVS: 0876988AF0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1322; 23:MRC2AVFF3+QdDbo9OK7cQ2Xv6A85Cjdlc/alRke?= =?us-ascii?Q?KWF+bhymvjEdV5ZB2I6FCdVSWucesDysQqiaVt/s2hexqQcO5JJXms+cTMS8?= =?us-ascii?Q?eO7zlcR7c3I+54gYcAZlBPqGUxJZFbra3hZqgnQwA+rdmEjfO0sJAhzhi46x?= =?us-ascii?Q?CjWb0CG9d+IT0NTgXxWgwunNywr/MC+jOCo+91bho1HGkBviLn8Q2ggWvjs1?= =?us-ascii?Q?ftnaOhi2tAEzRpde9CQY6fIJiP7hzX6CW04PppCD6jRsBR7NVLI1uz40yd67?= =?us-ascii?Q?LB4iw9mM0mg0xAh7IImL+MEArX2eeItStl2X1mrKc4RjWSklPCi1BKXQXtyv?= =?us-ascii?Q?8PzkFbK4i13aT1wwSyw8BzC/fK2lQxDug+iaBMZN0TNzHR9e9bhrZGHTCJdd?= =?us-ascii?Q?ud/phOtLIx213C65c6hHWxnyYcKwz9VihL05EunV+2ylFwYa/D+VUejrPrTU?= =?us-ascii?Q?lu81kcV1vJDDNsk7WJl73tQ2n05c4VLutf4UdiQT3Vlk/zVxgMFQ6aLUmLJM?= =?us-ascii?Q?zqe9ZY54/+ViJ/x1/zBQEzixCeH/ds7gW6A25Aa880qY63x9CLAAV8ziS5OW?= =?us-ascii?Q?XLCaue0mqVVBkgwkr4ZtMFTKz2TQ4H9NaLIOZTB0JAb1GH0de73VghcAVrWe?= =?us-ascii?Q?3/cKF58Tcdqq4Mi4/02wgxo4VEQDR+WLljUpIYCPv6L5IwnKRaIE9FIvQSeH?= =?us-ascii?Q?8s5HvSCPx2E/w0TxFPp6JsjBiTelAn+ji+zfQMLaE175hA/HAYHiB7c8ydEk?= =?us-ascii?Q?8hAOa8OSocsFNsfEDCXFDBSKQoELDrNhr1TCGO0aQUAu0PJoLXGxePKYfuHU?= =?us-ascii?Q?8DF0oYoyStNYqzfpH1zM1brusoYCFcH+le+1NpHEGVuOW2G+8rGn3xDwT42v?= =?us-ascii?Q?XxPZhbTxxWsz4euGGqvR6vfl6zcypG0dx7dQd3FIBv0ACBICsAH2I535LcOw?= =?us-ascii?Q?jjw8OKDmoDGAH2qd1LP2xGrcWx+AnEUwEVj2txVTqLTaAn7gv1+YP2ZPdgyP?= =?us-ascii?Q?erV6hVp4CjAmHPy74idvU+z6BfWQH5HStdpIlgZlA9qMfz43jidXvD5VWdCc?= =?us-ascii?Q?xgJI5UGIb18sXsTW0KM+mCgllC2gr/AvP5eOVXcTWE+aGnIKvVA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1322; 5:bvGeycM2OYL7ExRMm2R5XGDHsL+GqKRnd+d7OvkidIrfPxz+Ae8mppgCjCW14rCO4vHxnxlI3vknNWu8Sa2hTl5duKTyEWqCGbJLS0jGhnVrtWPgrifqk2vj1aaSm5duYm+EAW3tpZrzrHlkhHOOYeAeSF3hKq36n8sn3xVmbfE=; 24:IsAqiVjMwKynRNJ2M7IptEa7gNb2TjAzvDBjzVMtusxjZ1vCylJmx0h7Yx69L6MbBBuwI7pFSKqedwXR7b6ggVleUS+tLw/Ao4t/sELnOIg= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2016 10:18:42.3282 (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: CY1PR0301MB1322 X-Mailman-Approved-At: Wed, 09 Mar 2016 22:07:03 +1100 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List 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 , scott.wood@nxp.com, Rob Herring , Claudiu Manoil , Kumar Gala , leoyang.li@nxp.com, xiaobo.xie@nxp.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 --- 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 --- 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 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) rename arch/powerpc/include/asm/mpc85xx.h => include/linux/fsl/svr.h (97%) 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 2aa7b40..675da4a 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*/