From: rmallon@gmail.com (Ryan Mallon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/16] ARM: ep93xx: move platform_data definitions
Date: Wed, 12 Sep 2012 08:56:34 +1000 [thread overview]
Message-ID: <504FC1A2.4080403@gmail.com> (raw)
In-Reply-To: <1347368390-31252-3-git-send-email-arnd@arndb.de>
On 11/09/12 22:59, Arnd Bergmann wrote:
> 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 ep93xx include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ryan Mallon <rmallon@gmail.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Ryan Mallon <rmallon@gmail.com>
> Cc: Jeff Garzik <jgarzik@pobox.com> (supporter:SERIAL ATA
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: Dan Williams <djbw@fb.com>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> (maintainer:INPUT
> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
> Cc: Liam Girdwood <lrg@ti.com>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.de>
> Cc: Mika Westerberg <mika.westerberg@iki.fi>
> Cc: Axel Lin <axel.lin@gmail.com>
> ---
> Documentation/spi/ep93xx_spi | 2 +-
> arch/arm/mach-ep93xx/core.c | 6 +++---
> arch/arm/mach-ep93xx/dma.c | 2 +-
> arch/arm/mach-ep93xx/edb93xx.c | 4 ++--
> arch/arm/mach-ep93xx/simone.c | 2 +-
> arch/arm/mach-ep93xx/snappercl15.c | 2 +-
> arch/arm/mach-ep93xx/vision_ep9307.c | 4 ++--
> drivers/ata/pata_ep93xx.c | 2 +-
> drivers/dma/ep93xx_dma.c | 2 +-
> drivers/input/keyboard/ep93xx_keypad.c | 2 +-
> drivers/spi/spi-ep93xx.c | 4 ++--
> drivers/video/ep93xx-fb.c | 2 +-
> .../mach/dma.h => include/linux/platform_data/dma-ep93xx.h | 0
> .../linux/platform_data/keypad-ep93xx.h | 0
> .../ep93xx_spi.h => include/linux/platform_data/spi-ep93xx.h | 0
> .../mach/fb.h => include/linux/platform_data/video-ep93xx.h | 0
> sound/soc/ep93xx/ep93xx-ac97.c | 2 +-
> sound/soc/ep93xx/ep93xx-i2s.c | 2 +-
> sound/soc/ep93xx/ep93xx-pcm.c | 2 +-
> 19 files changed, 20 insertions(+), 20 deletions(-)
> rename arch/arm/mach-ep93xx/include/mach/dma.h => include/linux/platform_data/dma-ep93xx.h (100%)
> rename arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h => include/linux/platform_data/keypad-ep93xx.h (100%)
> rename arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h => include/linux/platform_data/spi-ep93xx.h (100%)
> rename arch/arm/mach-ep93xx/include/mach/fb.h => include/linux/platform_data/video-ep93xx.h (100%)
>
> diff --git a/Documentation/spi/ep93xx_spi b/Documentation/spi/ep93xx_spi
> index d8eb01c..832ddce 100644
> --- a/Documentation/spi/ep93xx_spi
> +++ b/Documentation/spi/ep93xx_spi
> @@ -26,7 +26,7 @@ arch/arm/mach-ep93xx/ts72xx.c:
> #include <linux/gpio.h>
> #include <linux/spi/spi.h>
>
> -#include <mach/ep93xx_spi.h>
> +#include <linux/platform_data/spi-ep93xx.h>
>
> /* this is our GPIO line used for chip select */
> #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO9
> diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
> index 4afe52a..e85bf17 100644
> --- a/arch/arm/mach-ep93xx/core.c
> +++ b/arch/arm/mach-ep93xx/core.c
> @@ -36,9 +36,9 @@
> #include <linux/export.h>
>
> #include <mach/hardware.h>
> -#include <mach/fb.h>
> -#include <mach/ep93xx_keypad.h>
> -#include <mach/ep93xx_spi.h>
> +#include <linux/platform_data/video-ep93xx.h>
> +#include <linux/platform_data/keypad-ep93xx.h>
> +#include <linux/platform_data/spi-ep93xx.h>
> #include <mach/gpio-ep93xx.h>
>
> #include <asm/mach/map.h>
> diff --git a/arch/arm/mach-ep93xx/dma.c b/arch/arm/mach-ep93xx/dma.c
> index 16976d7..d8bfd02 100644
> --- a/arch/arm/mach-ep93xx/dma.c
> +++ b/arch/arm/mach-ep93xx/dma.c
> @@ -25,7 +25,7 @@
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-ep93xx.h>
> #include <mach/hardware.h>
>
> #include "soc.h"
> diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c
> index 337ab7c..b8f53d5 100644
> --- a/arch/arm/mach-ep93xx/edb93xx.c
> +++ b/arch/arm/mach-ep93xx/edb93xx.c
> @@ -35,8 +35,8 @@
> #include <sound/cs4271.h>
>
> #include <mach/hardware.h>
> -#include <mach/fb.h>
> -#include <mach/ep93xx_spi.h>
> +#include <linux/platform_data/video-ep93xx.h>
> +#include <linux/platform_data/spi-ep93xx.h>
> #include <mach/gpio-ep93xx.h>
>
> #include <asm/hardware/vic.h>
> diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c
> index 33dc079..0eb3f17 100644
> --- a/arch/arm/mach-ep93xx/simone.c
> +++ b/arch/arm/mach-ep93xx/simone.c
> @@ -22,7 +22,7 @@
> #include <linux/i2c-gpio.h>
>
> #include <mach/hardware.h>
> -#include <mach/fb.h>
> +#include <linux/platform_data/video-ep93xx.h>
> #include <mach/gpio-ep93xx.h>
>
> #include <asm/hardware/vic.h>
> diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
> index 01abd35..50043ee 100644
> --- a/arch/arm/mach-ep93xx/snappercl15.c
> +++ b/arch/arm/mach-ep93xx/snappercl15.c
> @@ -28,7 +28,7 @@
> #include <linux/mtd/nand.h>
>
> #include <mach/hardware.h>
> -#include <mach/fb.h>
> +#include <linux/platform_data/video-ep93xx.h>
> #include <mach/gpio-ep93xx.h>
>
> #include <asm/hardware/vic.h>
> diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c
> index 2905a49..ba92e25 100644
> --- a/arch/arm/mach-ep93xx/vision_ep9307.c
> +++ b/arch/arm/mach-ep93xx/vision_ep9307.c
> @@ -30,8 +30,8 @@
> #include <linux/mmc/host.h>
>
> #include <mach/hardware.h>
> -#include <mach/fb.h>
> -#include <mach/ep93xx_spi.h>
> +#include <linux/platform_data/video-ep93xx.h>
> +#include <linux/platform_data/spi-ep93xx.h>
> #include <mach/gpio-ep93xx.h>
>
> #include <asm/hardware/vic.h>
> diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c
> index 6ef2e37..e056406 100644
> --- a/drivers/ata/pata_ep93xx.c
> +++ b/drivers/ata/pata_ep93xx.c
> @@ -43,7 +43,7 @@
> #include <linux/dmaengine.h>
> #include <linux/ktime.h>
>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-ep93xx.h>
> #include <mach/platform.h>
>
> #define DRV_NAME "ep93xx-ide"
> diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
> index c64917e..4aeaea7 100644
> --- a/drivers/dma/ep93xx_dma.c
> +++ b/drivers/dma/ep93xx_dma.c
> @@ -26,7 +26,7 @@
> #include <linux/platform_device.h>
> #include <linux/slab.h>
>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-ep93xx.h>
>
> #include "dmaengine.h"
>
> diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c
> index c46fc81..7363402 100644
> --- a/drivers/input/keyboard/ep93xx_keypad.c
> +++ b/drivers/input/keyboard/ep93xx_keypad.c
> @@ -29,7 +29,7 @@
> #include <linux/slab.h>
>
> #include <mach/hardware.h>
> -#include <mach/ep93xx_keypad.h>
> +#include <linux/platform_data/keypad-ep93xx.h>
>
> /*
> * Keypad Interface Register offsets
> diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
> index f97f1d2..3a21959 100644
> --- a/drivers/spi/spi-ep93xx.c
> +++ b/drivers/spi/spi-ep93xx.c
> @@ -31,8 +31,8 @@
> #include <linux/scatterlist.h>
> #include <linux/spi/spi.h>
>
> -#include <mach/dma.h>
> -#include <mach/ep93xx_spi.h>
> +#include <linux/platform_data/dma-ep93xx.h>
> +#include <linux/platform_data/spi-ep93xx.h>
>
> #define SSPCR0 0x0000
> #define SSPCR0_MODE_SHIFT 6
> diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
> index 345d962..f2c092da 100644
> --- a/drivers/video/ep93xx-fb.c
> +++ b/drivers/video/ep93xx-fb.c
> @@ -24,7 +24,7 @@
> #include <linux/clk.h>
> #include <linux/fb.h>
>
> -#include <mach/fb.h>
> +#include <linux/platform_data/video-ep93xx.h>
>
> /* Vertical Frame Timing Registers */
> #define EP93XXFB_VLINES_TOTAL 0x0000 /* SW locked */
> diff --git a/arch/arm/mach-ep93xx/include/mach/dma.h b/include/linux/platform_data/dma-ep93xx.h
> similarity index 100%
> rename from arch/arm/mach-ep93xx/include/mach/dma.h
> rename to include/linux/platform_data/dma-ep93xx.h
> diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h b/include/linux/platform_data/keypad-ep93xx.h
> similarity index 100%
> rename from arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
> rename to include/linux/platform_data/keypad-ep93xx.h
> diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h b/include/linux/platform_data/spi-ep93xx.h
> similarity index 100%
> rename from arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h
> rename to include/linux/platform_data/spi-ep93xx.h
> diff --git a/arch/arm/mach-ep93xx/include/mach/fb.h b/include/linux/platform_data/video-ep93xx.h
> similarity index 100%
> rename from arch/arm/mach-ep93xx/include/mach/fb.h
> rename to include/linux/platform_data/video-ep93xx.h
> diff --git a/sound/soc/ep93xx/ep93xx-ac97.c b/sound/soc/ep93xx/ep93xx-ac97.c
> index bdffab3..c352165 100644
> --- a/sound/soc/ep93xx/ep93xx-ac97.c
> +++ b/sound/soc/ep93xx/ep93xx-ac97.c
> @@ -21,7 +21,7 @@
> #include <sound/ac97_codec.h>
> #include <sound/soc.h>
>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-ep93xx.h>
> #include "ep93xx-pcm.h"
>
> /*
> diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c
> index 8df8f6d..ac4a751 100644
> --- a/sound/soc/ep93xx/ep93xx-i2s.c
> +++ b/sound/soc/ep93xx/ep93xx-i2s.c
> @@ -28,7 +28,7 @@
>
> #include <mach/hardware.h>
> #include <mach/ep93xx-regs.h>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-ep93xx.h>
>
> #include "ep93xx-pcm.h"
>
> diff --git a/sound/soc/ep93xx/ep93xx-pcm.c b/sound/soc/ep93xx/ep93xx-pcm.c
> index 4eea98b..665d9c9 100644
> --- a/sound/soc/ep93xx/ep93xx-pcm.c
> +++ b/sound/soc/ep93xx/ep93xx-pcm.c
> @@ -25,7 +25,7 @@
> #include <sound/soc.h>
> #include <sound/dmaengine_pcm.h>
>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-ep93xx.h>
> #include <mach/hardware.h>
> #include <mach/ep93xx-regs.h>
>
>
next prev parent reply other threads:[~2012-09-11 22:56 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1347368245-30989-1-git-send-email-arnd@arndb.de>
2012-09-11 12:59 ` [PATCH 00/16] ARM: big platform data header rename Arnd Bergmann
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
2012-09-11 12:59 ` [PATCH 02/16] ARM: davinci: " Arnd Bergmann
2012-09-11 13:05 ` Felipe Balbi
2012-09-12 10:42 ` Hebbar, Gururaja
2012-09-12 17:11 ` Arnd Bergmann
2012-09-13 7:00 ` Hebbar, Gururaja
2012-09-11 12:59 ` [PATCH 03/16] ARM: ep93xx: " Arnd Bergmann
2012-09-11 16:26 ` H Hartley Sweeten
2012-09-11 17:16 ` Arnd Bergmann
2012-09-11 22:56 ` Ryan Mallon [this message]
2012-09-14 3:18 ` Vinod Koul
2012-09-11 12:59 ` [PATCH 04/16] ARM: imx: " Arnd Bergmann
2012-09-11 13:40 ` Guennadi Liakhovetski
2012-09-11 14:10 ` Arnd Bergmann
2012-09-11 14:31 ` Guennadi Liakhovetski
2012-09-12 15:52 ` Arnd Bergmann
2012-09-13 7:21 ` Shawn Guo
2012-09-11 13:45 ` Sascha Hauer
2012-09-14 3:17 ` Vinod Koul
2012-09-11 12:59 ` [PATCH 05/16] ARM: msm: " Arnd Bergmann
2012-09-11 21:07 ` David Brown
2012-09-11 12:59 ` [PATCH 06/16] ARM: netx: " Arnd Bergmann
2012-09-11 13:35 ` Sascha Hauer
2012-09-11 12:59 ` [PATCH 07/16] ARM: pxa: " Arnd Bergmann
2012-09-11 13:56 ` Igor Grinberg
2012-09-11 17:11 ` Jeff Garzik
2012-09-11 19:13 ` Marek Vasut
2012-09-11 19:36 ` Robert Jarzmik
2012-09-12 22:56 ` Paul Parsons
2012-09-13 8:46 ` stefan at sostec.de
2012-10-02 19:03 ` [PATCH] ARM: pxa: Fix build error caused by sram.h rename Chris Ball
2012-10-02 20:27 ` Arnd Bergmann
2012-10-05 14:48 ` Chris Ball
2012-10-05 18:57 ` Arnd Bergmann
2012-10-06 8:55 ` Mark Brown
2012-09-11 12:59 ` [PATCH 08/16] ARM: sa1100: move platform_data definitions Arnd Bergmann
2012-09-11 12:59 ` [PATCH 09/16] ARM: tegra: " Arnd Bergmann
2012-09-11 15:35 ` Stephen Warren
2012-09-12 16:21 ` Arnd Bergmann
2012-09-12 17:29 ` Stephen Warren
2012-09-11 15:42 ` Chris Ball
2012-09-11 17:05 ` Arnd Bergmann
2012-09-11 17:11 ` Chris Ball
2012-09-12 16:42 ` Chris Brand
2012-09-11 12:59 ` [PATCH 10/16] ARM: vt8500: " Arnd Bergmann
2012-09-11 20:54 ` Tony Prisk
2012-09-11 12:59 ` [PATCH 11/16] ARM: w90x900: " Arnd Bergmann
2012-09-11 12:59 ` [PATCH 12/16] ARM: nomadik: " Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 13:31 ` Linus Walleij
2012-09-11 13:46 ` Arnd Bergmann
2012-09-12 16:24 ` Arnd Bergmann
2012-09-11 12:59 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:52 ` Peter Ujfalusi
2012-09-12 17:20 ` Arnd Bergmann
2012-09-18 9:57 ` Peter Ujfalusi
2012-09-19 14:49 ` Arnd Bergmann
2012-09-12 7:16 ` Pihet-XID, Jean
2012-09-12 17:15 ` Arnd Bergmann
2012-09-12 17:40 ` Pihet-XID, Jean
2012-09-11 13:20 ` [PATCH 01/16] ARM: at91: " Jean-Christophe PLAGNIOL-VILLARD
2012-09-11 13:35 ` Nicolas Ferre
2012-09-11 18:29 ` [PATCH 12/16] ARM: nomadik: " Alessandro Rubini
2012-09-14 3:18 ` [PATCH 01/16] ARM: at91: " Vinod Koul
2012-09-11 13:02 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:02 ` [PATCH 14/16] ARM: orion: " Arnd Bergmann
2012-09-11 13:11 ` Thomas Petazzoni
2012-09-11 13:02 ` [PATCH 15/16] ARM: samsung: " Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 17:12 ` Jeff Garzik
2012-09-12 1:27 ` Jingoo Han
2012-09-12 2:20 ` Kukjin Kim
2012-09-12 5:44 ` Kyungmin Park
2012-09-11 13:02 ` [PATCH 16/16] ARM: spear: " Arnd Bergmann
2012-09-12 3:17 ` viresh kumar
2012-09-11 14:06 ` [PATCH 13/16] ARM: omap: " Shilimkar, Santosh
2012-09-11 14:17 ` Arnd Bergmann
2012-09-11 14:24 ` Shilimkar, Santosh
2012-09-11 16:09 ` Vaibhav Hiremath
2012-09-11 17:04 ` Arnd Bergmann
2012-09-11 17:36 ` Tony Lindgren
2012-09-12 3:53 ` Hiremath, Vaibhav
2012-09-12 17:55 ` Sekhar Nori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=504FC1A2.4080403@gmail.com \
--to=rmallon@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).