diff mbox

[12/16] ARM: nomadik: move platform_data definitions

Message ID 1347368390-31252-12-git-send-email-arnd@arndb.de (mailing list archive)
State New, archived
Headers show

Commit Message

Arnd Bergmann Sept. 11, 2012, 12:59 p.m. UTC 
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>
Cc: Alessandro Rubini <rubini@unipv.it>
Cc: 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: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andreas Westin <andreas.westin@stericsson.com>
---
 arch/arm/mach-nomadik/board-nhk8815.c                                |    2 +-
 arch/arm/mach-u300/core.c                                            |    2 +-
 arch/arm/mach-ux500/board-mop500.c                                   |    2 +-
 arch/arm/mach-ux500/cpu-db8500.c                                     |    2 +-
 arch/arm/mach-ux500/devices-common.h                                 |    2 +-
 arch/arm/mach-ux500/usb.c                                            |    2 +-
 drivers/crypto/ux500/cryp/cryp_core.c                                |    2 +-
 drivers/crypto/ux500/hash/hash_core.c                                |    2 +-
 drivers/input/keyboard/nomadik-ske-keypad.c                          |    2 +-
 drivers/mtd/nand/nomadik_nand.c                                      |    2 +-
 drivers/pinctrl/pinctrl-coh901.c                                     |    2 +-
 drivers/usb/musb/ux500_dma.c                                         |    2 +-
 .../include/mach => include/linux/platform_data}/crypto-ux500.h      |    0
 .../plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h   |    0
 .../mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h    |    0
 .../mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h |    0
 .../mach/usb.h => include/linux/platform_data/usb-musb-ux500.h       |    0
 17 files changed, 12 insertions(+), 12 deletions(-)
 rename {arch/arm/mach-ux500/include/mach => include/linux/platform_data}/crypto-ux500.h (100%)
 rename arch/arm/plat-nomadik/include/plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h (100%)
 rename arch/arm/mach-nomadik/include/mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h (100%)
 rename arch/arm/mach-u300/include/mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h (100%)
 rename arch/arm/mach-ux500/include/mach/usb.h => include/linux/platform_data/usb-musb-ux500.h (100%)

diff --git a/arch/arm/mach-ux500/include/mach/crypto-ux500.h b/include/linux/platform_data/crypto-ux500.h
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/crypto-ux500.h
rename to include/linux/platform_data/crypto-ux500.h
diff --git a/arch/arm/plat-nomadik/include/plat/ske.h b/include/linux/platform_data/keypad-nomadik-ske.h
similarity index 100%
rename from arch/arm/plat-nomadik/include/plat/ske.h
rename to include/linux/platform_data/keypad-nomadik-ske.h
diff --git a/arch/arm/mach-nomadik/include/mach/nand.h b/include/linux/platform_data/mtd-nomadik-nand.h
similarity index 100%
rename from arch/arm/mach-nomadik/include/mach/nand.h
rename to include/linux/platform_data/mtd-nomadik-nand.h
diff --git a/arch/arm/mach-u300/include/mach/gpio-u300.h b/include/linux/platform_data/pinctrl-coh901.h
similarity index 100%
rename from arch/arm/mach-u300/include/mach/gpio-u300.h
rename to include/linux/platform_data/pinctrl-coh901.h
diff --git a/arch/arm/mach-ux500/include/mach/usb.h b/include/linux/platform_data/usb-musb-ux500.h
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/usb.h
rename to include/linux/platform_data/usb-musb-ux500.h

Comments

Felipe Balbi Sept. 11, 2012, 1:07 p.m. UTC | #1 
On Tue, Sep 11, 2012 at 02:59:46PM +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 nomadik include directories
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Alessandro Rubini <rubini@unipv.it>
> Cc: 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: Felipe Balbi <balbi@ti.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Andreas Westin <andreas.westin@stericsson.com>

for musb:

Acked-by: Felipe Balbi <balbi@ti.com>

> ---
>  arch/arm/mach-nomadik/board-nhk8815.c                                |    2 +-
>  arch/arm/mach-u300/core.c                                            |    2 +-
>  arch/arm/mach-ux500/board-mop500.c                                   |    2 +-
>  arch/arm/mach-ux500/cpu-db8500.c                                     |    2 +-
>  arch/arm/mach-ux500/devices-common.h                                 |    2 +-
>  arch/arm/mach-ux500/usb.c                                            |    2 +-
>  drivers/crypto/ux500/cryp/cryp_core.c                                |    2 +-
>  drivers/crypto/ux500/hash/hash_core.c                                |    2 +-
>  drivers/input/keyboard/nomadik-ske-keypad.c                          |    2 +-
>  drivers/mtd/nand/nomadik_nand.c                                      |    2 +-
>  drivers/pinctrl/pinctrl-coh901.c                                     |    2 +-
>  drivers/usb/musb/ux500_dma.c                                         |    2 +-
>  .../include/mach => include/linux/platform_data}/crypto-ux500.h      |    0
>  .../plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h   |    0
>  .../mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h    |    0
>  .../mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h |    0
>  .../mach/usb.h => include/linux/platform_data/usb-musb-ux500.h       |    0
>  17 files changed, 12 insertions(+), 12 deletions(-)
>  rename {arch/arm/mach-ux500/include/mach => include/linux/platform_data}/crypto-ux500.h (100%)
>  rename arch/arm/plat-nomadik/include/plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h (100%)
>  rename arch/arm/mach-nomadik/include/mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h (100%)
>  rename arch/arm/mach-u300/include/mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h (100%)
>  rename arch/arm/mach-ux500/include/mach/usb.h => include/linux/platform_data/usb-musb-ux500.h (100%)
> 
> diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c
> index f4535a7..381c080 100644
> --- a/arch/arm/mach-nomadik/board-nhk8815.c
> +++ b/arch/arm/mach-nomadik/board-nhk8815.c
> @@ -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"
> diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
> index 03acf18..62adfe7 100644
> --- a/arch/arm/mach-u300/core.c
> +++ b/arch/arm/mach-u300/core.c
> @@ -43,7 +43,7 @@
>  #include <mach/hardware.h>
>  #include <mach/syscon.h>
>  #include <mach/dma_channels.h>
> -#include <mach/gpio-u300.h>
> +#include <linux/platform_data/pinctrl-coh901.h>
>  
>  #include "spi.h"
>  #include "i2c.h"
> diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
> index 8674a89..38854d4 100644
> --- a/arch/arm/mach-ux500/board-mop500.c
> +++ b/arch/arm/mach-ux500/board-mop500.c
> @@ -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"
> diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
> index db3c52d..1bef4c3 100644
> --- a/arch/arm/mach-ux500/cpu-db8500.c
> +++ b/arch/arm/mach-ux500/cpu-db8500.c
> @@ -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"
> diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h
> index ecdd838..7fbf0ba 100644
> --- a/arch/arm/mach-ux500/devices-common.h
> +++ b/arch/arm/mach-ux500/devices-common.h
> @@ -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;
>  
> diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c
> index a74af38..145482e 100644
> --- a/arch/arm/mach-ux500/usb.c
> +++ b/arch/arm/mach-ux500/usb.c
> @@ -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, \
> diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c
> index 1c307e1..ef17e38 100644
> --- a/drivers/crypto/ux500/cryp/cryp_core.c
> +++ b/drivers/crypto/ux500/cryp/cryp_core.c
> @@ -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"
> diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
> index 08d5032..0876507 100644
> --- a/drivers/crypto/ux500/hash/hash_core.c
> +++ b/drivers/crypto/ux500/hash/hash_core.c
> @@ -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"
> diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c
> index a880e74..49f5fa6 100644
> --- a/drivers/input/keyboard/nomadik-ske-keypad.c
> +++ b/drivers/input/keyboard/nomadik-ske-keypad.c
> @@ -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)
> diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
> index a86aa81..9ee0c4e 100644
> --- a/drivers/mtd/nand/nomadik_nand.c
> +++ b/drivers/mtd/nand/nomadik_nand.c
> @@ -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>
> diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c
> index cc0f00d..b7f41e9 100644
> --- a/drivers/pinctrl/pinctrl-coh901.c
> +++ b/drivers/pinctrl/pinctrl-coh901.c
> @@ -24,7 +24,7 @@
>  #include <linux/slab.h>
>  #include <linux/pinctrl/consumer.h>
>  #include <linux/pinctrl/pinconf-generic.h>
> -#include <mach/gpio-u300.h>
> +#include <linux/platform_data/pinctrl-coh901.h>
>  #include "pinctrl-coh901.h"
>  
>  /*
> diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
> index d05c7fb..f82246d 100644
> --- a/drivers/usb/musb/ux500_dma.c
> +++ b/drivers/usb/musb/ux500_dma.c
> @@ -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 {
> diff --git a/arch/arm/mach-ux500/include/mach/crypto-ux500.h b/include/linux/platform_data/crypto-ux500.h
> similarity index 100%
> rename from arch/arm/mach-ux500/include/mach/crypto-ux500.h
> rename to include/linux/platform_data/crypto-ux500.h
> diff --git a/arch/arm/plat-nomadik/include/plat/ske.h b/include/linux/platform_data/keypad-nomadik-ske.h
> similarity index 100%
> rename from arch/arm/plat-nomadik/include/plat/ske.h
> rename to include/linux/platform_data/keypad-nomadik-ske.h
> diff --git a/arch/arm/mach-nomadik/include/mach/nand.h b/include/linux/platform_data/mtd-nomadik-nand.h
> similarity index 100%
> rename from arch/arm/mach-nomadik/include/mach/nand.h
> rename to include/linux/platform_data/mtd-nomadik-nand.h
> diff --git a/arch/arm/mach-u300/include/mach/gpio-u300.h b/include/linux/platform_data/pinctrl-coh901.h
> similarity index 100%
> rename from arch/arm/mach-u300/include/mach/gpio-u300.h
> rename to include/linux/platform_data/pinctrl-coh901.h
> diff --git a/arch/arm/mach-ux500/include/mach/usb.h b/include/linux/platform_data/usb-musb-ux500.h
> similarity index 100%
> rename from arch/arm/mach-ux500/include/mach/usb.h
> rename to include/linux/platform_data/usb-musb-ux500.h
> -- 
> 1.7.10
>
Linus Walleij Sept. 11, 2012, 1:31 p.m. UTC | #2 
On Tue, Sep 11, 2012 at 5:59 AM, Arnd Bergmann <arnd@arndb.de> wrote:

>  arch/arm/mach-nomadik/board-nhk8815.c                                |    2 +-
>  arch/arm/mach-u300/core.c                                            |    2 +-
>  arch/arm/mach-ux500/board-mop500.c                                   |    2 +-
>  arch/arm/mach-ux500/cpu-db8500.c                                     |    2 +-
>  arch/arm/mach-ux500/devices-common.h                                 |    2 +-
>  arch/arm/mach-ux500/usb.c                                            |    2 +-
>  drivers/crypto/ux500/cryp/cryp_core.c                                |    2 +-
>  drivers/crypto/ux500/hash/hash_core.c                                |    2 +-
>  drivers/input/keyboard/nomadik-ske-keypad.c                          |    2 +-
>  drivers/mtd/nand/nomadik_nand.c                                      |    2 +-
>  drivers/pinctrl/pinctrl-coh901.c                                     |    2 +-
>  drivers/usb/musb/ux500_dma.c                                         |    2 +-
>  .../include/mach => include/linux/platform_data}/crypto-ux500.h      |    0
>  .../plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h   |    0
>  .../mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h    |    0
>  .../mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h |    0

I sent a patch for moving gpio-u300.h like this in commit
651728507140246e9cf4e809f1877cb2eddbc84e
that is already in linux-next, is this the same patch or
another one?

>  .../mach/usb.h => include/linux/platform_data/usb-musb-ux500.h       |    0
>  17 files changed, 12 insertions(+), 12 deletions(-)
>  rename {arch/arm/mach-ux500/include/mach => include/linux/platform_data}/crypto-ux500.h (100%)
>  rename arch/arm/plat-nomadik/include/plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h (100%)
>  rename arch/arm/mach-nomadik/include/mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h (100%)
>  rename arch/arm/mach-u300/include/mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h (100%)
>  rename arch/arm/mach-ux500/include/mach/usb.h => include/linux/platform_data/usb-musb-ux500.h (100%)

For the rest, Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij
Arnd Bergmann Sept. 11, 2012, 1:46 p.m. UTC | #3 
On Tuesday 11 September 2012, Linus Walleij wrote:
> On Tue, Sep 11, 2012 at 5:59 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> 
> >  arch/arm/mach-nomadik/board-nhk8815.c                                |    2 +-
> >  arch/arm/mach-u300/core.c                                            |    2 +-
> >  arch/arm/mach-ux500/board-mop500.c                                   |    2 +-
> >  arch/arm/mach-ux500/cpu-db8500.c                                     |    2 +-
> >  arch/arm/mach-ux500/devices-common.h                                 |    2 +-
> >  arch/arm/mach-ux500/usb.c                                            |    2 +-
> >  drivers/crypto/ux500/cryp/cryp_core.c                                |    2 +-
> >  drivers/crypto/ux500/hash/hash_core.c                                |    2 +-
> >  drivers/input/keyboard/nomadik-ske-keypad.c                          |    2 +-
> >  drivers/mtd/nand/nomadik_nand.c                                      |    2 +-
> >  drivers/pinctrl/pinctrl-coh901.c                                     |    2 +-
> >  drivers/usb/musb/ux500_dma.c                                         |    2 +-
> >  .../include/mach => include/linux/platform_data}/crypto-ux500.h      |    0
> >  .../plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h   |    0
> >  .../mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h    |    0
> >  .../mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h |    0
> 
> I sent a patch for moving gpio-u300.h like this in commit
> 651728507140246e9cf4e809f1877cb2eddbc84e
> that is already in linux-next, is this the same patch or
> another one?

This my older patch that I did before the mini summit, but had not sent
out yet. It's probably best if I just drop this part of the patch.

	Arnd
Alessandro Rubini Sept. 11, 2012, 6:29 p.m. UTC | #4 
> 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

Acked-by: Alessandro Rubini <rubini@unipv.it>
diff mbox

Patch

diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c
index f4535a7..381c080 100644
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@ -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"
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 03acf18..62adfe7 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -43,7 +43,7 @@ 
 #include <mach/hardware.h>
 #include <mach/syscon.h>
 #include <mach/dma_channels.h>
-#include <mach/gpio-u300.h>
+#include <linux/platform_data/pinctrl-coh901.h>
 
 #include "spi.h"
 #include "i2c.h"
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 8674a89..38854d4 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -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"
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index db3c52d..1bef4c3 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -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"
diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h
index ecdd838..7fbf0ba 100644
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@ -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;
 
diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c
index a74af38..145482e 100644
--- a/arch/arm/mach-ux500/usb.c
+++ b/arch/arm/mach-ux500/usb.c
@@ -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, \
diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c
index 1c307e1..ef17e38 100644
--- a/drivers/crypto/ux500/cryp/cryp_core.c
+++ b/drivers/crypto/ux500/cryp/cryp_core.c
@@ -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"
diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
index 08d5032..0876507 100644
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -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"
diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c
index a880e74..49f5fa6 100644
--- a/drivers/input/keyboard/nomadik-ske-keypad.c
+++ b/drivers/input/keyboard/nomadik-ske-keypad.c
@@ -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)
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
index a86aa81..9ee0c4e 100644
--- a/drivers/mtd/nand/nomadik_nand.c
+++ b/drivers/mtd/nand/nomadik_nand.c
@@ -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>
diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c
index cc0f00d..b7f41e9 100644
--- a/drivers/pinctrl/pinctrl-coh901.c
+++ b/drivers/pinctrl/pinctrl-coh901.c
@@ -24,7 +24,7 @@ 
 #include <linux/slab.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/pinctrl/pinconf-generic.h>
-#include <mach/gpio-u300.h>
+#include <linux/platform_data/pinctrl-coh901.h>
 #include "pinctrl-coh901.h"
 
 /*
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index d05c7fb..f82246d 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -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 {