[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
fixup arch/arm/plat-s5p 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/staging/omapdrm plat plat-omap
fixup drivers/staging/tidspbridge/ plat plat-omap
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/imx 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/imx 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 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

Conflicts:

	arch/arm/mach-at91/at91sam9260_devices.c
	arch/arm/mach-at91/at91sam9g45_devices.c
	arch/arm/mach-at91/board-sam9g20ek.c
	arch/arm/mach-at91/board-sam9m10g45ek.c
	arch/arm/mach-at91/include/mach-at91/hardware.h
	arch/arm/mach-clps711x/include/mach-clps711x/debug-macro.S
	arch/arm/mach-clps711x/include/mach-clps711x/entry-macro.S
	arch/arm/mach-clps711x/include/mach-clps711x/uncompress.h
	arch/arm/mach-exynos/clock-exynos4210.c
	arch/arm/mach-exynos/clock-exynos4212.c
	arch/arm/mach-exynos/cpuidle.c
	arch/arm/mach-exynos/dev-sysmmu.c
	arch/arm/mach-exynos/mach-smdk4x12.c
	arch/arm/mach-exynos/mach-universal_c210.c
	arch/arm/mach-imx/clock-imx1.c
	arch/arm/mach-imx/clock-imx21.c
	arch/arm/mach-imx/clock-imx25.c
	arch/arm/mach-imx/clock-imx27.c
	arch/arm/mach-imx/clock-imx31.c
	arch/arm/mach-imx/clock-imx35.c
	arch/arm/mach-imx/clock-imx6q.c
	arch/arm/mach-imx/clock-mx51-mx53.c
	arch/arm/mach-imx/eukrea_mbimx51-baseboard.c
	arch/arm/mach-imx/mach-cpuimx51.c
	arch/arm/mach-imx/mach-imx27_visstrim_m10.c
	arch/arm/mach-imx/mach-mx31moboard.c
	arch/arm/mach-imx/mm-imx21.c
	arch/arm/mach-imx/mm-imx27.c
	arch/arm/mach-integrator/include/mach-integrator/entry-macro.S
	arch/arm/mach-kirkwood/common.c
	arch/arm/mach-mmp/devices.c
	arch/arm/mach-mmp/include/mach-mmp/entry-macro.S
	arch/arm/mach-mmp/irq-mmp2.c
	arch/arm/mach-mmp/irq-pxa168.c
	arch/arm/mach-mmp/mmp-dt.c
	arch/arm/mach-mmp/pxa168.c
	arch/arm/mach-mmp/ttc_dkb.c
	arch/arm/mach-mxs/clock-mx23.c
	arch/arm/mach-mxs/clock-mx28.c
	arch/arm/mach-mxs/clock.c
	arch/arm/mach-mxs/devices-mx23.h
	arch/arm/mach-mxs/devices-mx28.h
	arch/arm/mach-mxs/devices/amba-duart.c
	arch/arm/mach-mxs/include/mach-mxs/devices-common.h
	arch/arm/mach-omap1/common.h
	arch/arm/mach-omap1/devices.c
	arch/arm/mach-omap1/io.c
	arch/arm/mach-omap2/board-cm-t35.c
	arch/arm/mach-omap2/board-igep0020.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-omap2/board-omap3logic.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/board-overo.c
	arch/arm/mach-omap2/common.h
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/omap-secure.c
	arch/arm/mach-omap2/omap4-common.c
	arch/arm/mach-omap2/omap_hwmod_2420_data.c
	arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
	arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
	arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
	arch/arm/mach-s3c24xx/common.c
	arch/arm/mach-s3c64xx/mach-crag6410.c
	arch/arm/mach-s3c64xx/mach-smartq.c
	arch/arm/mach-s3c64xx/mach-smdk6410.c
	arch/arm/mach-shmobile/pfc-r8a7740.c
	arch/arm/mach-shmobile/platsmp.c
	arch/arm/mach-spear3xx/clock.c
	arch/arm/mach-spear6xx/clock.c
	arch/arm/mach-tegra/board-harmony-pinmux.c
	arch/arm/mach-tegra/board-paz00-pinmux.c
	arch/arm/mach-tegra/board-pinmux.c
	arch/arm/mach-tegra/board-seaboard-pinmux.c
	arch/arm/mach-tegra/board-trimslice-pinmux.c
	arch/arm/mach-tegra/pinmux-tegra20-tables.c
	arch/arm/mach-tegra/pinmux-tegra30-tables.c
	arch/arm/mach-tegra/pinmux.c
	arch/arm/mach-ux500/board-mop500-pins.c
	arch/arm/mach-ux500/board-mop500.c
	arch/arm/mach-ux500/board-u5500-sdi.c
	arch/arm/mach-ux500/board-u5500.c
	arch/arm/mach-ux500/cpu-db5500.c
	arch/arm/mach-ux500/devices-common.h
	arch/arm/mach-ux500/dma-db5500.c
	arch/arm/mach-ux500/include/mach-ux500/hardware.h
	arch/arm/mach-ux500/include/mach-ux500/irqs.h
	arch/arm/mach-ux500/mbox-db5500.c
	arch/arm/mach-ux500/modem-irq-db5500.c
	arch/arm/plat-omap/common.c
	arch/arm/plat-omap/include/plat-omap/mmc.h
	arch/arm/plat-orion/common.c
	arch/arm/plat-s3c24xx/clock.c
	arch/arm/plat-s3c24xx/dev-uart.c
	arch/arm/plat-s5p/sysmmu.c
	arch/arm/plat-samsung/devs.c
	arch/arm/plat-samsung/include/plat-samsung/sysmmu.h
	arch/arm/plat-spear/clock.c
	drivers/dma/mv_xor.c
	drivers/dma/mxs-dma.c
	drivers/gpio/gpio-mxs.c
	drivers/gpio/gpio-tegra.c
	drivers/mfd/db5500-prcmu.c
	drivers/mfd/omap-usb-host.c
	drivers/mmc/host/mxs-mmc.c
	drivers/mmc/host/sdhci-esdhc-imx.c
	drivers/pinctrl/pinctrl-nomadik.c
	drivers/usb/gadget/s3c-hsotg.c
	drivers/usb/host/ehci-orion.c
	drivers/video/clps711xfb.c
	drivers/video/mxsfb.c
	drivers/watchdog/orion_wdt.c
	sound/soc/omap/omap-dmic.c
	sound/soc/tegra/tegra_das.c
	sound/soc/tegra/tegra_i2s.c
	sound/soc/tegra/tegra_spdif.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 6c6bc578d0fc..6abd6a12189e 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -46,7 +46,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
 #include <linux/pinctrl/consumer.h>
-#include <mach/mxsfb.h>
+#include <mach-mxs/mxsfb.h>
 
 #define REG_SET	4
 #define REG_CLR	8