[RFC] ARM: treewide: scripted conversion to mach-*/*.h

While converting all machine specific headers from
automatically detect the right machine and platform
name in most cases. This script uses a number of
information sources for this:

* any arch/arm/mach-*/ directory uses its own headers,
  with a few exceptions, same for plat-*/
* each mach-*/ directory belongs to at most one plat-*
  directory holding header files
* for any header below mach/* that exists in only one
  machine, we know that the users belong to that machine
* some driver directories or files are manually listed
  here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
===========================================================

fixup()
{
 echo fixup "$1 $2 $3"
 git ls-files $1 | xargs sed -i "s:^\(#.*include <\)$2/:\1$3/:g"
}

fixup arch/arm/mach-s3c2410 mach mach-s3c24xx
fixup arch/arm/mach-s3c2412 mach mach-s3c24xx
fixup arch/arm/mach-s3c2440 mach mach-s3c24xx

fixup arch/arm/plat-mxc mach mach-imx
fixup arch/arm/plat-s3c24xx mach mach-s3c24xx
fixup arch/arm/plat-s3c24xx plat plat-samsung

for i in arch/arm/mach-*; do
	fixup "$i" mach "${i##*/}"
done

for i in arch/arm/plat-* ; do
	fixup "$i" plat "${i##*/}"
done

fixup arch/arm/mach-spear3xx plat plat-spear
fixup arch/arm/mach-spear6xx plat plat-spear
fixup arch/arm/mach-spear13xx plat plat-spear
fixup arch/arm/mach-pxa plat plat-pxa
fixup arch/arm/mach-mmp plat plat-pxa
fixup arch/arm/mach-orion5x plat plat-orion
fixup arch/arm/mach-kirkwood plat plat-orion
fixup arch/arm/mach-mv78xx0 plat plat-orion
fixup arch/arm/mach-dove plat plat-orion
fixup arch/arm/mach-nomadik plat plat-nomadik
fixup arch/arm/mach-ux500 plat plat-nomadik
fixup arch/arm/mach-s3c2410 plat plat-samsung
fixup arch/arm/mach-s3c2412 plat plat-samsung
fixup arch/arm/mach-s3c2440 plat plat-samsung
fixup arch/arm/mach-s3c24xx plat plat-samsung
fixup arch/arm/mach-s3c64xx plat plat-samsung
fixup arch/arm/mach-s5p64x0 plat plat-samsung
fixup arch/arm/mach-s5pc100 plat plat-samsung
fixup arch/arm/mach-s5pv210 plat plat-samsung
fixup arch/arm/mach-exynos plat plat-samsung
fixup arch/arm/mach-omap1 plat plat-omap
fixup arch/arm/mach-omap2 plat plat-omap
fixup arch/arm/mach-versatile plat plat-versatile
fixup arch/arm/mach-integrator plat plat-versatile
fixup arch/arm/mach-realview plat plat-versatile
fixup arch/arm/mach-vexpress plat plat-versatile
fixup arch/arm/mach-zynq plat plat-versatile

fixup drivers/video/omap plat plat-omap
fixup drivers/video/omap2 plat plat-omap
fixup drivers/video/exynos plat plat-samsung
fixup drivers/char/hw_random/omap\* plat plat-omap
fixup drivers/cpufreq/omap\* plat plat-omap
fixup drivers/crypto/omap\* plat plat-omap
fixup drivers/media/video/omap\* plat plat-omap
fixup drivers/input/keyboard/omap\* plat plat-omap
fixup drivers/mmc/host/omap\* plat plat-omap
fixup drivers/mtd/*nand/omap\* plat plat-omap
fixup drivers/spi/spi-omap\* plat plat-omap
fixup drivers/tty/serial/omap\* plat plat-omap
fixup drivers/usb/gadget/omap\* plat plat-omap
fixup drivers/usb/musb/*omap\* plat plat-omap
fixup drivers/dma/omap-dma.c plat plat-omap
fixup drivers/staging/omapdrm plat plat-omap
fixup drivers/staging/tidspbridge/ plat plat-omap
fixup drivers/input/keyboard/spear-keyboard.c plat plat-spear
fixup drivers/cpufreq/exynos-cpufreq.c plat plat-samsung
fixup drivers/crypto/s5p-sss.c plat plat-samsung
fixup drivers/i2c/busses/i2c-nomadik.c plat plat-nomadik
fixup drivers/mtd/nand/s3c2410.c plat plat-samsung
fixup drivers/tty/serial/samsung.c plat plat-samsung
fixup drivers/usb/gadget/s3c-hsotg.c plat plat-samsung
fixup drivers/gpio/gpio-samsung.c plat plat-samsung
fixup sound/soc/samsung plat plat-samsung
fixup sound/soc/omap plat plat-omap
fixup sound/soc/pxa plat plat-pxa
fixup sound/soc/kirkwood/ plat plat-orion
fixup sound/soc/fsl/imx*.[ch] plat plat-mxc

fixup drivers/video/omap mach mach-omap1
fixup drivers/video/omap2 mach mach-omap2
fixup drivers/video/exynos mach mach-exynos
fixup drivers/media/video/davinci mach mach-davinci

fixup sound/soc/omap/osk5912.c mach mach-omap1
fixup sound/soc/omap mach mach-omap2
fixup sound/soc/pxa mach mach-pxa
fixup sound/soc/davinci mach mach-davinci
fixup sound/soc/ep93xx mach mach-ep93xx
fixup sound/soc/kirkwood/ mach mach-kirkwood
fixup sound/soc/fsl/imx*.[ch] mach mach-imx
fixup sound/soc/mxs mach mach-mxs
fixup sound/soc/tegra mach mach-tegra
fixup sound/soc/nuc900 mach mach-w90x900
fixup sound/arm/pxa\* mach mach-pxa
fixup sound/atmel/ac97c.c mach mach-at91
fixup sound/oss/waveartist.c mach mach-footbridge
fixup sound/oss/vidc\* mach mach-rpc
fixup sound/soc/atmel/ mach mach-at91
fixup sound/soc/ux500/ mach mach-ux500

fixup include/linux/spi/pxa2xx_spi.h mach mach-pxa
fixup include/linux/mfd/dbx500-prcmu.h mach mach-ux500

find_unique_mach()
{
  {
    # find files in other architectures using mach/*.h
    git ls-files | grep /mach/[^/]*.h | while read i ;
	do echo ${i##*/}
    done
    # find files we've already renamed in ARM
    for i in arch/arm/mach-*/include/mach-*/ ; do
	git ls-files "$i" | sed -e "s:^$i::g"
    done
  } | sort | uniq -c | grep -w 1  | cut -f 2- -d\1
}
rename_unique_mach()
{
  ALLFILES=`git grep -l "^#include.*<mach/"`
  ALLINCLUDES=`git grep "^#include.*<mach/" ${ALLFILES}`
  find_unique_mach | while read i ; do
    echo "$ALLINCLUDES" | if grep -q "#include.*<mach/$i>" &&
		[ -e arch/arm/mach-*/include/mach-*/"$i" ] ; then
       MACH=`ls arch/arm/mach-*/include/mach-*/$i | cut -f 3 -d /`
       THESEFILES=`git grep -l "^#include.*<mach/$i>" ${ALLFILES}`
       echo mach/$i
       for j in ${THESEFILES} ; do
	  fixup $j mach ${MACH}
       done
    fi
  done
}

find_unique_plat()
{
  {
    # all plat/*.h files are already renamed
    for i in arch/arm/plat-*/include/plat-*/ ; do
	git ls-files "$i" | sed -e "s:^$i::g"
    done
  } | sort | uniq -c | grep -w 1  | cut -f 2- -d\1
}
rename_unique_plat()
{
  ALLFILES=`git grep -l "#include.*<plat/"`
  if [ "" != "${ALLFILES}" ] ; then
    find_unique_plat | while read i ; do
      PLAT=`ls arch/arm/plat-*/include/plat-*/$i | cut -f 3 -d /`
      THESEFILES=`git grep -l "^#include.*<plat/$i>" ${ALLFILES}`
      echo plat/$i
       for j in ${THESEFILES} ; do
          fixup $j plat ${PLAT}
       done
    done
  fi
}

rename_unique_mach
rename_unique_plat# Please enter the commit message for your changes. Lines starting

86 files changed, 148 insertions, 148 deletions

diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index 48d7c0aa5073..fa40b04d4c71 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -22,9 +22,9 @@
 #include <sound/ac97_codec.h>
 #include <sound/pxa2xx-lib.h>
 
-#include <mach/irqs.h>
-#include <mach/regs-ac97.h>
-#include <mach/audio.h>
+#include <mach-pxa/irqs.h>
+#include <mach-pxa/regs-ac97.h>
+#include <mach-pxa/audio.h>
 
 static DEFINE_MUTEX(car_mutex);
 static DECLARE_WAIT_QUEUE_HEAD(gsr_wq);
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 0d7b25e81643..be6811257963 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -21,8 +21,8 @@
 #include <sound/initval.h>
 #include <sound/pxa2xx-lib.h>
 
-#include <mach/regs-ac97.h>
-#include <mach/audio.h>
+#include <mach-pxa/regs-ac97.h>
+#include <mach-pxa/audio.h>
 
 #include "pxa2xx-pcm.h"
 
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index 76e0d5695075..c55279f1a67f 100644
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -13,7 +13,7 @@
 #include <sound/pcm_params.h>
 #include <sound/pxa2xx-lib.h>
 
-#include <mach/dma.h>
+#include <mach-pxa/dma.h>
 
 #include "pxa2xx-pcm.h"
 
diff --git a/sound/arm/pxa2xx-pcm.h b/sound/arm/pxa2xx-pcm.h
index 65f86b56ba42..ec542e40ace8 100644
--- a/sound/arm/pxa2xx-pcm.h
+++ b/sound/arm/pxa2xx-pcm.h
@@ -9,7 +9,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <mach/dma.h>
+#include <mach-pxa/dma.h>
 
 struct pxa2xx_runtime_data {
 	int dma_ch;
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index bf47025bdf45..7fb551c368f3 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -33,11 +33,11 @@
 
 #include <linux/dw_dmac.h>
 
-#include <mach/cpu.h>
-#include <mach/gpio.h>
+#include <mach-at91/cpu.h>
+#include <mach-at91/gpio.h>
 
 #ifdef CONFIG_ARCH_AT91
-#include <mach/hardware.h>
+#include <mach-at91/hardware.h>
 #endif
 
 #include "ac97c.h"
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c
index 92ca5bee1860..ace2f31fa08e 100644
--- a/sound/oss/vidc.c
+++ b/sound/oss/vidc.c
@@ -23,7 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 
-#include <mach/hardware.h>
+#include <mach-rpc/hardware.h>
 #include <asm/dma.h>
 #include <asm/io.h>
 #include <asm/hardware/iomd.h>
diff --git a/sound/oss/vidc_fill.S b/sound/oss/vidc_fill.S
index bed34921d176..c293499db95e 100644
--- a/sound/oss/vidc_fill.S
+++ b/sound/oss/vidc_fill.S
@@ -11,7 +11,7 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <mach/hardware.h>
+#include <mach-rpc/hardware.h>
 #include <asm/hardware/iomd.h>
 
 		.text
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index 24c430f721d4..14d37f1737ab 100644
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -47,7 +47,7 @@
 #include "waveartist.h"
 
 #ifdef CONFIG_ARM
-#include <mach/hardware.h>
+#include <mach-footbridge/hardware.h>
 #include <asm/mach-types.h>
 #endif
 
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index 354341ec0f42..d5d6d3277e87 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -42,7 +42,7 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include <mach/hardware.h>
+#include <mach-at91/hardware.h>
 
 #include "atmel-pcm.h"
 #include "atmel_ssc_dai.h"
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index c88351488f45..5cef225ef1a8 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -46,8 +46,8 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
+#include <mach-at91/hardware.h>
+#include <mach-at91/gpio.h>
 
 #include "../codecs/wm8731.h"
 #include "atmel-pcm.h"
diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c
index f65f08beac31..e48fb2da1d2a 100644
--- a/sound/soc/atmel/snd-soc-afeb9260.c
+++ b/sound/soc/atmel/snd-soc-afeb9260.c
@@ -32,7 +32,7 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
+#include <mach-at91/hardware.h>
 #include <linux/gpio.h>
 
 #include "../codecs/tlv320aic23.h"
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index 10a2d8c788b7..ebd9f8cf00ce 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -22,9 +22,9 @@
 #include <asm/dma.h>
 #include <asm/mach-types.h>
 
-#include <mach/asp.h>
-#include <mach/edma.h>
-#include <mach/mux.h>
+#include <mach-davinci/asp.h>
+#include <mach-davinci/edma.h>
+#include <mach-davinci/mux.h>
 
 #include "davinci-pcm.h"
 #include "davinci-i2s.h"
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 0a74b9587a2c..55e29677ac35 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -23,7 +23,7 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include <mach/asp.h>
+#include <mach-davinci/asp.h>
 
 #include "davinci-pcm.h"
 #include "davinci-i2s.h"
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index 4681acc63606..9671efd1e389 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -19,7 +19,7 @@
 #define DAVINCI_MCASP_H
 
 #include <linux/io.h>
-#include <mach/asp.h>
+#include <mach-davinci/asp.h>
 #include "davinci-pcm.h"
 
 #define DAVINCI_MCASP_RATES	SNDRV_PCM_RATE_8000_96000
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index 97d77b298968..4768cc157ea6 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -23,8 +23,8 @@
 #include <sound/soc.h>
 
 #include <asm/dma.h>
-#include <mach/edma.h>
-#include <mach/sram.h>
+#include <mach-davinci/edma.h>
+#include <mach-davinci/sram.h>
 
 #include "davinci-pcm.h"
 
diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h
index c0d6c9be4b4d..c4fe114312ec 100644
--- a/sound/soc/davinci/davinci-pcm.h
+++ b/sound/soc/davinci/davinci-pcm.h
@@ -12,8 +12,8 @@
 #ifndef _DAVINCI_PCM_H
 #define _DAVINCI_PCM_H
 
-#include <mach/edma.h>
-#include <mach/asp.h>
+#include <mach-davinci/edma.h>
+#include <mach-davinci/asp.h>
 
 
 struct davinci_pcm_dma_params {
diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c
index f71175b29e38..11680984271c 100644
--- a/sound/soc/davinci/davinci-sffsdr.c
+++ b/sound/soc/davinci/davinci-sffsdr.c
@@ -28,7 +28,7 @@
 #include <asm/plat-sffsdr/sffsdr-fpga.h>
 #endif
 
-#include <mach/edma.h>
+#include <mach-davinci/edma.h>
 
 #include "../codecs/pcm3008.h"
 #include "davinci-pcm.h"
diff --git a/sound/soc/ep93xx/edb93xx.c b/sound/soc/ep93xx/edb93xx.c
index e01cb02abd3a..48f7de8b8bf8 100644
--- a/sound/soc/ep93xx/edb93xx.c
+++ b/sound/soc/ep93xx/edb93xx.c
@@ -26,7 +26,7 @@
 #include <sound/pcm.h>
 #include <sound/soc.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
+#include <mach-ep93xx/hardware.h>
 #include "ep93xx-pcm.h"
 
 static int edb93xx_hw_params(struct snd_pcm_substream *substream,
diff --git a/sound/soc/ep93xx/ep93xx-ac97.c b/sound/soc/ep93xx/ep93xx-ac97.c
index bdffab33e160..11a77f986987 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 <mach-ep93xx/dma.h>
 #include "ep93xx-pcm.h"
 
 /*
diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c
index 8df8f6dc474f..5f85c8ca4f1e 100644
--- a/sound/soc/ep93xx/ep93xx-i2s.c
+++ b/sound/soc/ep93xx/ep93xx-i2s.c
@@ -26,9 +26,9 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include <mach/hardware.h>
-#include <mach/ep93xx-regs.h>
-#include <mach/dma.h>
+#include <mach-ep93xx/hardware.h>
+#include <mach-ep93xx/ep93xx-regs.h>
+#include <mach-ep93xx/dma.h>
 
 #include "ep93xx-pcm.h"
 
diff --git a/sound/soc/ep93xx/ep93xx-pcm.c b/sound/soc/ep93xx/ep93xx-pcm.c
index 4eea98b42bc8..9d1f54176cff 100644
--- a/sound/soc/ep93xx/ep93xx-pcm.c
+++ b/sound/soc/ep93xx/ep93xx-pcm.c
@@ -25,9 +25,9 @@
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
 
-#include <mach/dma.h>
-#include <mach/hardware.h>
-#include <mach/ep93xx-regs.h>
+#include <mach-ep93xx/dma.h>
+#include <mach-ep93xx/hardware.h>
+#include <mach-ep93xx/ep93xx-regs.h>
 
 #include "ep93xx-pcm.h"
 
diff --git a/sound/soc/ep93xx/simone.c b/sound/soc/ep93xx/simone.c
index dd997094eb30..baceaa79e33c 100644
--- a/sound/soc/ep93xx/simone.c
+++ b/sound/soc/ep93xx/simone.c
@@ -19,7 +19,7 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
+#include <mach-ep93xx/hardware.h>
 
 #include "ep93xx-pcm.h"
 
diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c
index a193cea3cf3c..1e8dfe2ad2a6 100644
--- a/sound/soc/ep93xx/snappercl15.c
+++ b/sound/soc/ep93xx/snappercl15.c
@@ -18,7 +18,7 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
+#include <mach-ep93xx/hardware.h>
 
 #include "../codecs/tlv320aic23.h"
 #include "ep93xx-pcm.h"
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
index ee27ba3933bd..af8ba3c44cce 100644
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@ -29,8 +29,8 @@
 
 #include <asm/fiq.h>
 
-#include <mach/irqs.h>
-#include <mach/ssi.h>
+#include <mach-imx/irqs.h>
+#include <mach-imx/ssi.h>
 
 #include "imx-ssi.h"
 
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 28dd76c7cb1c..2e14c89787af 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -47,8 +47,8 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <mach/ssi.h>
-#include <mach/hardware.h>
+#include <mach-imx/ssi.h>
+#include <mach-imx/hardware.h>
 
 #include "imx-ssi.h"
 
diff --git a/sound/soc/fsl/mx27vis-aic32x4.c b/sound/soc/fsl/mx27vis-aic32x4.c
index f6d04ad4bb39..c744aec4685e 100644
--- a/sound/soc/fsl/mx27vis-aic32x4.c
+++ b/sound/soc/fsl/mx27vis-aic32x4.c
@@ -32,7 +32,7 @@
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
 #include <asm/mach-types.h>
-#include <mach/iomux-mx27.h>
+#include <mach-imx/iomux-mx27.h>
 
 #include "../codecs/tlv320aic32x4.h"
 #include "imx-ssi.h"
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 7646dd7f30cb..fbbc3ded3695 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -21,7 +21,7 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <plat/audio.h>
+#include <plat-orion/audio.h>
 #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 80bd59c33be4..0fcb793fe368 100644
--- a/sound/soc/kirkwood/kirkwood-openrd.c
+++ b/sound/soc/kirkwood/kirkwood-openrd.c
@@ -16,8 +16,8 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <sound/soc.h>
-#include <mach/kirkwood.h>
-#include <plat/audio.h>
+#include <mach-kirkwood/kirkwood.h>
+#include <plat-orion/audio.h>
 #include <asm/mach-types.h>
 #include "../codecs/cs42l51.h"
 
diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c
index f8983635f7ef..75069cca81b5 100644
--- a/sound/soc/kirkwood/kirkwood-t5325.c
+++ b/sound/soc/kirkwood/kirkwood-t5325.c
@@ -15,8 +15,8 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <sound/soc.h>
-#include <mach/kirkwood.h>
-#include <plat/audio.h>
+#include <mach-kirkwood/kirkwood.h>
+#include <plat-orion/audio.h>
 #include <asm/mach-types.h>
 #include "../codecs/alc5623.h"
 
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index aba71bfa33b1..c9a6c3077e24 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -34,8 +34,8 @@
 #include <sound/soc.h>
 #include <sound/saif.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/mxs.h>
+#include <mach-mxs/hardware.h>
+#include <mach-mxs/mxs.h>
 
 #include "mxs-saif.h"
 
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
index 946020a647db..8a69e318fb19 100644
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -22,7 +22,7 @@
 #include <sound/soc.h>
 #include <linux/clk.h>
 
-#include <mach/mfp.h>
+#include <mach-w90x900/mfp.h>
 
 #include "nuc900-audio.h"
 
diff --git a/sound/soc/nuc900/nuc900-pcm.c b/sound/soc/nuc900/nuc900-pcm.c
index 37585b47f4e3..8a6bb3d5e0f6 100644
--- a/sound/soc/nuc900/nuc900-pcm.c
+++ b/sound/soc/nuc900/nuc900-pcm.c
@@ -21,7 +21,7 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <mach/hardware.h>
+#include <mach-w90x900/hardware.h>
 
 #include "nuc900-audio.h"
 
diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c
index 009533ab8d18..217633a020af 100644
--- a/sound/soc/omap/am3517evm.c
+++ b/sound/soc/omap/am3517evm.c
@@ -25,9 +25,9 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <plat/mcbsp.h>
+#include <mach-omap2/hardware.h>
+#include <mach-omap2/gpio.h>
+#include <plat-omap/mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 7d4fa8ed6699..c4418b17699f 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -32,8 +32,8 @@
 
 #include <asm/mach-types.h>
 
-#include <plat/board-ams-delta.h>
-#include <plat/mcbsp.h>
+#include <plat-omap/board-ams-delta.h>
+#include <plat-omap/mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/igep0020.c b/sound/soc/omap/igep0020.c
index e8357819175b..562c20c5afdd 100644
--- a/sound/soc/omap/igep0020.c
+++ b/sound/soc/omap/igep0020.c
@@ -27,9 +27,9 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <plat/mcbsp.h>
+#include <mach-omap2/hardware.h>
+#include <mach-omap2/gpio.h>
+#include <plat-omap/mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index 34835e8a9160..d79f14ad8d7a 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -25,7 +25,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 
-#include <plat/mcbsp.h>
+#include <plat-omap/mcbsp.h>
 
 #include "mcbsp.h"
 
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index abac4b690750..2702f66b8b51 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -29,10 +29,10 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
+#include <mach-omap2/hardware.h>
 #include <linux/gpio.h>
 #include <linux/module.h>
-#include <plat/mcbsp.h>
+#include <plat-omap/mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index 9d93793d3077..ec6182c68be5 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -32,8 +32,8 @@
 #include <sound/jack.h>
 
 #include <asm/mach-types.h>
-#include <plat/hardware.h>
-#include <plat/mux.h>
+#include <plat-omap/hardware.h>
+#include <plat-omap/mux.h>
 
 #include "omap-dmic.h"
 #include "omap-mcpdm.h"
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index 75f5dca0e8d2..826c1a4123c8 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -33,7 +33,7 @@
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
 #include <linux/of_device.h>
-#include <plat/dma.h>
+#include <plat-omap/dma.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index a08245d9203c..f24803b21aaa 100644
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -34,7 +34,7 @@
 #include <sound/asoundef.h>
 #include <video/omapdss.h>
 
-#include <plat/dma.h>
+#include <plat-omap/dma.h>
 #include "omap-pcm.h"
 #include "omap-hdmi.h"
 
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 1046083e90a0..d06d5ad78dba 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -32,8 +32,8 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include <plat/dma.h>
-#include <plat/mcbsp.h>
+#include <plat-omap/dma.h>
+#include <plat-omap/mcbsp.h>
 #include "mcbsp.h"
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 2c66e2498a45..73be0915c38c 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -40,8 +40,8 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <plat/dma.h>
-#include <plat/omap_hwmod.h>
+#include <plat-omap/dma.h>
+#include <plat-omap/omap_hwmod.h>
 #include "omap-mcpdm.h"
 #include "omap-pcm.h"
 
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index 5a649da9122a..16973897d6ec 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -30,7 +30,7 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <plat/dma.h>
+#include <plat-omap/dma.h>
 #include "omap-pcm.h"
 
 static const struct snd_pcm_hardware omap_pcm_hardware = {
diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c
index 2830dfd05661..717d29354696 100644
--- a/sound/soc/omap/omap3beagle.c
+++ b/sound/soc/omap/omap3beagle.c
@@ -27,9 +27,9 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <plat/mcbsp.h>
+#include <mach-omap2/hardware.h>
+#include <mach-omap2/gpio.h>
+#include <plat-omap/mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c
index 3d468c9179d7..4fc55fba9e13 100644
--- a/sound/soc/omap/omap3evm.c
+++ b/sound/soc/omap/omap3evm.c
@@ -25,9 +25,9 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <plat/mcbsp.h>
+#include <mach-omap2/hardware.h>
+#include <mach-omap2/gpio.h>
+#include <plat-omap/mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 4c3a0978578a..95d0ed3c21dd 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -31,7 +31,7 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <plat/mcbsp.h>
+#include <plat-omap/mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index b1a9d64cbc56..03ebe3c0feaf 100644
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -28,10 +28,10 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
+#include <mach-omap1/hardware.h>
 #include <linux/gpio.h>
 #include <linux/module.h>
-#include <plat/mcbsp.h>
+#include <plat-omap/mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c
index 6ac3e0c3c282..e9853843c857 100644
--- a/sound/soc/omap/overo.c
+++ b/sound/soc/omap/overo.c
@@ -27,9 +27,9 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <plat/mcbsp.h>
+#include <mach-omap2/hardware.h>
+#include <mach-omap2/gpio.h>
+#include <plat-omap/mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 2712dd232b6d..d758c8ac5129 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -31,7 +31,7 @@
 #include <sound/jack.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <plat/mcbsp.h>
+#include <plat-omap/mcbsp.h>
 #include "../codecs/tpa6130a2.h"
 
 #include <asm/mach-types.h>
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index 0e283226e2bf..cbdcaf1d1c29 100644
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -31,9 +31,9 @@
 #include <sound/jack.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <plat/mcbsp.h>
+#include <mach-omap2/hardware.h>
+#include <mach-omap2/gpio.h>
+#include <plat-omap/mcbsp.h>
 
 /* Register descriptions for twl4030 codec part */
 #include <linux/mfd/twl4030-audio.h>
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 920e0d9e03db..05a8afdef25c 100644
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -26,10 +26,10 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <mach/board-zoom.h>
-#include <plat/mcbsp.h>
+#include <mach-omap2/hardware.h>
+#include <mach-omap2/gpio.h>
+#include <mach-omap2/board-zoom.h>
+#include <plat-omap/mcbsp.h>
 
 /* Register descriptions for twl4030 codec part */
 #include <linux/mfd/twl4030-audio.h>
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 863367ad89ce..0edc441d80f3 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -25,8 +25,8 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/corgi.h>
-#include <mach/audio.h>
+#include <mach-pxa/corgi.h>
+#include <mach-pxa/audio.h>
 
 #include "../codecs/wm8731.h"
 #include "pxa2xx-i2s.h"
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c
index 7b1bc2390039..b204474e2b76 100644
--- a/sound/soc/pxa/e740_wm9705.c
+++ b/sound/soc/pxa/e740_wm9705.c
@@ -17,8 +17,8 @@
 #include <sound/pcm.h>
 #include <sound/soc.h>
 
-#include <mach/audio.h>
-#include <mach/eseries-gpio.h>
+#include <mach-pxa/audio.h>
+#include <mach-pxa/eseries-gpio.h>
 
 #include <asm/mach-types.h>
 
diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c
index 47b89d71e287..923c14cb3f4e 100644
--- a/sound/soc/pxa/e750_wm9705.c
+++ b/sound/soc/pxa/e750_wm9705.c
@@ -17,8 +17,8 @@
 #include <sound/pcm.h>
 #include <sound/soc.h>
 
-#include <mach/audio.h>
-#include <mach/eseries-gpio.h>
+#include <mach-pxa/audio.h>
+#include <mach-pxa/eseries-gpio.h>
 
 #include <asm/mach-types.h>
 
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c
index ea9707ec6f28..21470d4a4fad 100644
--- a/sound/soc/pxa/e800_wm9712.c
+++ b/sound/soc/pxa/e800_wm9712.c
@@ -18,8 +18,8 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/audio.h>
-#include <mach/eseries-gpio.h>
+#include <mach-pxa/audio.h>
+#include <mach-pxa/eseries-gpio.h>
 
 #include "../codecs/wm9712.h"
 #include "pxa2xx-ac97.h"
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c
index 64743a05aeae..bc0d78408200 100644
--- a/sound/soc/pxa/em-x270.c
+++ b/sound/soc/pxa/em-x270.c
@@ -28,7 +28,7 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/audio.h>
+#include <mach-pxa/audio.h>
 
 #include "../codecs/wm9712.h"
 #include "pxa2xx-ac97.h"
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c
index 2a342c92d829..98178fd7da2c 100644
--- a/sound/soc/pxa/hx4700.c
+++ b/sound/soc/pxa/hx4700.c
@@ -23,7 +23,7 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <mach/hx4700.h>
+#include <mach-pxa/hx4700.h>
 #include <asm/mach-types.h>
 #include "pxa2xx-i2s.h"
 
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index aace19e0fe2c..1d1c9fc517a5 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -28,7 +28,7 @@
 #include <sound/soc.h>
 #include <sound/uda1380.h>
 
-#include <mach/magician.h>
+#include <mach-pxa/magician.h>
 #include <asm/mach-types.h>
 #include "../codecs/uda1380.h"
 #include "pxa2xx-i2s.h"
diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c
index 8687c1c65d29..3306b476a51e 100644
--- a/sound/soc/pxa/mioa701_wm9713.c
+++ b/sound/soc/pxa/mioa701_wm9713.c
@@ -45,7 +45,7 @@
 #include <linux/platform_device.h>
 
 #include <asm/mach-types.h>
-#include <mach/audio.h>
+#include <mach-pxa/audio.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c
index 73ac5463c9e4..191b826327ac 100644
--- a/sound/soc/pxa/mmp-pcm.c
+++ b/sound/soc/pxa/mmp-pcm.c
@@ -21,7 +21,7 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <mach/sram.h>
+#include <mach-pxa/sram.h>
 #include <sound/dmaengine_pcm.h>
 
 struct mmp_dma_data {
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c
index db24bc685bd3..fa3636aca6e1 100644
--- a/sound/soc/pxa/palm27x.c
+++ b/sound/soc/pxa/palm27x.c
@@ -24,8 +24,8 @@
 #include <sound/jack.h>
 
 #include <asm/mach-types.h>
-#include <mach/audio.h>
-#include <mach/palmasoc.h>
+#include <mach-pxa/audio.h>
+#include <mach-pxa/palmasoc.h>
 
 #include "../codecs/wm9712.h"
 #include "pxa2xx-ac97.h"
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index d2cc81735036..d0d872f94432 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -26,8 +26,8 @@
 
 #include <asm/mach-types.h>
 #include <asm/hardware/locomo.h>
-#include <mach/poodle.h>
-#include <mach/audio.h>
+#include <mach-pxa/poodle.h>
+#include <mach-pxa/audio.h>
 
 #include "../codecs/wm8731.h"
 #include "pxa2xx-i2s.h"
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 4da5fc55c7ee..6ab6c441a0de 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -31,8 +31,8 @@
 #include <sound/soc.h>
 #include <sound/pxa2xx-lib.h>
 
-#include <mach/hardware.h>
-#include <mach/dma.h>
+#include <mach-pxa/hardware.h>
+#include <mach-pxa/dma.h>
 
 #include "../../arm/pxa2xx-pcm.h"
 #include "pxa-ssp.h"
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 06ea2744cc88..12b8054e7a58 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -20,10 +20,10 @@
 #include <sound/soc.h>
 #include <sound/pxa2xx-lib.h>
 
-#include <mach/hardware.h>
-#include <mach/regs-ac97.h>
-#include <mach/dma.h>
-#include <mach/audio.h>
+#include <mach-pxa/hardware.h>
+#include <mach-pxa/regs-ac97.h>
+#include <mach-pxa/dma.h>
+#include <mach-pxa/audio.h>
 
 #include "pxa2xx-ac97.h"
 
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 3075a426124c..16c4e71b0402 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -24,9 +24,9 @@
 #include <sound/soc.h>
 #include <sound/pxa2xx-lib.h>
 
-#include <mach/hardware.h>
-#include <mach/dma.h>
-#include <mach/audio.h>
+#include <mach-pxa/hardware.h>
+#include <mach-pxa/dma.h>
+#include <mach-pxa/audio.h>
 
 #include "pxa2xx-i2s.h"
 
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index fc052d8247ff..fc34ca3907b6 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -25,7 +25,7 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/spitz.h>
+#include <mach-pxa/spitz.h>
 #include "../codecs/wm8750.h"
 #include "pxa2xx-i2s.h"
 
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index 2aec63f3706a..8bd1d42613bc 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -28,8 +28,8 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/tosa.h>
-#include <mach/audio.h>
+#include <mach-pxa/tosa.h>
+#include <mach-pxa/audio.h>
 
 #include "../codecs/wm9712.h"
 #include "pxa2xx-ac97.h"
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
index 76ccb172d0a7..6c0c2d48d068 100644
--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -24,9 +24,9 @@
 #include <sound/jack.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/audio.h>
-#include <mach/z2.h>
+#include <mach-pxa/hardware.h>
+#include <mach-pxa/audio.h>
+#include <mach-pxa/z2.h>
 
 #include "../codecs/wm8750.h"
 #include "pxa2xx-i2s.h"
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index 3d04c1fa6781..e18e9c0b8061 100644
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -20,8 +20,8 @@
 #include <sound/soc.h>
 
 #include <mach/dma.h>
-#include <plat/regs-ac97.h>
-#include <plat/audio.h>
+#include <plat-samsung/regs-ac97.h>
+#include <plat-samsung/audio.h>
 
 #include "dma.h"
 
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c
index 6e3257717c54..e58ee603018c 100644
--- a/sound/soc/samsung/h1940_uda1380.c
+++ b/sound/soc/samsung/h1940_uda1380.c
@@ -20,8 +20,8 @@
 #include <sound/soc.h>
 #include <sound/jack.h>
 
-#include <plat/regs-iis.h>
-#include <mach/h1940-latch.h>
+#include <plat-samsung/regs-iis.h>
+#include <mach-s3c24xx/h1940-latch.h>
 #include <asm/mach-types.h>
 
 #include "s3c24xx-i2s.h"
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 6ac7b8281a02..cdc6cea62edc 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -20,7 +20,7 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <plat/audio.h>
+#include <plat-samsung/audio.h>
 
 #include "dma.h"
 #include "idma.h"
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index 321d51134e47..32b6769f208c 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -21,8 +21,8 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <plat/regs-iis.h>
-#include <mach/gta02.h>
+#include <plat-samsung/regs-iis.h>
+#include <mach-s3c24xx/gta02.h>
 
 #include "../codecs/wm8753.h"
 #include "s3c24xx-i2s.h"
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index b7b2a1f91425..19f7dc2e37fe 100644
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -19,8 +19,8 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <plat/audio.h>
-#include <plat/dma.h>
+#include <plat-samsung/audio.h>
+#include <plat-samsung/dma.h>
 
 #include "dma.h"
 #include "pcm.h"
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c
index 21e12361a9cd..75741640db43 100644
--- a/sound/soc/samsung/rx1950_uda1380.c
+++ b/sound/soc/samsung/rx1950_uda1380.c
@@ -24,7 +24,7 @@
 #include <sound/soc.h>
 #include <sound/jack.h>
 
-#include <plat/regs-iis.h>
+#include <plat-samsung/regs-iis.h>
 #include <asm/mach-types.h>
 
 #include "s3c24xx-i2s.h"
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index 0aae3a3883dc..93b34c9691b0 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -24,7 +24,7 @@
 #include <sound/pcm_params.h>
 
 #include <mach/dma.h>
-#include <plat/regs-iis.h>
+#include <plat-samsung/regs-iis.h>
 
 #include "dma.h"
 #include "s3c24xx-i2s.h"
diff --git a/sound/soc/samsung/s3c24xx_simtec.c b/sound/soc/samsung/s3c24xx_simtec.c
index 656d5afe4ca9..19c22b86eab1 100644
--- a/sound/soc/samsung/s3c24xx_simtec.c
+++ b/sound/soc/samsung/s3c24xx_simtec.c
@@ -13,7 +13,7 @@
 
 #include <sound/soc.h>
 
-#include <plat/audio-simtec.h>
+#include <plat-samsung/audio-simtec.h>
 
 #include "s3c24xx-i2s.h"
 #include "s3c24xx_simtec.h"
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c
index d731042e51b0..333d173f1815 100644
--- a/sound/soc/samsung/s3c24xx_uda134x.c
+++ b/sound/soc/samsung/s3c24xx_uda134x.c
@@ -18,7 +18,7 @@
 #include <sound/soc.h>
 #include <sound/s3c24xx_uda134x.h>
 
-#include <plat/regs-iis.h>
+#include <plat-samsung/regs-iis.h>
 
 #include "s3c24xx-i2s.h"
 
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c
index a5a56a120345..2e34fc9c66a5 100644
--- a/sound/soc/samsung/spdif.c
+++ b/sound/soc/samsung/spdif.c
@@ -17,7 +17,7 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <plat/audio.h>
+#include <plat-samsung/audio.h>
 #include <mach/dma.h>
 
 #include "dma.h"
diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c
index bf5610122c76..c8a1707599f9 100644
--- a/sound/soc/tegra/tegra30_ahub.c
+++ b/sound/soc/tegra/tegra30_ahub.c
@@ -25,8 +25,8 @@
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
-#include <mach/clk.h>
-#include <mach/dma.h>
+#include <mach-tegra/clk.h>
+#include <mach-tegra/dma.h>
 #include <sound/soc.h>
 #include "tegra30_ahub.h"
 
diff --git a/sound/soc/tegra/tegra_pcm.h b/sound/soc/tegra/tegra_pcm.h
index a3a450352dcf..4db5b4b09a08 100644
--- a/sound/soc/tegra/tegra_pcm.h
+++ b/sound/soc/tegra/tegra_pcm.h
@@ -31,7 +31,7 @@
 #ifndef __TEGRA_PCM_H__
 #define __TEGRA_PCM_H__
 
-#include <mach/dma.h>
+#include <mach-tegra/dma.h>
 
 struct tegra_pcm_dma_params {
 	unsigned long addr;
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 0c5bb33d258e..8688ddddecdc 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -34,7 +34,7 @@
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
 
-#include <mach/tegra_wm8903_pdata.h>
+#include <mach-tegra/tegra_wm8903_pdata.h>
 
 #include <sound/core.h>
 #include <sound/jack.h>
diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c
index 78cce236693e..2feee1336f4c 100644
--- a/sound/soc/ux500/mop500_ab8500.c
+++ b/sound/soc/ux500/mop500_ab8500.c
@@ -17,7 +17,7 @@
 #include <linux/io.h>
 #include <linux/clk.h>
 
-#include <mach/hardware.h>
+#include <mach-ux500/hardware.h>
 
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index 62ac0285bfaf..c4251cb47e4e 100644
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -20,8 +20,8 @@
 #include <linux/regulator/consumer.h>
 #include <linux/mfd/dbx500-prcmu.h>
 
-#include <mach/hardware.h>
-#include <mach/board-mop500-msp.h>
+#include <mach-ux500/hardware.h>
+#include <mach-ux500/board-mop500-msp.h>
 
 #include <sound/soc.h>
 #include <sound/soc-dai.h>
diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index ee14d2dac2f5..f6b4517fb378 100644
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
@@ -18,8 +18,8 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 
-#include <mach/hardware.h>
-#include <mach/board-mop500-msp.h>
+#include <mach-ux500/hardware.h>
+#include <mach-ux500/board-mop500-msp.h>
 
 #include <sound/soc.h>
 
diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h
index 7f71b4a0d4bc..f67b5fbcfc88 100644
--- a/sound/soc/ux500/ux500_msp_i2s.h
+++ b/sound/soc/ux500/ux500_msp_i2s.h
@@ -17,7 +17,7 @@
 
 #include <linux/platform_device.h>
 
-#include <mach/board-mop500-msp.h>
+#include <mach-ux500/board-mop500-msp.h>
 
 #define MSP_INPUT_FREQ_APB 48000000
 
diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c
index 1a04e248453c..410a19b41452 100644
--- a/sound/soc/ux500/ux500_pcm.c
+++ b/sound/soc/ux500/ux500_pcm.c
@@ -19,7 +19,7 @@
 #include <linux/dmaengine.h>
 #include <linux/slab.h>
 
-#include <plat/ste_dma40.h>
+#include <plat-nomadik/ste_dma40.h>
 
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>