From: Arnd Bergmann <arnd@xxxxxxxx>
I got a few emails about (harmless) warnings and one build
failure or my pending omap1 multiplatform changes. I fixed them
up here, and added three more patches to move the platform
headers from the now obsolete include/mach/ subdir into
the corresponding platforms where this was not already done.
I already have these in the arm/multiplatform branch of the soc
tree, and if everyone is happy with the changes, I'll just
merge this into the for-next branch.
Arnd
Arnd Bergmann (6):
ARM: omap2: remove include/mach/ subdirectory
ARM: davinci: remove include/mach/ subdirectory
ARM: spear: remove include/mach/ subdirectory
ARM: omap: fix address space warnings from sparse
ARM: omap2: fix missing declaration warnings
ARM: omap1: add back omap_set_dma_priority() stub
arch/arm/mach-davinci/Makefile | 4 +-
arch/arm/mach-davinci/board-da830-evm.c | 7 +-
arch/arm/mach-davinci/board-da850-evm.c | 7 +-
arch/arm/mach-davinci/board-dm355-evm.c | 5 +-
arch/arm/mach-davinci/board-dm355-leopard.c | 5 +-
arch/arm/mach-davinci/board-dm365-evm.c | 6 +-
arch/arm/mach-davinci/board-dm644x-evm.c | 7 +-
arch/arm/mach-davinci/board-dm646x-evm.c | 5 +-
arch/arm/mach-davinci/board-mityomapl138.c | 8 +-
arch/arm/mach-davinci/board-neuros-osd2.c | 7 +-
arch/arm/mach-davinci/board-omapl138-hawk.c | 6 +-
arch/arm/mach-davinci/board-sffsdr.c | 6 +-
arch/arm/mach-davinci/common.c | 4 +-
.../mach-davinci/{include/mach => }/common.h | 0
.../mach-davinci/{include/mach => }/cputype.h | 2 +-
arch/arm/mach-davinci/da830.c | 11 +-
arch/arm/mach-davinci/da850.c | 12 +-
arch/arm/mach-davinci/da8xx-dt.c | 4 +-
.../mach-davinci/{include/mach => }/da8xx.h | 5 +-
arch/arm/mach-davinci/davinci.h | 3 +-
arch/arm/mach-davinci/devices-da8xx.c | 7 +-
arch/arm/mach-davinci/devices.c | 7 +-
arch/arm/mach-davinci/dm355.c | 12 +-
arch/arm/mach-davinci/dm365.c | 12 +-
arch/arm/mach-davinci/dm644x.c | 12 +-
arch/arm/mach-davinci/dm646x.c | 12 +-
.../{include/mach => }/hardware.h | 0
arch/arm/mach-davinci/include/mach/mux.h | 990 ------------------
.../mach-davinci/include/mach/uncompress.h | 97 --
arch/arm/mach-davinci/mux.c | 4 +-
arch/arm/mach-davinci/mux.h | 969 ++++++++++++++++-
arch/arm/mach-davinci/pdata-quirks.c | 4 +-
arch/arm/mach-davinci/pm.c | 9 +-
arch/arm/mach-davinci/{include/mach => }/pm.h | 0
arch/arm/mach-davinci/serial.c | 4 +-
.../mach-davinci/{include/mach => }/serial.h | 2 +-
arch/arm/mach-davinci/sram.c | 2 +-
arch/arm/mach-davinci/usb-da8xx.c | 7 +-
arch/arm/mach-davinci/usb.c | 5 +-
arch/arm/mach-omap1/board-ams-delta.c | 2 +-
arch/arm/mach-omap1/fb.c | 2 +-
arch/arm/mach-omap1/i2c.c | 1 +
arch/arm/mach-omap1/omap-dma.c | 18 +-
arch/arm/mach-omap1/sram-init.c | 2 +-
arch/arm/mach-omap1/timer32k.c | 2 +-
arch/arm/mach-omap2/Makefile | 3 -
arch/arm/mach-omap2/common.h | 13 +-
arch/arm/mach-omap2/dma.c | 1 +
arch/arm/mach-omap2/include/mach/hardware.h | 3 -
arch/arm/mach-omap2/include/mach/irqs.h | 3 -
arch/arm/mach-omap2/include/mach/serial.h | 66 --
arch/arm/mach-omap2/omap-iommu.c | 1 +
arch/arm/mach-omap2/pdata-quirks.c | 11 -
arch/arm/mach-omap2/serial.h | 67 +-
arch/arm/mach-spear/Makefile | 2 -
arch/arm/mach-spear/include/mach/irqs.h | 35 -
arch/arm/mach-spear/include/mach/uncompress.h | 42 -
.../mach-spear/{include/mach => }/misc_regs.h | 4 +-
arch/arm/mach-spear/pl080.c | 4 +-
arch/arm/mach-spear/platsmp.c | 2 +-
arch/arm/mach-spear/restart.c | 2 +-
.../arm/mach-spear/{include/mach => }/spear.h | 0
arch/arm/mach-spear/spear1310.c | 2 +-
arch/arm/mach-spear/spear13xx.c | 2 +-
arch/arm/mach-spear/spear300.c | 2 +-
arch/arm/mach-spear/spear310.c | 2 +-
arch/arm/mach-spear/spear320.c | 2 +-
arch/arm/mach-spear/spear3xx.c | 4 +-
arch/arm/mach-spear/spear6xx.c | 4 +-
include/linux/omap-dma.h | 7 +
70 files changed, 1172 insertions(+), 1408 deletions(-)
rename arch/arm/mach-davinci/{include/mach => }/common.h (100%)
rename arch/arm/mach-davinci/{include/mach => }/cputype.h (98%)
rename arch/arm/mach-davinci/{include/mach => }/da8xx.h (99%)
rename arch/arm/mach-davinci/{include/mach => }/hardware.h (100%)
delete mode 100644 arch/arm/mach-davinci/include/mach/mux.h
delete mode 100644 arch/arm/mach-davinci/include/mach/uncompress.h
rename arch/arm/mach-davinci/{include/mach => }/pm.h (100%)
rename arch/arm/mach-davinci/{include/mach => }/serial.h (97%)
delete mode 100644 arch/arm/mach-omap2/include/mach/hardware.h
delete mode 100644 arch/arm/mach-omap2/include/mach/irqs.h
delete mode 100644 arch/arm/mach-omap2/include/mach/serial.h
delete mode 100644 arch/arm/mach-spear/include/mach/irqs.h
delete mode 100644 arch/arm/mach-spear/include/mach/uncompress.h
rename arch/arm/mach-spear/{include/mach => }/misc_regs.h (87%)
rename arch/arm/mach-spear/{include/mach => }/spear.h (100%)
--
2.29.2
