From patchwork Fri Jun 19 02:49:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 6642931 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D8235C0020 for ; Fri, 19 Jun 2015 04:22:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C145520929 for ; Fri, 19 Jun 2015 04:22:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6486520921 for ; Fri, 19 Jun 2015 04:22:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751283AbbFSEWW (ORCPT ); Fri, 19 Jun 2015 00:22:22 -0400 Received: from mail-bn1on0132.outbound.protection.outlook.com ([157.56.110.132]:4512 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751226AbbFSEWV (ORCPT ); Fri, 19 Jun 2015 00:22:21 -0400 Authentication-Results: linaro.org; dkim=none (message not signed) header.d=none; Received: from snotra.am.freescale.net (192.88.168.50) by BLUPR03MB1475.namprd03.prod.outlook.com (10.163.81.17) with Microsoft SMTP Server (TLS) id 15.1.190.14; Fri, 19 Jun 2015 02:49:34 +0000 From: Scott Wood To: Mike Turquette , Tang Yuantian CC: "Rafael J. Wysocki" , Liberman Igal-B31950 , Bucur Madalin-Cristian-B32716 , , , , , , "Scott Wood" Subject: [RFC PATCH 3/8] powerpc/fsl: Move fsl_guts.h out of arch/powerpc Date: Thu, 18 Jun 2015 21:49:13 -0500 Message-ID: <1434682158-7243-4-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1434682158-7243-1-git-send-email-scottwood@freescale.com> References: <1434682158-7243-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-Originating-IP: [192.88.168.50] X-ClientProxiedBy: BLUPR08CA0070.namprd08.prod.outlook.com (10.141.200.50) To BLUPR03MB1475.namprd03.prod.outlook.com (25.163.81.17) X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1475; 2:CJS3QZgQkWreOPUVolMK5wDNDDavTGwLCDTUOlbBkOwbeffGt13HMtaeuPOymu9G; 2:96IztN/h5rOe50Pzgotf3q5+g9tUzj9t1gSbtFpo3s53VomHRbhrPCMoIN2BufDkSfN3mriVcP+ZOm4mSKYAvYQIuTljDi2KwxphZNQiZEfE+sXll79zFWyIXfoUA17WYjtg9+qR40v7eHuDA0AMzQ==; 6:gYcBbvr3Jf/og9ysVQbOJboXpAs0LEdRvW3qhW4MBmW9aaRKgmwO8+E07DDVRFzFEWXdBGuIzo+mVSzguH8NfWfDR4eOBLUIMrH1icgGvUICTNNgXgHOMfx5xkmwipCwbdL4vbcOq6HdmDoVtpgZD5WntOAoQyhdSEEqQ4xI+XbSVbgUiMJDZQUPST3B10K53Tlvc+76CYMHclD3f3u9N6I/n6nLeJaTDHi69B4YYuSvv88Bkf7w/VB8nzA9JDa+hdIMZabCXOUX8mxQGk2zRmyo2vj7Al39iww/n0WjfZogPdD87LxLbubmvex1gHSc6dx/xeV+jfzAkz7/SRYYkUtgZl7u3J7LbIV/lc22qamOS55vUpS/X5Iioq1pRoxQbb5S84TLiFmd9UCAUxzjluxgX2hvsBvqBHovKmET/a0uT2u6/EaWQqvdDUc1tLAE5TVHnN3papid/MjPuCV2sS02NDQi4PE7osdj2d59VwTWW3Es7GGO7N2yOiDdVsQCTO9MfMlDWzpDXY19jtHNj2zjFVN4mVm7/S4vHuvGdZQeGAyXrA+APmF+yIvfpHIeYCOTDFZSHsMQaW+4pdPcEx/pKYPaqT7+g5HvaMKJOPE= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1475; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BLUPR03MB1475; BCL:0; PCL:0; RULEID:; SRVR:BLUPR03MB1475; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1475; 3:1V4Yx8SCNDkB7Q4RecJShpiRhPHNfrc0+Ak25R7+4TikM+qsDm/6c1zYcdiWnGhuYQJ4dBrRIOD5Z0wM0GFvQidXBB2JoAqMx8DrwWxhfP9gQObAYjDnCM61mnx9t3TUfBTKmzp0IzTGUNHLEU48nbjMgQ3p/mPF0YP0NtfmBdqedIq7mpYurdFE8t1BbJjd9+gOk/pBY/E4RWW/1xsaZmHinP09oOnYJbG1R6eQCZYU/Ch3GBHBCGnLQlUtg56aZS90h5v3TDc4BuyXTZY6RGL69nxknPM8oHtWnqn8JDI= X-Forefront-PRVS: 0612E553B4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(575784001)(86362001)(77096005)(33646002)(76176999)(40100003)(87976001)(122386002)(36756003)(50466002)(189998001)(50986999)(50226001)(92566002)(48376002)(62966003)(77156002)(229853001)(42186005)(5001960100002)(19580395003)(107886002)(2950100001)(46102003)(66066001)(19580405001)(47776003)(5001770100001)(4001450100001)(217873001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR03MB1475; H:snotra.am.freescale.net; FPR:; SPF:None; MLV:sfv; LANG:; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1475; 9:ya/R1cPR/UpDkax9ICGTxGxPKZYYPO81/u3tHDtf/Xypzc9xd1LUPHldiv0j5dr8OI5ell1ytSE81iRd0K2eKHFGiJBji4mvf9axRW1dWS7SsD1rV9ejjZLBAzBwf+ETOQpl92H29iqWoRb2+RKZCP+S/sJKxXsY3mk4V0HnB9W10sEiURYOHsUMOYqMGW8oRh2Q8rabwZTwZRZbINyCGPvZ6Ds1f1M9Fim73z83izdCNS02YNXMfHkQsOhatDsQM6QySHVIyVeJUE4rV2mkCxluN722tCDbK69qAoZ0Ah6pItKMCHE/T/Hf9pRoPAtkRHUvfDZjcy4S/d4y0gj2eD2D3RC2bF1Ofq6tqanqAnmSYx6ESKfN6ytpqwqcikf+BZYUKs8dYMj1WUCTp+/AV45l3Xuapbbww0ZqoLgvzvkhicRfFPAbT9h4MpFV0GoW+TfI03xdIBO4dNvIzRfJjgDXtu8hOp7HcwF88ueIut3EbIa6o+B+sVyXPGWf1VcPt2EdjFgf5SVJ7abzD+Q6m4wZ1fu1vsCAdQgGIqaqX5phi7gAkFbpoRvYIuzYPV1n5J3oIzxYsfhGM0rfJPalg/wytCDTSbTrnVOAoor8gVTl8DS0FNhiaeYNwsPjS2kWszFRt8jxlrpH7i0dF9q/jDIquAacj5Bc+rcoZVFG0vsXQv+i76Yb9IcVC9Kv/+J3JKOEBmOJRstHCxVu32QA/HrhwV71+JxtXGPc6q3hCPZL77IEjeHF67rH8eGlbVvY9bVzEs9gqNMkHc8tkTIkLZW6QF6x16NyUixvnNBqaY7uqsCNPDWAA0aFgcEyUm/Bl1Bo9V8QOnnG8yksH6QfBmQiQQc+uKEnmLltjwTs3z6Z5CNjxHNNNAyMFyEGZkG3XzfyRsAprRnuuXQzY25amA== X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1475; 3:x7bjSclugMQyhDsUCXboIFMbasbHBzCL/sGaMsEq6x6OibY4LMGGUke1zrAS6Y63VmBt4A4eQmePfzpwAwQcZB5S656CHdNBOCodUHeVCzb8B/bkNZW3W6Csa+jguWOQeXwPhRQOcPM25Q8NSL3BGA==; 10:swYTnR15F13Ihp1BzAeIRsNRK9GkXVak6hnGQMnh/dXZG/7QizHbpsbmRXFTTcykPK1RF6zF6NckI1W+PeLycmG4tUECwWxR66WCP2csbK4=; 6:ZedFHmRYJA4/8S5U7Jo3BHENfyoTSNcISnHB7OwT4n4YZ42MIrA6V5smOt0RU/2X X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2015 02:49:34.5878 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB1475 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 --- 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"