| Message ID | 1347368390-31252-3-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tuesday, September 11, 2012 6:00 AM, 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> > 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%) Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Arnd, What about gpio-ep93xx.h? It does not have any platform_data in it but the gpio driver (driver/gpio/gpio-ep93xx.c) does include it from the mach-* directory. Regards, Hartley
On Tuesday 11 September 2012, H Hartley Sweeten wrote: > Arnd, > > What about gpio-ep93xx.h? It does not have any platform_data in > it but the gpio driver (driver/gpio/gpio-ep93xx.c) does include it > from the mach-* directory. There are actually four such headers for ep93xx: * mach/ep93xx-regs.h sound/soc/ep93xx/ep93xx-i2s.c sound/soc/ep93xx/ep93xx-pcm.c * mach/gpio-ep93xx.h drivers/gpio/gpio-ep93xx.c * mach/hardware.h drivers/gpio/gpio-ep93xx.c drivers/input/keyboard/ep93xx_keypad.c drivers/net/ethernet/cirrus/ep93xx_eth.c sound/soc/ep93xx/edb93xx.c sound/soc/ep93xx/ep93xx-i2s.c sound/soc/ep93xx/ep93xx-pcm.c sound/soc/ep93xx/simone.c sound/soc/ep93xx/snappercl15.c * mach/platform.h drivers/ata/pata_ep93xx.c drivers/misc/ep93xx_pwm.c If you are planning to allow building a combined kernel for ep93xx and another ARMv4/v5 platform, all of these inclusions need to be removed and done differently, plus you also need to start using the common clock subsystem and sparse-irq. Any of those things would be greatly appreciated as a cleanup, but we're not going to require them any time soon. Arnd
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> > >
On Tue, 2012-09-11 at 14:59 +0200, 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 > > drivers/dma/ep93xx_dma.c | 2 +- Acked-by: Vinod Koul <vinod.koul@linux.intel.com>
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>
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> 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%)