Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758503AbcDADR1 (ORCPT ); Thu, 31 Mar 2016 23:17:27 -0400 Received: from mail-bn1bon0068.outbound.protection.outlook.com ([157.56.111.68]:26336 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758270AbcDADRV (ORCPT ); Thu, 31 Mar 2016 23:17:21 -0400 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; From: Yangbo Lu To: , , , , , , , , CC: Rob Herring , , Russell King , Jochen Friedrich , Joerg Roedel , Claudiu Manoil , , Bhupesh Sharma , "Zhao Qiang" , Kumar Gala , "Santosh Shilimkar" , , , Yangbo Lu Subject: [v7, 4/5] powerpc/fsl: move mpc85xx.h to include/linux/fsl Date: Fri, 1 Apr 2016 11:07:30 +0800 Message-ID: <1459480051-3701-5-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1459480051-3701-1-git-send-email-yangbo.lu@nxp.com> References: <1459480051-3701-1-git-send-email-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131039542371798919;(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)(199003)(189002)(77096005)(2201001)(36756003)(229853001)(92566002)(19580395003)(5008740100001)(50466002)(2950100001)(33646002)(5003940100001)(19580405001)(11100500001)(2906002)(87936001)(86362001)(106466001)(105606002)(189998001)(586003)(47776003)(81166005)(104016004)(1220700001)(50986999)(5001770100001)(1096002)(4326007)(48376002)(76176999)(50226001)(7059030)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR0301MB0712;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;MLV:sfv;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD047;1:+CbuDSbZbUd56bRrxr/50pTxqwxVXkonRFF520Tlxu8/Xi7mok1egfCgG7AJfmKXa9GM2mAF38NTkKqN191+33XxHgSTJeN3jFqFFNSWE2QUzVfGx4V7eFtKzBSIP2wwuAo5PUzLK01iuX3JyPrm6ACtTZK5Xk5yQVLxWBWLLWGxHFA54xYI5KucHgObtlnI6dHNnFjzvz2AFoAwm0pjiwDYCLXkfu0Cfr7Z7AraA1FTT5ZhO8P7DufD4z2mXXACq/6nAs6MZfI60WnvhUkFWDcL4IacxfXVyggMIbhCAe9JJNqZlyEq1GyHXV4FdJcyln0wJ5rO0t3qDdO5Z6i3XvQgMu/g5RIZDHJA2T+JSn15/lhzVO/GWfapEUIjS9o40hvBPqLc0JkUvTPo4D5SIpjSRE4CRa69rJ57BJv8cW7uouEbdvqgdtmV924K9DQsJ2irFF4BTSIlwPCsgicY/X/hkhfS61GTXpV39RhgepHDI2xKMKf1/kkR+CWj9MNZIDruEolyoYW1OuZEBpjdub/+K8iOraanWsNmFrMs0YDgQJLX9ksU1C8hPszpPwdav+aKeFNA4jzMQrBju8JeDID1+bxOkdO4oop5UQzQX+MjGh5YdQpveM/KeKzjfn1h26FIodDBUiP9gwNH24qr0QJmxJTgob4OnavZqu0qx0KbwiDLN8+m8v7NjlwDRTSLD1Bx2fCSKNAmuOzaXIN9bA== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 03a2a693-f53d-4c22-6330-08d359dc20fb X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB0712;2:AE3pRnariLO2QPXAhfYDMJm5e9q5meIErMkEZ2DZLaxb/FbNeXvi8+l3f2WzVGrzJ5bTG+DjkXyrCmqwpfZHVQcbYJ7IBj0WCgR6q3N+KokpH6vZV7vIF0cNALIUACynjmL6H4amThVm72vHArfyEuPD7rwHFKuu+DIHXJYypYFSC8NEnVhGKj0IQBplWfFs;3:oWnoHxV2lz0K0a/Yc9neSpfkp59W4vq1MQ/lm6ZRfsyxGub88ZaaQLS1aOw40SIancZfSteKNEsNtr6M3C/ZZOaMAAnsqooGSfM3h4BC4qezsY7ryPKpOXFtf2V17xbhGlAFErJguLMDExfvBled2RZuWo+iGwnXGtqskPdkKMuVjtggSzPS8+VtPPsCjKxC8Wy3HeSejatRsRRVq+UiUYL9CzyH8aEXzm/J8I9e8TM= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0712; X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB0712;25:7EOPvkt0xayX5WlhM69XAAXxLctnIWqM1qEEYc2GcG3JssFmf5BmIgbkkWV4b/0loLHoxQ5mBMFgwuTgetAhmOTWjpmaybwNTbuSolfVzeA7yKWLpsynRFCd4dFgKmj1ZboenoSJm9ci7B1CwOm335Q3TXGl3ZmqwKb10w41O+MN/+DbxMcgALFBSINuHaxaXqGc64e5BSDlatYgd1sM5mzEXmDQDDPf9ylgM2TQaYvJ7JCWqVxXN5ZRQxenY2J18eQhppcUFt4754wYBvfNFMYn8/sWdE1Q8PkyTflq1CYEORVtDC1mNyFmoz3DnAjUBCAVCEhDjKWp9cYweV7DSe/2YdduxyPsd9ihyGiw8uW32GITQ2lwBlrRWMb4RU4E+161P/5f7mPmDxLbTA0ZWgGw2cDZwSl4wJwZn87/pTGgLXM/TvoJdyK8qMJY0RVqKNYdXKrSgSe8XqKrcKSRcIMDLP8Ye0uCujl4kL1gk2ApYNW8gEmaOfhO48/N/mQD1vAwEdQ6I6H19Sifq+PzZYYjpHHLw4GDwuS0xvXorQC+JFWC372wCbi5ZvrshBSOYX0nV4BfOSSCENRuzMWTvehbPkIak/1PtZPX7dw7ekU= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(8121501046)(13018025)(13024025)(13015025)(13023025)(13017025)(10201501046)(3002001);SRVR:BY2PR0301MB0712;BCL:0;PCL:0;RULEID:(400006);SRVR:BY2PR0301MB0712; X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB0712;4:ucA/vDJVHomaF4ZsOufazN5REBw9l+D7APPgMR/cQjdDz6+hIESajbwVpOcEvfnbNbO6jnJjcdCRj+sCRHxQNVq3TtnoUpjiWinaROTihamPi1YjEZ2M63eTkAWCaVHvu7hMiMPjsL/n9i9J/19X+ox5SqLHuSv7dHyxGMFzuXDSL+TQPjj4GJFiwv3drnec7uGXxFDHVOAEdi8yHctVBotiOv+sUol/NX8UWOLz9KFOLXWS9j0JHOWPDJxqwcRMrr6/q2QeLrKDYAf+shgyy3S4ZFZYjtFFOBKk0UJDRIwugkN1RifgXGKe3g4ViOpORqx8nuKxjx0nZk8hFYb2alDjTqSfuoDZKO8e9f7RDXdqjcNVWdT1ZX1lviUS20AkCESTJ8Hb9bAb1vRRfau/pIzp0YOoehjzxrRzu7Eb24JiDacxGcTMPGJgvlPzSSSjz0XlXdDUuUA+duGTiEy3zg== X-Forefront-PRVS: 0899B47777 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR0301MB0712;23:1O6khznXF71n43jOsq0wHhMVrZ8BS+SQWB/qxRR?= =?us-ascii?Q?eAxftMOwKVmko0hW+Sa+bZlf1Np9Tjaq93RomCARXAv2aEzwqsc44pq9CpEo?= =?us-ascii?Q?b3yY8mZg04/GG2II6h1suGdfchMOs262DoPe4uFf/9vnHLA8yObivvOw12bn?= =?us-ascii?Q?VA+Ihmt9OPTfb1XS/3aKQ+uQTjYyWgJUDcjmQ8ULsBh24q/fxjqfZXnjizWh?= =?us-ascii?Q?i0mB0iT2SKLw++M+kTlSadThD6QUDOzos+FbkRC1IHohrCCdhU8f6asDziHH?= =?us-ascii?Q?xKvCFldU2QZnH57wDmkhqDC+CBu+pbgihhl3d30Fit2B4AFcaSEvUtXItYSj?= =?us-ascii?Q?rTGRFVIQNby5h5qwTYm46EYXdP8NJDFTE5sgChniDFdkAkbPtyPuPJORJAuD?= =?us-ascii?Q?XgedxXLx1G1wxPF512goQUseVrZ76SwLKee/9IpNvxL9vOCn0GdxzYhDS+vt?= =?us-ascii?Q?7EHazz06Alx5uRM+90Yv+Sxfi2VFJlO3dMJJ/TPR9kEwadnmjaU3KZLIzJfh?= =?us-ascii?Q?AyDg48ZwTo6qkUyy095+JahHf2P6d/4XA7D5JOQJxCpXKgaHdj3I1fU4N6ZB?= =?us-ascii?Q?YAwSsT0W2138CKdbRvIcpLySOoB04M1jOqPf6zykjWbgPbTYwQC/RoQ/9sNF?= =?us-ascii?Q?JMtWUzLXHoAH1TYBtWG5Yh8FNFNgHQ2m7KYMk/mqbJE3NepyAe9KZ+OnOMIR?= =?us-ascii?Q?jhhXR8etAOnmvX9vI0xT8lkds54RT7MIxsEUg5tu3wPZRMurB5BM120Ebxfd?= =?us-ascii?Q?6pnCUl6W9xfIispSrwBOh7sfeQLctKE8cJp2JhEaP9iQKh9lbbrzslInf6hQ?= =?us-ascii?Q?09bigul/4zdYxEhnO0O2lAn443KutYoKFBQl1FCpEX9l3sNT8BuprKfNef75?= =?us-ascii?Q?CNAXX2xG/BMqxeNSL7NGpL81HqVkaiv20d4kKLzPMl7vrk6EK4Yqz1/cECEA?= =?us-ascii?Q?MnMH4QTBBlOh0rJQAwTC99s0jReoqlVE2Sr6xTxRC5LGWTjQSZfWqanPqebl?= =?us-ascii?Q?NcVACQ2+/EKPdfdkLDksB9ZGhvWNeNbpMjd5Z3sd59gxMG5yFaQmS0HrUXK+?= =?us-ascii?Q?BY3i4FxU=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB0712;5:4VkstgdW6Z+ah5cSU3t9goFJsdKctIfcexiT8Vm2T6xhd1G5rXMPm+fJ2j16+7+uWDxmegrkVBrW7U3sK+rK9jSzrUczi09bmyNrBb6h17nBPr03e/BComhMh65bwe7n4erV/+6fKuqGtRGBKbPwqCrqg4cUOGp3rDSFfnXId4c=;24:z4e8cJl7SPhJ9TnEoTy9URT+LCB8qMb6eMNd3M7gTc6wKlQzCYUAFIBJzAgKZN956nB4xsUI3p9yhJ4pATJMQD5cf8gZji27ZseSZBrgfaA= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2016 03:17:16.8210 (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: BY2PR0301MB0712 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4226 Lines: 140 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 Changes for v7: - Added 'Acked-by: Wolfram Sang' for I2C part - Also applied to arch/powerpc/kernel/cpu_setup_fsl_booke.S --- 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*/ -- 2.1.0.27.g96db324