From patchwork Mon Apr 8 15:23:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 15979 Return-Path: X-Original-To: linaro@staging.patches.linaro.org Delivered-To: linaro@staging.patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AE3DE23900 for ; Mon, 8 Apr 2013 15:23:47 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id w68sf2565153yhw.5 for ; Mon, 08 Apr 2013 08:23:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=GUc6o7hUT5kdorGOuC87sHep0QFUODfu7pDx5K/Xhbg=; b=kfJhFduufY0Dk7KCekFa3i1+HXFVM0gnVk2r6p7Z6bEzGEn5D+Rh78jH6ZUF5NHxV5 PJK3N6J/uSp6tIqtvejHViG0enwoWi9zVRm5ySsGMTVGQjoRAb72SQyIMHqrN1JLI4Cp 2zBu9AB1CglBGbopISLYizBU3eH4DZ/rLsdiQfEaT+z93xm+/hMLaiiN/GaCORCX7tK8 gAflttrVhB+ZUWLWqZD/gtras966k8Y/hJEwqe7NPgx/02yDy7aNXMOwLu2l3M8Zeb/N H17ldqDPcxgmFCpAYEvJgrk9bKcfRUbmkx7yemvld2ghup/BOEN2qlvGX9bOcUIg21Iy 2oqQ== X-Received: by 10.224.72.199 with SMTP id n7mr6057896qaj.5.1365434612671; Mon, 08 Apr 2013 08:23:32 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.25.83 with SMTP id a19ls3084814qeg.33.gmail; Mon, 08 Apr 2013 08:23:32 -0700 (PDT) X-Received: by 10.52.23.115 with SMTP id l19mr13878440vdf.55.1365434612564; Mon, 08 Apr 2013 08:23:32 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id n2si2889322vcj.91.2013.04.08.08.23.32 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Apr 2013 08:23:32 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id lf10so1506161vcb.15 for ; Mon, 08 Apr 2013 08:23:32 -0700 (PDT) X-Received: by 10.220.153.143 with SMTP id k15mr16369631vcw.13.1365434612381; Mon, 08 Apr 2013 08:23:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.85.136 with SMTP id h8csp23473vez; Mon, 8 Apr 2013 08:23:31 -0700 (PDT) X-Received: by 10.180.72.228 with SMTP id g4mr13807277wiv.22.1365434610675; Mon, 08 Apr 2013 08:23:30 -0700 (PDT) Received: from mail-wi0-x22c.google.com (mail-wi0-x22c.google.com [2a00:1450:400c:c05::22c]) by mx.google.com with ESMTPS id en7si6777710wib.1.2013.04.08.08.23.30 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Apr 2013 08:23:30 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::22c is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c05::22c; Received: by mail-wi0-f172.google.com with SMTP id hr17so2687570wib.5 for ; Mon, 08 Apr 2013 08:23:30 -0700 (PDT) X-Received: by 10.194.176.228 with SMTP id cl4mr12094229wjc.10.1365434606263; Mon, 08 Apr 2013 08:23:26 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id j4sm20277893wiz.10.2013.04.08.08.23.24 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Apr 2013 08:23:25 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/ Date: Mon, 8 Apr 2013 16:23:07 +0100 Message-Id: <1365434591-21569-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQl2DSUyaAdj9k2sHOc9yrayLijRfJwtOdp/tIboUGU+BI2B24P08O3azIZ9x0y74jpvhlYu X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The pin names for DB8500 based platforms need to be moved out of ux500 platform data and into the new proper location in include/ linux/platform_data/. This way we an reference them from other external locations, such as the main DMA50 driver(s). Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-audio.c | 2 +- arch/arm/mach-ux500/board-mop500-sdi.c | 2 +- arch/arm/mach-ux500/board-mop500.c | 2 +- arch/arm/mach-ux500/cpu-db8500.c | 2 +- arch/arm/mach-ux500/devices-db8500.c | 2 +- drivers/dma/ste_dma40.c | 1 + .../linux/platform_data/dma-ste-dma40-db8500.h | 3 +-- 7 files changed, 7 insertions(+), 7 deletions(-) rename arch/arm/mach-ux500/ste-dma40-db8500.h => include/linux/platform_data/dma-ste-dma40-db8500.h (98%) diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c index 7209db7..1f8c6e4 100644 --- a/arch/arm/mach-ux500/board-mop500-audio.c +++ b/arch/arm/mach-ux500/board-mop500-audio.c @@ -9,13 +9,13 @@ #include #include #include +#include #include #include #include #include -#include "ste-dma40-db8500.h" #include "board-mop500.h" #include "devices-db8500.h" #include "pins-db8500.h" diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index 7f2cb6c..e4c0a74 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -19,7 +20,6 @@ #include "devices-db8500.h" #include "board-mop500.h" -#include "ste-dma40-db8500.h" /* * v2 has a new version of this block that need to be forced, the number found diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 87d2d7b..dd95399 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -48,7 +49,6 @@ #include #include -#include "ste-dma40-db8500.h" #include "devices-db8500.h" #include "board-mop500.h" #include "board-mop500-regulators.h" diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index e027865..8553e14 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -35,7 +36,6 @@ #include #include "devices-db8500.h" -#include "ste-dma40-db8500.h" #include "board-mop500.h" #include "id.h" diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index afa5b04..a7c0e521 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -20,7 +21,6 @@ #include #include "devices-db8500.h" -#include "ste-dma40-db8500.h" static struct resource dma40_resources[] = { [0] = { diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 1734fee..35f97d2 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "dmaengine.h" #include "ste_dma40_ll.h" diff --git a/arch/arm/mach-ux500/ste-dma40-db8500.h b/include/linux/platform_data/dma-ste-dma40-db8500.h similarity index 98% rename from arch/arm/mach-ux500/ste-dma40-db8500.h rename to include/linux/platform_data/dma-ste-dma40-db8500.h index a616419..f538917 100644 --- a/arch/arm/mach-ux500/ste-dma40-db8500.h +++ b/include/linux/platform_data/dma-ste-dma40-db8500.h @@ -1,8 +1,7 @@ /* - * arch/arm/mach-ux500/ste_dma40_db8500.h * DB8500-SoC-specific configuration for DMA40 * - * Copyright (C) ST-Ericsson 2007-2010 + * Copyright (C) ST-Ericsson 2007-2013 * License terms: GNU General Public License (GPL) version 2 * Author: Per Friden * Author: Jonas Aaberg