From patchwork Wed Sep 12 16:21:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1445771 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (unknown [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id B4392DF238 for ; Wed, 12 Sep 2012 17:31:26 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TBqTb-0001H8-Ah; Wed, 12 Sep 2012 17:11:47 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TBqTH-0001Dd-Bx for linux-arm-kernel@lists.infradead.org; Wed, 12 Sep 2012 17:11:31 +0000 Received: from klappe2.localnet (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0Md4Fu-1Suj3i06oE-00IFaK; Wed, 12 Sep 2012 19:11:20 +0200 From: Arnd Bergmann To: Stephen Warren Subject: Re: [PATCH 09/16] ARM: tegra: move platform_data definitions Date: Wed, 12 Sep 2012 16:21:15 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) References: <1347368350-31212-1-git-send-email-arnd@arndb.de> <1347368390-31252-9-git-send-email-arnd@arndb.de> <504F5A51.9000506@wwwdotorg.org> In-Reply-To: <504F5A51.9000506@wwwdotorg.org> MIME-Version: 1.0 Message-Id: <201209121621.16019.arnd@arndb.de> X-Provags-ID: V02:K0:XHn8cbOLQUHKsUrklsEEpb+VRqqYBuJhKrCjbxCJe12 L8VK9Ch7TNJ3S6GTns0jYhGUlTrN1PhdMSDPRXZd+AmTwy2MCI D7QtIxd6jD4kncMje6MVCrLtBSdBUsK6+4IaKFAhFD0syGD8md GeOCyqXR+BT1vXQBhmkXPUERavks7cZF4CoLDAeE7aEDCruHto xLm3YObpRjiOfHwYaBvy+VDqUDLC7VQ2BSCL4PVzRgnLyyBig2 BLk7tUAHSsjHxDwfc7SuCHnMAbV54qT9D2Cd3FaSVtgT2DB5uJ Ss0DzDp9jwP6nwGLemo+wNkIGH46RLS//GJzPf6Fod4jhJ4jCY BZp6Kf+G8L9wVGet1gn0= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Dmitry Torokhov , Russell King , Mark Brown , linux-kernel@vger.kernel.org, Olof Johansson , Colin Cross , linux-tegra@vger.kernel.org, Chris Ball , Liam Girdwood , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Tuesday 11 September 2012, Stephen Warren wrote: > > .../mach/sdhci.h => include/linux/platform_data/mmc-sdhci-tegra.h | 0 > > I have a not-yet-applied (but ack'd by Chris Ball) patch to move this to > include/linux/mmc/tegra_sdhci.h. I believe all the dependencies are > staged in the Tegra tree now, so I can apply it if you want. I'm fine > with you apply this patch though; just let me know. If you want to take > your patch, then this part: > > Acked-by: Stephen Warren I've redone my patch now, the version below is what I have now. Thanks, Arnd From 1580b8b9c820db3d1e9ffce91fc741516ad5547a Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 12 Sep 2012 18:15:42 +0200 Subject: [PATCH] ARM: tegra: move sdhci platform_data definition Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This the definitions for the tegra sdhci driver out of the tegra include directories, which is the last one for this platform. Signed-off-by: Arnd Bergmann Acked-by: Mark Brown Acked-by: Greg Kroah-Hartman Acked-by: Nicolas Pitre Acked-by: Stephen Warren Acked-by: Chris Ball diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index e65e837..5f428ff 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c @@ -26,6 +26,7 @@ #include #include #include +#include #include @@ -38,7 +39,6 @@ #include #include #include -#include #include "board.h" #include "board-harmony.h" diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c index 4b64af5..112bf68 100644 --- a/arch/arm/mach-tegra/board-paz00.c +++ b/arch/arm/mach-tegra/board-paz00.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -40,7 +41,6 @@ #include #include -#include #include "board.h" #include "board-paz00.h" diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index 776aa95..8d1a66a 100644 --- a/arch/arm/mach-tegra/board-trimslice.c +++ b/arch/arm/mach-tegra/board-trimslice.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -34,7 +35,6 @@ #include #include -#include #include "board.h" #include "clock.h" diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 0810ccc..d43e746 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "sdhci-pltfm.h" diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h b/include/linux/platform_data/mmc-sdhci-tegra.h similarity index 84% rename from arch/arm/mach-tegra/include/mach/sdhci.h rename to include/linux/platform_data/mmc-sdhci-tegra.h index 4231bc7..8f84306 100644 --- a/arch/arm/mach-tegra/include/mach/sdhci.h +++ b/include/linux/platform_data/mmc-sdhci-tegra.h @@ -1,6 +1,4 @@ /* - * include/asm-arm/arch-tegra/include/mach/sdhci.h - * * Copyright (C) 2009 Palm, Inc. * Author: Yvonne Yip * @@ -14,8 +12,8 @@ * GNU General Public License for more details. * */ -#ifndef __ASM_ARM_ARCH_TEGRA_SDHCI_H -#define __ASM_ARM_ARCH_TEGRA_SDHCI_H +#ifndef __PLATFORM_DATA_TEGRA_SDHCI_H +#define __PLATFORM_DATA_TEGRA_SDHCI_H #include