Skip to content

Commit

Permalink
ARM: nomadik: move platform_data definitions
Browse files Browse the repository at this point in the history
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 nomadik include directories

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: STEricsson <STEricsson_nomadik_linux@list.st.com>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Andreas Westin <andreas.westin@stericsson.com>
  • Loading branch information
Arnd Bergmann committed Sep 14, 2012
1 parent 54ecf4f commit db298da
Show file tree
Hide file tree
Showing 14 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-nomadik/board-nhk8815.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <plat/gpio-nomadik.h>
#include <plat/mtu.h>

#include <mach/nand.h>
#include <linux/platform_data/mtd-nomadik-nand.h>
#include <mach/fsmc.h>

#include "cpu-8815.h"
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-ux500/board-mop500.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include <mach/setup.h>
#include <mach/devices.h>
#include <mach/irqs.h>
#include <mach/crypto-ux500.h>
#include <linux/platform_data/crypto-ux500.h>

#include "ste-dma40-db8500.h"
#include "devices-db8500.h"
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-ux500/cpu-db8500.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <mach/hardware.h>
#include <mach/setup.h>
#include <mach/devices.h>
#include <mach/usb.h>
#include <linux/platform_data/usb-musb-ux500.h>
#include <mach/db8500-regs.h>

#include "devices-db8500.h"
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-ux500/devices-common.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <linux/sys_soc.h>
#include <linux/amba/bus.h>
#include <linux/platform_data/i2c-nomadik.h>
#include <mach/crypto-ux500.h>
#include <linux/platform_data/crypto-ux500.h>

struct spi_master_cntlr;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-ux500/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <plat/ste_dma40.h>
#include <mach/hardware.h>
#include <mach/usb.h>
#include <linux/platform_data/usb-musb-ux500.h>

#define MUSB_DMA40_RX_CH { \
.mode = STEDMA40_MODE_LOGICAL, \
Expand Down
2 changes: 1 addition & 1 deletion drivers/crypto/ux500/cryp/cryp_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include <plat/ste_dma40.h>

#include <mach/crypto-ux500.h>
#include <linux/platform_data/crypto-ux500.h>
#include <mach/hardware.h>

#include "cryp_p.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/crypto/ux500/hash/hash_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <crypto/scatterwalk.h>
#include <crypto/algapi.h>

#include <mach/crypto-ux500.h>
#include <linux/platform_data/crypto-ux500.h>
#include <mach/hardware.h>

#include "hash_alg.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/nomadik-ske-keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <linux/clk.h>
#include <linux/module.h>

#include <plat/ske.h>
#include <linux/platform_data/keypad-nomadik-ske.h>

/* SKE_CR bits */
#define SKE_KPMLT (0x1 << 6)
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/nand/nomadik_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <linux/mtd/partitions.h>
#include <linux/io.h>
#include <linux/slab.h>
#include <mach/nand.h>
#include <linux/platform_data/mtd-nomadik-nand.h>
#include <mach/fsmc.h>

#include <mtd/mtd-abi.h>
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/musb/ux500_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <linux/dma-mapping.h>
#include <linux/dmaengine.h>
#include <linux/pfn.h>
#include <mach/usb.h>
#include <linux/platform_data/usb-musb-ux500.h>
#include "musb_core.h"

struct ux500_dma_channel {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit db298da

Please sign in to comment.