From patchwork Fri Mar 4 09:38:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 8501421 Return-Path: X-Original-To: patchwork-linux-mmc@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 15D8F9F38C for ; Fri, 4 Mar 2016 09:48:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0DCF420142 for ; Fri, 4 Mar 2016 09:48:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F209E2013D for ; Fri, 4 Mar 2016 09:48:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759801AbcCDJsA (ORCPT ); Fri, 4 Mar 2016 04:48:00 -0500 Received: from mail-bl2on0057.outbound.protection.outlook.com ([65.55.169.57]:58322 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759794AbcCDJr5 (ORCPT ); Fri, 4 Mar 2016 04:47:57 -0500 Received: from BY2PR03CA005.namprd03.prod.outlook.com (10.255.93.22) by DM2PR03MB317.namprd03.prod.outlook.com (10.141.54.15) with Microsoft SMTP Server (TLS) id 15.1.415.20; Fri, 4 Mar 2016 09:47:54 +0000 Received: from BN1BFFO11OLC003.protection.gbl (10.255.93.4) by BY2PR03CA005.outlook.office365.com (10.255.93.22) with Microsoft SMTP Server (TLS) id 15.1.409.15 via Frontend Transport; Fri, 4 Mar 2016 09:47:54 +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 BN1BFFO11OLC003.mail.protection.outlook.com (10.58.145.14) with Microsoft SMTP Server (TLS) id 15.1.427.7 via Frontend Transport; Fri, 4 Mar 2016 09:47:53 +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 u249lWMW028762; Fri, 4 Mar 2016 02:47:49 -0700 From: Yangbo Lu To: CC: , , , , Rob Herring , Bhupesh Sharma , Zhao Qiang , "Kumar Gala" , Santosh Shilimkar , "Yangbo Lu" Subject: [v5, 4/5] powerpc/fsl: move mpc85xx.h to include/linux/fsl Date: Fri, 4 Mar 2016 17:38:40 +0800 Message-ID: <1457084321-10003-5-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1457084321-10003-1-git-send-email-yangbo.lu@nxp.com> References: <1457084321-10003-1-git-send-email-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131015584738413298; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11OLC003; 1:oqzj+yUPIBu6AQUEwNtu75OjDn00ThzbaBnATwTqnOhesaUGxLj+CqG5auaS+1fU0NVzbVfWPxrQKODGOxLekwZmGw2z3Evdk6QOTIbj6lI/QZFXDBn35I+8iTX7EXQYOuhwn8s9+6U+RsiEF27fcZ3itI6LqJS0b/qh944SBkL1nIgmFWkkcVztLXi+i7vSxIDYSUvZh3Nn5gtxGkdQbbA7EBPzhcKSkxHaJJMe465+ad7fd2peWtqOzF3f4s9KLvcDGpWV5upbs1VTw+al6ryq7gORATS6w/r/jJPzqAQh6ra0DGkeDZ9NMcvcUWouRoXYEyfMmMvecr/zj3FpQ8ug0YdQpDqR+rbP+iQhPjr0dpn6OslR8/vaQH0Ween82HgvTAfn4ixcFn2XWie/LW5TgMQDToW3850XA3wklvyGPmiIeoJfr6udqL+8NW1wYZ535KyEenGkYAuOodDyFqyJuSufvlVqJQqcc7bt6bNEYjRRr5ghM7rJmwj/jIPIRpDwGfIPcy3PQX/KDcNSFXaCdZvkDQkTcvIvnZybRqjnp0jj9F0nzazChEGWFI1GOZjfh8S+BeJ4P4CHM2zd4HNwe8HMDl1z1NtcRTh6wnHEnfWC9c0ky/fy6HjBZ32C X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(586003)(189998001)(50226001)(1220700001)(1096002)(110136002)(5003940100001)(19580405001)(77096005)(92566002)(19580395003)(2950100001)(6806005)(86362001)(2906002)(4326007)(85426001)(106466001)(2351001)(229853001)(47776003)(36756003)(81166005)(105606002)(50986999)(5008740100001)(76176999)(48376002)(87936001)(104016004)(33646002)(11100500001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR03MB317; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: af183e4a-567b-4551-800a-08d344120ec3 X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB317; 2:mmkyzybRErH4LA9Lv6YPWbmAha+YnP13FGc72ZiC90X+KhogVbPk4MYqUW/G4g8Phxu3bSMl+PY0EZeyd6B01vKkJVyM+XuNtALkrkS9Ny7b68pDMWXmGYO9TU80aBariFVjdzB+3+WysyoHwaUEb8SW9RIDAWzywCPoOZduhtrq4ByjAFhTM1z3QLd1fpB0; 3:yBej+x9J7KBlTkzj/jzlrezbeJVXbe1YuKYNCNARg9fslDp4MoOufWk85iipjqJVXutJIr3rCSjLMktsPdqidjIKPfxbR5+SNKR0jVKwkcitw9oOlJB+cQKCVu01Lgq50UebP4RxO4MKVR5nZozqdQXnr5zHr81/3DhzZjTWHBgRecLusAlj+kL+kcuTuPMocw7G319Vh+KWUEJeOqjxG7ie/5oRdXERCIIESxUtzT8=; 25:7g5a71oYkzquTj8P1L6HRHrR74pb+O6tHBNtfOfqJf25oAqu+R6PhXbI9IuOmrxi7vukV9qYDGuyQPFYmVl3Ub06kJ6hCwTxnvimnZeW4+ZSwJX0lrSi4EpqVnw1ElQRhktrcmJAY43zSlkOGaUaOAfjkEuKEvY9V1eyV6I/GUCINioymZCzPTxRtcdK7q2E+sALUrBWcWp1j2nEb9VbeZvoFIL+l+ZshR64PtjSUhoHInjoaZqcRiUGA5lJTaGRHzJLJyfkP7ShClfgJ4jEGTH4zwppxBP57nkrUqC8Cx/sCodIa4Sv6HT69CtjjF5wlQoA8cDjCX2ykylRjBq92Q== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB317; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(13018025)(13017025)(13015025)(13024025)(13023025)(8121501046)(3002001)(10201501046); SRVR:DM2PR03MB317; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR03MB317; X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB317; 4:lwJF+oT2w+Q8NTr8oO3COCoLCeFuFJLHCa/kTzh4XPAQF77AIq4HTmmQ0BN00XkfBuOLLMu5SVccFGN5tdeIBfoWhE/Gjz4JHIsdhnYT8N925uMMWPwOSqQ+0bozKn9sdf9JpKCUsCzXRjtwuXTGS/cUqhFuQ9BFztgkeg9yVVP+j1wGCFPT3SoiIlUh4uZSRteX4M5dbSrN0ZLL4c2EvtdmyPHGyp4X67ySR4jSQCYNZgguUlOY65aOdx1IrvQou0/jPBZ9q4pYCHrYbTa5YKhfxgWrdzMud3mJXrbvgAWgVS5plRrY7OfFhQA3Z19s6ZWXZWebMPLADWdhqo9Yy3yvfiKx9u4JbKzJ6niTrLEouFfMMkNF3x0WL62zo7M0eIe1L+1+Cj+XN+lYkaEvYAzMHUf93fUgwcDYUlH7FXsC/VyM/wtXjtuGCyzgevxC1Flk5Yj3ou0GZ/zMyn6kSw== X-Forefront-PRVS: 0871917CDA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR03MB317; 23:9CCupnlfcM1mxtz1y+P4KA44QK/lCK6pxdCZM/VbY/?= =?us-ascii?Q?XozTD8HQyQ6hid3jknvKiTCQIDSlZvJcFGl5WblG21zeZY5w2Vy9Vi49whOA?= =?us-ascii?Q?7TshXptHgfXZStPp69HguxgQGL0MGbZ0L46JZ8QMPOmEQ4clyftAsbaL9IM3?= =?us-ascii?Q?ZcT0puV8LDfkBLdASt4UfGSBUO16KgIwmMK4JlzFoC4KkjgqAylNPKKQku/j?= =?us-ascii?Q?/akE8lVviWJvZCohE0KFXnV06c8UOQ3bkuafvtUmnZmyoZz0WR1CcG+bav1r?= =?us-ascii?Q?/wjWLsdTvaFeXAB+BE7nEVy43Bsua2eNgaomBucMV+U+hdVjmc5euBtg//mn?= =?us-ascii?Q?FSVgpJI85jZEinG7DgZyrN9gU2OkBUCd6PCCilqhTYMhSvrV28RwkUtZvKhO?= =?us-ascii?Q?yp5n+R+cNRBq9rbOMZv61w8IFbiQoxp9N+jqGsoNOegiz6h5KfA4v8NI3YmJ?= =?us-ascii?Q?BQB8vNV7vnjVfWJWopzlMHrHW5/ZbZRNCJWejIxt+4Dyv9p8egO5OMl3Rzhj?= =?us-ascii?Q?AiTjQI1LLEv4YL/CegyYcqsI2deP4aNQ6XUoSHMrrNrGcJrNMVy19a4NyKAd?= =?us-ascii?Q?yfZk/3eAbwqdhOQEDU/VnTLmhB0kzJzC80XZJzHAvVueQaULdF8j335RU+PK?= =?us-ascii?Q?zDrTJyJlaIiqp//gO/kC1pcYmviO81qec+65HIeuCcN7FpHmxY2O/uULj+Tl?= =?us-ascii?Q?4CeMYs8Xid992rXM/XaJWoW1/718ImF+NusNdPqGBVbMw5N1jEFSlsDJVp5i?= =?us-ascii?Q?MXNSaNk4U73TKqM7sf9XWyn23EjOpt1pF7GcIAjJMo3OPnRGVAKRWUgu+YtN?= =?us-ascii?Q?pXXRvbpysdGCEJK7g3VDNTbXZrXrMkcjuVQtJcicP8HPiUrCu+fmeBVY1dIm?= =?us-ascii?Q?YYl9bOdntVRxQdPpM5DdgvdIqOMesUxJ4W8ql0OvYe7Jog3mD8mpDM9LE7IL?= =?us-ascii?Q?SguRBUB3RyCxoOae7z7kW7QkbDPN7xkPp9KHL4lzzKXYP+RXXbuXiVatb+fI?= =?us-ascii?Q?eAFFB/nbliNi/FXYzxeMEQ8jorber3NBFjxxLoRiCBew=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB317; 5:JpOXc+S8ECrfXyQWCAklyjx0VqXfyWiYEoEH+bGzAOf+p+M8zumQ5NiyU7Hv8EoSSwdySVU+dofgRGC3ot1WG49GJc88C/QegAKbmw+rcRJnytuDIHVCwiii+BhZnIZB1GvVtcVWJKVtrrUB/xtUogeQUXLLO2PBSnSATVUUX60=; 24:0fAEOWQShcZwuDSOW24TsePshFfxRyLaF89euwdOfdoGZCmvzDoVXhXXsP9USLGl+rBpQyG/HiHKGPdRlI6jAwyWgyiySOnC0f6qZA0OebI= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2016 09:47:53.4825 (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: DM2PR03MB317 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 --- 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 --- 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*/