From patchwork Thu May 5 03:12:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 9020221 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 BD6829F372 for ; Thu, 5 May 2016 03:24:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A2BD12037C for ; Thu, 5 May 2016 03:24:55 +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 8E8152025B for ; Thu, 5 May 2016 03:24:54 +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 1ay9su-0000Yf-7p; Thu, 05 May 2016 03:23:28 +0000 Received: from mail-bn1bon0060.outbound.protection.outlook.com ([157.56.111.60] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ay9se-0008Uw-3E for linux-arm-kernel@lists.infradead.org; Thu, 05 May 2016 03:23:14 +0000 Received: from CH1PR03CA009.namprd03.prod.outlook.com (10.255.156.154) by BN1PR0301MB0705.namprd03.prod.outlook.com (10.160.78.12) with Microsoft SMTP Server (TLS) id 15.1.485.9; Thu, 5 May 2016 03:22:50 +0000 Received: from BN1AFFO11FD007.protection.gbl (10.255.156.132) by CH1PR03CA009.outlook.office365.com (10.255.156.154) with Microsoft SMTP Server (TLS) id 15.1.466.19 via Frontend Transport; Thu, 5 May 2016 03:22:49 +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 BN1AFFO11FD007.mail.protection.outlook.com (10.58.52.67) with Microsoft SMTP Server (TLS) id 15.1.485.4 via Frontend Transport; Thu, 5 May 2016 03:22:49 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u453M4sK004368; Wed, 4 May 2016 20:22:42 -0700 From: Yangbo Lu To: , , , , , , , , Subject: [v10, 5/7] powerpc/fsl: move mpc85xx.h to include/linux/fsl Date: Thu, 5 May 2016 11:12:28 +0800 Message-ID: <1462417950-46796-6-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1462417950-46796-1-git-send-email-yangbo.lu@nxp.com> References: <1462417950-46796-1-git-send-email-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131068921697612033; (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)(189002)(199003)(229853001)(19580395003)(2906002)(6806005)(11100500001)(47776003)(8936002)(2201001)(104016004)(19580405001)(106466001)(86362001)(48376002)(33646002)(85426001)(50226002)(87936001)(92566002)(105606002)(5001770100001)(50466002)(81166005)(2950100001)(36756003)(586003)(1220700001)(76176999)(4326007)(50986999)(77096005)(189998001)(5008740100001)(7059030)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0705; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD007; 1:aqJHlmV9vWlBG5z3CaPevQPwThJeTB1FwNV1E9JyW7194nYBjcB7sDKa9ZlRmjGwGq8sc168aY3o6B7sJs/L6Aq/mkzbhTjcvWPVKEIRl3+FERNnTyZmyKuIgyYaIw4k8PEI38sG138B4jPYnwenTX4X6BpNecoA0ydqp7iVl8j3LsLfaJEyAkTYAncrNcXjlPC5fOclHoBKxEzM/dHXUcQidMZaK1zBqbHoCL8Zkg6d3v3B/heR598KYp3+RLsPFGG3iwPT/shtWcxoDkFDRipOMVSJtPQf6+VHG9ZVyfHOm49ybzyk4FBg39PtY9w07LB9yDX+S+gw9oEEZ3KSaBOl8Ol/YQp9CGgx6qfIHZzH5MUpftvKWeLoA2yHV0u2UdGotZnyEzHGpL/ZJ3Y2vkipaeAKQjoSBBYd+9K10TYff4T6N9djKSU8VkTHu18lT9xdkjPfO4bP43K8T0d1uCoYl+LyNVMcLIRVWaW3kLdgNGdM+PdknR/Lwrzja+TX0ejGDmDZxz6wjc7+/HJXuxzHzyBDdSOhrQKig7E9JdGkBaZB2CiolUOwNlk5QD/iugw/G3UAiecsXj9oMrtSAAlD0rpMoc0fldhvHXs3b0sSXqQAT/GIZcrYUgbFV7aC8QIW83MLzN1htjYORspTSmTjcBtQVImZZDT1L2Ry1z2cAaxb9LVOuwGkpzP18F13v3KjnE37CZ6QTe5qT0de/iPzfOI4zz4sC5CIzUuQtwo4KMwPhaGBj9JY3RlRP3f/ MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: b558aaea-abce-4128-cf9f-08d374948955 X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0705; 2:P+aMIsANpcS8Zi4HFeiXXAYCBQosVdroZ0USspKZlqrYYXHYJRDr2M62OegQsyEEd0SatnleExYxVufF/AOPs7/gYpYIdus1xJUKHQfBEGZL/oKoV62ors/tkDiJS8GpmeUvT3atCb9khGae7U0Tw3IhAOrbZhPkb0aorvo06u/Czs09Z3FhQnT/9p9ydGP2; 3:sP+y6uwKX9LJ4L1GdrLMxscjrZqK2GFI3ikFdmhLo7qfm8SkEqEj+1QdTcgLEgnKNEXUlnSoqqGDaWjnmCyoxGciPAkiEu5xW7iDaSxed9VqVTk8feFKwFMe5g24xkP7rMFc+6r4CMePbLbFLc6YDlZkmLAXjU5wC9uNijKTFbgSM+SBM4TjyXKPpmh4lP8N4l7SFBsFt4JgO3K9kRJrhoCyu4dgfx2LbM6uCtWEiMI=; 25:Z0NoH38lyKRp3+ajQf+AQtCXstClBv+dRNsIwSAhwMAouKoySLzBix6SWIoBb87X3vLBW70Wj0LbnTjOehjjjJogk+B9PnFqhaVJ5M9PgG2gOfZLBTAIXD67TLcenr8zhz+YnWcqVMk8soNBiBWhpImHJ1vCb4uNf3IxY5T6IBBIAJKkQSQI1Hp4XRLw6qrVE6+X9Kt+eJNTwujSM6+nwi0B9+lKxMO/RCgKdnLn2Zoe2xvKD1B1UtHjT5PxoTI7vLU118r42O29o4NBa0IKhGJIBkTswAsm9ECWmrKTw7HdZJQcq7f1zay4+2R+XHO//ejs9RNgR6q74EuWP/2aSgWk+RpgrPWAFaiguB2m8cFk24a2hvawn2WElyx4cPsQ+P0UJmezCIh+ZGlHzhYL9xxTOYayNR7mwnx6eXp4s/B3NLnRMUB66elwCdcv6lsc X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1PR0301MB0705; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(13017025)(13015025)(13024025)(13023025)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:BN1PR0301MB0705; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR0301MB0705; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0705; 4:mviwIQBvzZdp4TrA/mMIx1IbJNSEKaxkegXr9em0S8YwIyUWWYiCB4ISsHOoF9qms1fKkeiU5E1ECHlQigwTsZFWFhi4+1WGSb4rgG9mboMxovpeaVw/MEudt+Pq3Up8pgTHTlM+74CLQtFvybSCLt+ttn1QjI1Wq6lBVcayvGX6EQBBz4RgKl5zKpmBm9n1xl9rsYGKNEj0nQoRqW2H1XosVwEWB9P69QL1O5L8l+FGRsWvZJWUrVisSWvqXjtAl+50I+FtzzC/bXPoECpRA1h/qBvXvlxu56ED5TNFISl2IGcOd5CVnuexiZKtD4vuAlWL4eKjYtXw1ab5Nr7dJXdhj7AY3QvpEWyxR5vEzbpbmACS4wc30XEWMRa5O50o6p1Dk0jz6EM8fSeZdwlWaL93iduuGsx88h5Tmimv2Bx3Ir1Sn7o+ligE0BfSsT36V6heVv/MlpY09EHyPnrLmwe8Uy3f/z7bAjwIDgE3YSU= X-Forefront-PRVS: 0933E9FD8D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0705; 23:xfT3lWOQN7gMcsySHtrcHyNB4UJsv4ffVQcRgnv?= =?us-ascii?Q?+/oTEgfXvyUC60Pgduju9TSSSSxfKtI3Jg9MjvxVsejSN4Mj9ooSxhugFJa0?= =?us-ascii?Q?nddsBDoSURZmisVSVcCWTUvYo7CEIBbBYeJs3Tq0Mh+0C6JNbgkfMXMYOa6M?= =?us-ascii?Q?fQT32uD4Wz1HlU/A79kn+gpneZ8IrjOXQXuEP2225gO8b+YVnHrykstlGtNd?= =?us-ascii?Q?lE2o1VghltW6vl0GlS5eS7PhgjtphW0qUVQqeGEEpKsLeer7PJZ58F07BHIZ?= =?us-ascii?Q?d7N1kD4x0d6YH2+/w86n75C9bksckFWwakeF9vP45fpl+oS9p50GyGQ7sW+h?= =?us-ascii?Q?FZgxy/B5sxwOHxcsh/ZMb1DfIOqmT6Y8ocIzrTtZ9+89ahP16qE6CHji3vs/?= =?us-ascii?Q?NYGvlk43lEO2kWu3x9BGhPrhNM5czien/MfuJBe3W23JQHx62kQ2SuAHHcKk?= =?us-ascii?Q?31MvUn/VeUSz0IAAG6134PnB91dyqnqVXSi7SxNpoqCo52slVXlzOUPVEcq7?= =?us-ascii?Q?wBAEl+7AoTDBDHD1ognQMerH1ifkz0CLaFsf9CTV1GxYIWhrg3Rg0IEnPPnG?= =?us-ascii?Q?XacM7SiBoFKuZLVP9yiLIL0ePWG+oWewtYP9w9uQkAmS679ST6wUSoySN9Sz?= =?us-ascii?Q?A+8LdAjMQflXFICEnZDWpEFiFGxJ1XECMH7ujFDYbhinx1UKLb3pMP3XS+MT?= =?us-ascii?Q?Gq7GewuNG/7NKl1hC5cZNqqajBpV0qtChgWMY4R9V6LsHgRNW8PD2JjX+Uvq?= =?us-ascii?Q?D85m5OgpT+lo94AY1UJ/TuZWZFyKVWzpkrx0aFSCZLGVjiwuka0xqVkPIoP3?= =?us-ascii?Q?piIkR55QAHTQnkw0ZdXU0Ttf+maB9zot7+37BoqvSkTzeJNYaryd/CbE7b5Q?= =?us-ascii?Q?uV8UKTphGKZhXCIVn5BrcMnvZxM/peXjMPM0fXKPit/teBICwK46fg9iLQV/?= =?us-ascii?Q?9Ezp3dO0k1dG4+Ql7SDDX+C5endQMcjXXcA/YK76z0X1EBkdb0gc6aEmjuNl?= =?us-ascii?Q?YkiEGl9QfkrW+fwpteW/FuBCrEtoW8T1bn5/iYuxIA9uR/ugZH6VMBswUc+H?= =?us-ascii?Q?DWSmxhNI=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0705; 5:st7d0/1AJf4SPXRtTI3SxQRpHIhHRS/og/hWtaEpQa+6O8xjkoQEoVN5NIRDdCYkinEneXR0XqnHlm6dG4fl/dCLVYqCfjUS8TNCTDEPVqsxemx+t9bxwrId/f6tudkDHGGCrB9IYhTcXXwe4f2hD/Syft9VIrvxI5CZwrxjgFg=; 24:m+46BCi+l3NgX5yjZ2EGzjO/lFE2JYIVGB05dqOUl3igyz4+vhWoSbqvSNGimJf9pmksXLp4bjZ+2oO/zOdtQiCVm2rLj6Jm88D6csCJmBg=; 7:muoGimMTkcSNrHvIya6wx+yg1Zx12cSOMEb98xqCIL6k/G+SqxG/tooENcFlFGKxB64TzvMp5RMjLcvzkzN69zAgltUx4DR09x50KnByxQ+yUImPi11FKzk6uUThwdFpPEYfeZ5qgZvclJJ35O/6aIqzCTT+Vo2XKlFJRR6hl8+gJIWQoN/p90uRvz+9MqoG SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2016 03:22:49.4491 (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: BN1PR0301MB0705 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160504_202312_409046_B90AB16A X-CRM114-Status: GOOD ( 13.76 ) 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=-6.3 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 Changes for v10: - 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*/