diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-13 21:11:37 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-14 12:09:37 +0000 |
commit | d59d6b49ed5287dd0131acda9428fdc0bb0a7365 (patch) | |
tree | 312ad8f8ae144d3563ddb8352d5b3161c051748f /Documentation | |
parent | 62dd65e1ac307d2ba15f31cc2f754b8e348055c7 (diff) |
[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
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/spi/ep93xx_spi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/spi/ep93xx_spi b/Documentation/spi/ep93xx_spi index d8eb01c15db..f088b4b209d 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 <mach-ep93xx/ep93xx_spi.h> /* this is our GPIO line used for chip select */ #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO9 |