From patchwork Sat Aug 15 06:41:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 7020541 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-pm@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 F35E39F344 for ; Sat, 15 Aug 2015 07:15:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D6F7C2064D for ; Sat, 15 Aug 2015 07:15:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FEEC2063A for ; Sat, 15 Aug 2015 07:15:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751333AbbHOHPl (ORCPT ); Sat, 15 Aug 2015 03:15:41 -0400 Received: from mail-by2on0110.outbound.protection.outlook.com ([207.46.100.110]:18929 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751251AbbHOHPk (ORCPT ); Sat, 15 Aug 2015 03:15:40 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Received: from snotra.am.freescale.net (192.88.168.50) by BY1PR03MB1483.namprd03.prod.outlook.com (10.162.210.141) with Microsoft SMTP Server (TLS) id 15.1.225.19; Sat, 15 Aug 2015 06:41:57 +0000 From: Scott Wood To: Mike Turquette , Tang Yuantian CC: "Rafael J. Wysocki" , Liberman Igal-B31950 , Bucur Madalin-Cristian-B32716 , , , , , Scott Wood Subject: [PATCH v2 2/5] powerpc/fsl: Move fsl_guts.h out of arch/powerpc Date: Sat, 15 Aug 2015 01:41:19 -0500 Message-ID: <1439620882-20449-3-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1439620882-20449-1-git-send-email-scottwood@freescale.com> References: <1439620882-20449-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-Originating-IP: [192.88.168.50] X-ClientProxiedBy: CO2PR20CA0002.namprd20.prod.outlook.com (25.163.96.12) To BY1PR03MB1483.namprd03.prod.outlook.com (25.162.210.141) X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 2:5Wn9tcsGo7S9xVFB3+Am2Ij/LYiBMtBgy3q8bSYehbhhu94qJg+lNxGglWIGYYjGBZZ/9IQlN3rOx4Ipf2lGpP2/L9+T1f0Y56zeZB++tHHYpeXh3hBriKYivJrA83Hk/GyGgTiEfCHWdtWllMNqhA9klpIM0xJsmudbhJPyyeA=; 3:fxghfoviMKFJgjgaXsz8EBktUmiSxYOwHVpYO1sIEg/TL7aGH4NvW9D4BL/3KNDHz5TDcksEO7R9/gDOjDrjZ4iILk4k8KGldNS+p+dhccdIxEhMFcJsUnOYT/ZmgwO9CQItJxtQIaLqTFcgc+n2RQ==; 25:7q5NQgqeTSGokGvK6xm5/bPEcL+LmbXceuFl4JuKKJdlTbrCEp+Zbblk5KXNTmj57t3PFWtQ+cCbDn0+kYi8PrJBx150yXtaOvWOzG2R1lwGwjU4nyZqvPWaZ+PtPkE3U3j+n/mnaxk1k1hP9h8uWfUwCeTua9KEWWbx4pRlY6nkf9He7RaotQpv7/zrG2ZlAnVb7hJAMtfHxVmGbwbb7ydWAFvDe33zsisR3Jk6Fv0ZGpMTb0xoZdvmFk5Dr5xl X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1483; X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 20:ot+sp8MhpI2VnBvKgeg5GSul5yIVemt603pzpToiXTRTt2DG+gUfZg3P/8YYeC3ZQg6G02La/EZ0CNi6SqdCHLC6L/A1M6xhdBfXGmuVRMXPVP/9gvIEhmz0FnITN+fDBy/Kal49GgCpOazrXlhsYWimR9kgOuFjLj+8EPEdu5jZ7tnfrg/KZ5I5ge5I6DqN1T3TsY7mByoGiHKqMwmnWFdlzMq9Iaxt2BKiHsNLUFKymITEqBauQ0H/i1DgoE+ZpPVUi7JBVcJVpP7AMfSxl6ehHDcbnmbTtDpiIsOAGTVP+GYi9lnxaMUGHqaClk7vW+bE1NRLOxDZefXCzCNQqBio8i5HWn4ri6MCDmth3PpbEdVWqA4fOL9Oq31rXvMoIwlBYHJENxRpG5+VPA+5E/pI7NgQlel9wWrVnGHmDe7jWwoYbAWKbaa6Z2LiHL0iFS8aIFg8SySElcEREk1As3t5d0J6A1XouNyAlLZJ92jPqXe4Bsi4oX5qHJHKipKG; 4:/Q+cxZKWObO1fBuw69zTW/CXuCutMCOORYCcHuSR5/mXZxZFQdzaWcQACstH8II5P2cirUlBb3D0PIPouPfuBpMGWqJq99dIQmziWMKhbyv+UhI2fp6qzcUL9N98r7kiHSnQoNzKFWbjCooA/8ZEcMtVtb8wFxjYUg3eNFkDlUuezCRhI6AGk6wgxX+elaUckX+nlLVObuR6cRCD9d/cqNl/xP9nuzTnPmWph5U/5L4XK+EzW+h5erdDU4RV+DmUSmf6fdPzjnziJ9iCS/zMZQmIMVFi2y7R/GM15KvzbwjqYoCea1T6zYzj1d/UOuYI X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501041)(5005006)(3002001); SRVR:BY1PR03MB1483; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1483; X-Forefront-PRVS: 06691A4183 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(77156002)(76176999)(101416001)(5003940100001)(86362001)(5001960100002)(87976001)(42186005)(48376002)(68736005)(77096005)(33646002)(575784001)(19580405001)(5001860100001)(50986999)(107886002)(5001770100001)(36756003)(19580395003)(2950100001)(4001540100001)(81156007)(97736004)(46102003)(50466002)(5001830100001)(4001450100002)(64706001)(92566002)(47776003)(189998001)(106356001)(122386002)(105586002)(40100003)(62966003)(66066001)(229853001)(50226001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR03MB1483; H:snotra.am.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:; Received-SPF: None (protection.outlook.com: freescale.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR03MB1483; 23:bekbzoQoGPNopdX3hCdj5yyS2xzNs+gLbfPvIOX6R?= =?us-ascii?Q?rdVNSedEZzft3Y2veGMUag4UYbnaWBFJcur2PMY1UeORDGAb0cDFYFXzZ8hZ?= =?us-ascii?Q?5gcJA/A8WIDBvD+CgSjWYyFDde2volVpbk/ksfGPj8qJPawxagtFbDHtcKKx?= =?us-ascii?Q?fsCYJVjqxaCFlTMLnt5As1TxILZorU4aJoigRW4XOcICajf4FQ2YpQHrbVBT?= =?us-ascii?Q?MoTlYw5rBlYGTcoKxkCpVzF39XSBgRzSb/Xg+1UQU2ObpT3MZ50ZdctMNnaI?= =?us-ascii?Q?8iFXsWldQa2yQ6UPfJT/GEM8n7pGphODP3GW7OCN7Y7eA675oiH7Zws5R+zH?= =?us-ascii?Q?/+TINhP/CFyKgqvs0twWmY/1M+gtUIzEaZ4InxsNSzs8rpSyOxHSNWZp3CVW?= =?us-ascii?Q?GWA9lRLqn44KdhCO5KlXFYvtazFPODXT+0iH90Z5L7Ozd0oPASZeygoz/rDi?= =?us-ascii?Q?eOAHSifS0VItuRWnb/4oK5lmDYJ2ID1uEv2nrdbc5RTPltxjCvuHFwhifU0Z?= =?us-ascii?Q?43viTAhhIrxD4s9MV7loaaCkZOI0gA3Kz+Rrj6RN9wM/9dF9e9fvFKvJJA+0?= =?us-ascii?Q?50lwPddImKOhp+yjoKWOlgqYE56avhDgxMlEXKXql25YjcWFoN6WHKgj3/Qh?= =?us-ascii?Q?6aRx9fPvstu/Ic+ebDht2i3hrxFkSetbSsEXGvB/wDND/P+1fwJSbqewhlKj?= =?us-ascii?Q?zQz31x8JimpaEjb84Hk52DdpdehUHClYfn8YhGspbeVcP0VZs8XuHX8OTdIp?= =?us-ascii?Q?TRel+HzvZnTsw+EHa2d6bp8IRse/T6pZRtaLyCSu90R2SsBq8/PfJO8QKQna?= =?us-ascii?Q?5y6hiIQAAbHM4/XzvLUIlAD9sj46o08BL3F6T5ZL/2fK93W5J4GpMkfGY98e?= =?us-ascii?Q?zs3zgDZOeHE1aKz7yWxQRmXJfx8iBq6Xg6UE8Bn+MzmNgRRBb7J7aG5upi/U?= =?us-ascii?Q?B01cpf7aHXd4L+TQ2/ZWDySpEM8A65VoZ57RPS1jxtILUMtZH96zIhSv6sPv?= =?us-ascii?Q?gNNIqHpMeMOqUhOhrbBj5N1R7s6hXKmFLJPXZa36Z0sM6DeJcO5OnFt1wMsi?= =?us-ascii?Q?L407ScSAmDfIt/JuydZVIHVo+C49grs5+MxCl9OAQyN5Khq7ldZO7svTI4IF?= =?us-ascii?Q?8Wb9DOEE+aqSOA+IuJqpQkChSRAI/kqxgjwJ0mJAVWkp/iyNI8Ec33I0Itqu?= =?us-ascii?Q?HXyudTFOCiRCOQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 5:6TPxZc+b+ifz1ZLsSZE9ebQ0F//FyBxOv1hwArCZxoH4k+sr35moyYLICoAPPa4AL3An/78XgqiSWo62M8ZC555IBxYTZy/mVmBWbKtW/ajk4hJXEIq50LNoqy8jOtCf/0u0gQDfLO1sqngJF8uYVg==; 24:L9hIeTS4Dp0kSZqpgxsT7c46FGcCKYRgPWnj30kPqrg2fQA2vKWwjIx0sm7nBPK7Z+jQ7oxf9aWStbUxjPgbXy3hwW2pry+EjRzTg/mVhMg=; 20:VFU+diX2jyEPFU+ItYZE0QKLwBe3I3K8xpDpffCvSu71FM48M7QaN7Z+eSGjTtahcD6ndnc2prHVSiwetHbf/A== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2015 06:41:57.6034 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1483 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 Freescale's Layerscape ARM chips use the same structure. Signed-off-by: Scott Wood --- v2: non-RFC arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +- arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 2 +- arch/powerpc/platforms/85xx/p1022_ds.c | 2 +- arch/powerpc/platforms/85xx/p1022_rdk.c | 2 +- arch/powerpc/platforms/85xx/smp.c | 2 +- arch/powerpc/platforms/85xx/twr_p102x.c | 2 +- arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 +- drivers/iommu/fsl_pamu.c | 2 +- arch/powerpc/include/asm/fsl_guts.h => include/linux/fsl/guts.h | 6 ++---- sound/soc/fsl/mpc8610_hpcd.c | 2 +- sound/soc/fsl/p1022_ds.c | 2 +- sound/soc/fsl/p1022_rdk.c | 2 +- 12 files changed, 13 insertions(+), 15 deletions(-) rename arch/powerpc/include/asm/fsl_guts.h => include/linux/fsl/guts.h (98%) diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index a392e94..f0be439 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -51,7 +52,6 @@ #include #include #include -#include #include "smp.h" #include "mpc85xx.h" diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c index e358bed..50dcc00 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -27,7 +28,6 @@ #include #include #include -#include #include #include diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c index 6ac986d3..371df82 100644 --- a/arch/powerpc/platforms/85xx/p1022_ds.c +++ b/arch/powerpc/platforms/85xx/p1022_ds.c @@ -16,6 +16,7 @@ * kind, whether express or implied. */ +#include #include #include #include @@ -25,7 +26,6 @@ #include #include #include -#include #include #include "smp.h" diff --git a/arch/powerpc/platforms/85xx/p1022_rdk.c b/arch/powerpc/platforms/85xx/p1022_rdk.c index 680232d..5087bec 100644 --- a/arch/powerpc/platforms/85xx/p1022_rdk.c +++ b/arch/powerpc/platforms/85xx/p1022_rdk.c @@ -12,6 +12,7 @@ * kind, whether express or implied. */ +#include #include #include #include @@ -21,7 +22,6 @@ #include #include #include -#include #include "smp.h" #include "mpc85xx.h" diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c index b8b8216..6ac7786 100644 --- a/arch/powerpc/platforms/85xx/smp.c +++ b/arch/powerpc/platforms/85xx/smp.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -26,7 +27,6 @@ #include #include #include -#include #include #include diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c index 30e002f..892e613 100644 --- a/arch/powerpc/platforms/85xx/twr_p102x.c +++ b/arch/powerpc/platforms/85xx/twr_p102x.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -23,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c index 55413a5..437a9c3 100644 --- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c +++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -38,7 +39,6 @@ #include #include #include -#include #include "mpc86xx.h" diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c index abeedc9..24705c2 100644 --- a/drivers/iommu/fsl_pamu.c +++ b/drivers/iommu/fsl_pamu.c @@ -20,11 +20,11 @@ #include "fsl_pamu.h" +#include #include #include #include -#include /* define indexes for each operation mapping scenario */ #define OMI_QMAN 0x00 diff --git a/arch/powerpc/include/asm/fsl_guts.h b/include/linux/fsl/guts.h similarity index 98% rename from arch/powerpc/include/asm/fsl_guts.h rename to include/linux/fsl/guts.h index 43b6bb1..3acf613 100644 --- a/arch/powerpc/include/asm/fsl_guts.h +++ b/include/linux/fsl/guts.h @@ -12,9 +12,8 @@ * option) any later version. */ -#ifndef __ASM_POWERPC_FSL_GUTS_H__ -#define __ASM_POWERPC_FSL_GUTS_H__ -#ifdef __KERNEL__ +#ifndef __FSL_GUTS_H__ +#define __FSL_GUTS_H__ /** * Global Utility Registers. @@ -189,4 +188,3 @@ static inline void guts_set_pmuxcr_dma(struct ccsr_guts __iomem *guts, #endif #endif -#endif diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index 9621b91..6f236f1 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c @@ -12,11 +12,11 @@ #include #include +#include #include #include #include #include -#include #include "fsl_dma.h" #include "fsl_ssi.h" diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c index 71c1a7d..747aab0 100644 --- a/sound/soc/fsl/p1022_ds.c +++ b/sound/soc/fsl/p1022_ds.c @@ -11,12 +11,12 @@ */ #include +#include #include #include #include #include #include -#include #include "fsl_dma.h" #include "fsl_ssi.h" diff --git a/sound/soc/fsl/p1022_rdk.c b/sound/soc/fsl/p1022_rdk.c index ee29048..1dd49e5 100644 --- a/sound/soc/fsl/p1022_rdk.c +++ b/sound/soc/fsl/p1022_rdk.c @@ -18,12 +18,12 @@ */ #include +#include #include #include #include #include #include -#include #include "fsl_dma.h" #include "fsl_ssi.h"