From patchwork Tue Sep 11 13:02:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11318 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 18D4923F26 for ; Tue, 11 Sep 2012 13:03:59 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 7A87DA18BF3 for ; Tue, 11 Sep 2012 13:03:58 +0000 (UTC) Received: by iafj25 with SMTP id j25so362643iaf.11 for ; Tue, 11 Sep 2012 06:03:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=jpg/AwcLGbNCAbpfKc/eVwfmMXlsY8oB3ASou8sy2U0=; b=hpElI/UbFpiMXQqR7l5AVI/iKclQ5Qe7MEmICbrXkP3jLIC5lZE6/iFIWHEQYwmwLz jroTjcCUwKHG2Jg+228A2hHSNzsGC7QD5TfwvgEM1UK09KsaRjvVJzZSrGtkCUCIXHHF uQEPesEx9sbWN0ldJHoZdJgOrapTqQmFgV5Qs8y8pXWm8H0b6+f1vlh/PNLOo0nIkj6F k9KzyDxIsvPqgG8x6hpqzGvDizjsmsGLZhy/mTxPoy2IElI7dWYnypz6P/KdJCd+AWPH CzNH2YemRglLjCSG272ilKTxsMsQK+YsHW5RCVRfif25+FI860pqb/Zkj/IrN+GA8RPc zbiA== Received: by 10.50.242.3 with SMTP id wm3mr16123276igc.0.1347368637820; Tue, 11 Sep 2012 06:03:57 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp12045igc; Tue, 11 Sep 2012 06:03:56 -0700 (PDT) Received: by 10.204.130.83 with SMTP id r19mr4714912bks.92.1347368636057; Tue, 11 Sep 2012 06:03:56 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.9]) by mx.google.com with ESMTP id hc17si9237111bkc.132.2012.09.11.06.03.55; Tue, 11 Sep 2012 06:03:56 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.9 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.9; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.9 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.boeblingen.de.ibm.com (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0LqFBg-1Tp8ae2kKG-00eHBa; Tue, 11 Sep 2012 15:03:05 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Russell King , Arnd Bergmann , Jason Cooper , Andrew Lunn , Vinod Koul , Dan Williams , Bryan Wu , Richard Purdie , Nicolas Pitre , Chris Ball , David Woodhouse , Alan Stern , Greg Kroah-Hartman , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Subject: [PATCH 14/16] ARM: orion: move platform_data definitions Date: Tue, 11 Sep 2012 15:02:37 +0200 Message-Id: <1347368559-31329-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1347368559-31329-1-git-send-email-arnd@arndb.de> References: <1347368350-31212-1-git-send-email-arnd@arndb.de> <1347368559-31329-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:XEPkcZqIFPsCpmKrBgzOe59xXPDNHYxGC4qm6vTBpUv 4u9K+9Phs5QYMtx73BZnfQbiWsL1JW8xW0H0ewaAUo11yfvcMN 3oQ8R46lF/FUvR8DGzJrdYIBEO9MFUxEpPrl7Xon989pgt6/HA Kxl3nE1huSEH/dHl32B2nlgV3NqOMkkEvwQkfaAC2w9HbQLbJU gRJrRBfVabkH9l4bcwas5vrTaDhIQBZ2IQZSZE78jof6VeIye4 /nhPiJBMQONOquD11FqBqxKj6oO4/Z7RNI/avoUrZCfQveXfnx 7IqQbskzXsUUF+7Fv+rf391UP1zevtdTzqO/LFVbYtt4TldNtm Z7DDS5OjtU1BKNeH8blLJmgce8szqwreJxdGahKT6kzefEIlGs CmcuZlGteSLNB9ClQW7I+U8U8CwWIlzPLU= X-Gm-Message-State: ALoCoQniO9ucsfZgUTd3s9MJYIbTfQphwKLXHlirRNRSqn9StK9WOWV/wzmjAo9grVCozS4AO+PO Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the orion include directories Signed-off-by: Arnd Bergmann Cc: Jason Cooper Cc: Andrew Lunn Cc: Vinod Koul Cc: Dan Williams Cc: Bryan Wu Cc: Richard Purdie Cc: Nicolas Pitre Cc: Chris Ball Cc: David Woodhouse Cc: Alan Stern Cc: Greg Kroah-Hartman Cc: Liam Girdwood Cc: Mark Brown Cc: Jaroslav Kysela Cc: Takashi Iwai --- arch/arm/mach-dove/common.c | 2 +- arch/arm/mach-kirkwood/board-dreamplug.c | 2 +- arch/arm/mach-kirkwood/board-goflexnet.c | 2 +- arch/arm/mach-kirkwood/common.c | 10 +++++----- arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +- arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +- arch/arm/mach-kirkwood/dockstar-setup.c | 2 +- arch/arm/mach-kirkwood/guruplug-setup.c | 2 +- arch/arm/mach-kirkwood/netspace_v2-setup.c | 2 +- arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 +- arch/arm/mach-kirkwood/openrd-setup.c | 2 +- arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +- arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 +- arch/arm/mach-mv78xx0/common.c | 4 ++-- arch/arm/mach-orion5x/common.c | 4 ++-- arch/arm/mach-orion5x/db88f5281-setup.c | 2 +- arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 +- arch/arm/plat-orion/common.c | 4 ++-- drivers/dma/mv_xor.c | 2 +- drivers/leds/leds-netxbig.c | 2 +- drivers/leds/leds-ns2.c | 2 +- drivers/mmc/host/mvsdio.c | 2 +- drivers/mtd/nand/orion_nand.c | 2 +- drivers/usb/host/ehci-orion.c | 2 +- .../audio.h => include/linux/platform_data/asoc-kirkwood.h | 0 .../mv_xor.h => include/linux/platform_data/dma-mv_xor.h | 0 .../linux/platform_data/leds-kirkwood-netxbig.h | 0 .../linux/platform_data/leds-kirkwood-ns2.h | 0 .../mvsdio.h => include/linux/platform_data/mmc-mvsdio.h | 0 .../linux/platform_data/mtd-orion_nand.h | 0 .../linux/platform_data/usb-ehci-orion.h | 0 sound/soc/kirkwood/kirkwood-i2s.c | 2 +- sound/soc/kirkwood/kirkwood-openrd.c | 2 +- sound/soc/kirkwood/kirkwood-t5325.c | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) rename arch/arm/plat-orion/include/plat/audio.h => include/linux/platform_data/asoc-kirkwood.h (100%) rename arch/arm/plat-orion/include/plat/mv_xor.h => include/linux/platform_data/dma-mv_xor.h (100%) rename arch/arm/mach-kirkwood/include/mach/leds-netxbig.h => include/linux/platform_data/leds-kirkwood-netxbig.h (100%) rename arch/arm/mach-kirkwood/include/mach/leds-ns2.h => include/linux/platform_data/leds-kirkwood-ns2.h (100%) rename arch/arm/plat-orion/include/plat/mvsdio.h => include/linux/platform_data/mmc-mvsdio.h (100%) rename arch/arm/plat-orion/include/plat/orion_nand.h => include/linux/platform_data/mtd-orion_nand.h (100%) rename arch/arm/plat-orion/include/plat/ehci-orion.h => include/linux/platform_data/usb-ehci-orion.h (100%) diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index 4db5de5..29d63fa 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include "common.h" diff --git a/arch/arm/mach-kirkwood/board-dreamplug.c b/arch/arm/mach-kirkwood/board-dreamplug.c index aeb234d..20af53a 100644 --- a/arch/arm/mach-kirkwood/board-dreamplug.c +++ b/arch/arm/mach-kirkwood/board-dreamplug.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "common.h" #include "mpp.h" diff --git a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c index 413e2c8..001ca8c 100644 --- a/arch/arm/mach-kirkwood/board-goflexnet.c +++ b/arch/arm/mach-kirkwood/board-goflexnet.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "common.h" #include "mpp.h" diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index c4b64ad..bd5ea69 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c @@ -26,15 +26,15 @@ #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include #include "common.h" /***************************************************************************** diff --git a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2net_v2-setup.c index 6e1bac9..2c1a453 100644 --- a/arch/arm/mach-kirkwood/d2net_v2-setup.c +++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "common.h" #include "mpp.h" #include "lacie_v2-common.h" diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c index d933593..044a631c 100644 --- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c +++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "common.h" #include "mpp.h" diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c index 61d9a55..23dcb19 100644 --- a/arch/arm/mach-kirkwood/dockstar-setup.c +++ b/arch/arm/mach-kirkwood/dockstar-setup.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "common.h" #include "mpp.h" diff --git a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c index bdaed38..7cb55f9 100644 --- a/arch/arm/mach-kirkwood/guruplug-setup.c +++ b/arch/arm/mach-kirkwood/guruplug-setup.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "common.h" #include "mpp.h" diff --git a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c index e6bba01..88b0788 100644 --- a/arch/arm/mach-kirkwood/netspace_v2-setup.c +++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "common.h" #include "mpp.h" #include "lacie_v2-common.h" diff --git a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c index 31ae8de..a3b0914 100644 --- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c +++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "common.h" #include "mpp.h" #include "lacie_v2-common.h" diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c index 7e99c3f..134ef50 100644 --- a/arch/arm/mach-kirkwood/openrd-setup.c +++ b/arch/arm/mach-kirkwood/openrd-setup.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "common.h" #include "mpp.h" diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c index ef92207..9717101 100644 --- a/arch/arm/mach-kirkwood/rd88f6281-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "common.h" #include "mpp.h" diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c index 4ea70e5f..28d0aba 100644 --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "common.h" #include "mpp.h" diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c index b4c53b8..26de7f4 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-mv78xx0/common.c @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 9148b22..ca67e82 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c index 49a3fd6..41fe2b1 100644 --- a/arch/arm/mach-orion5x/db88f5281-setup.c +++ b/arch/arm/mach-orion5x/db88f5281-setup.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "common.h" #include "mpp.h" diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index 1e458ef..f1ae10a 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "common.h" #include "mpp.h" diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index d245a87..9148eb0 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include /* Create a clkdev entry for a given device/clk */ diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 0b12e68..e362e2b 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "dmaengine.h" #include "mv_xor.h" diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c index e37618e..461bbf9 100644 --- a/drivers/leds/leds-netxbig.c +++ b/drivers/leds/leds-netxbig.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include /* * GPIO extension bus. diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c index 10528da..d176ec8 100644 --- a/drivers/leds/leds-ns2.c +++ b/drivers/leds/leds-ns2.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include /* * The Network Space v2 dual-GPIO LED is wired to a CPLD and can blink in diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index a61cb5f..de4c20b 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include "mvsdio.h" diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c index fc5a868..131b58a 100644 --- a/drivers/mtd/nand/orion_nand.c +++ b/drivers/mtd/nand/orion_nand.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) { diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index 8892d36..8e7eca6 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #define rdl(off) __raw_readl(hcd->regs + (off)) #define wrl(off, val) __raw_writel((val), hcd->regs + (off)) diff --git a/arch/arm/plat-orion/include/plat/audio.h b/include/linux/platform_data/asoc-kirkwood.h similarity index 100% rename from arch/arm/plat-orion/include/plat/audio.h rename to include/linux/platform_data/asoc-kirkwood.h diff --git a/arch/arm/plat-orion/include/plat/mv_xor.h b/include/linux/platform_data/dma-mv_xor.h similarity index 100% rename from arch/arm/plat-orion/include/plat/mv_xor.h rename to include/linux/platform_data/dma-mv_xor.h diff --git a/arch/arm/mach-kirkwood/include/mach/leds-netxbig.h b/include/linux/platform_data/leds-kirkwood-netxbig.h similarity index 100% rename from arch/arm/mach-kirkwood/include/mach/leds-netxbig.h rename to include/linux/platform_data/leds-kirkwood-netxbig.h diff --git a/arch/arm/mach-kirkwood/include/mach/leds-ns2.h b/include/linux/platform_data/leds-kirkwood-ns2.h similarity index 100% rename from arch/arm/mach-kirkwood/include/mach/leds-ns2.h rename to include/linux/platform_data/leds-kirkwood-ns2.h diff --git a/arch/arm/plat-orion/include/plat/mvsdio.h b/include/linux/platform_data/mmc-mvsdio.h similarity index 100% rename from arch/arm/plat-orion/include/plat/mvsdio.h rename to include/linux/platform_data/mmc-mvsdio.h diff --git a/arch/arm/plat-orion/include/plat/orion_nand.h b/include/linux/platform_data/mtd-orion_nand.h similarity index 100% rename from arch/arm/plat-orion/include/plat/orion_nand.h rename to include/linux/platform_data/mtd-orion_nand.h diff --git a/arch/arm/plat-orion/include/plat/ehci-orion.h b/include/linux/platform_data/usb-ehci-orion.h similarity index 100% rename from arch/arm/plat-orion/include/plat/ehci-orion.h rename to include/linux/platform_data/usb-ehci-orion.h diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 7646dd7..542538d 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "kirkwood.h" #define DRV_NAME "kirkwood-i2s" diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c index 80bd59c..c28540a 100644 --- a/sound/soc/kirkwood/kirkwood-openrd.c +++ b/sound/soc/kirkwood/kirkwood-openrd.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include "../codecs/cs42l51.h" diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c index f898363..c67bbc5 100644 --- a/sound/soc/kirkwood/kirkwood-t5325.c +++ b/sound/soc/kirkwood/kirkwood-t5325.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include "../codecs/alc5623.h"