summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next/fixes' into next/cleanupArnd Bergmann2011-10-31415-3041/+2371
|\ | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/plat-mxc/include/mach/gpio.h drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
| * Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-10-31465-1664/+825
| |\ | | | | | | | | | | | | | | | Fix up all conflicts between the memory.h cleanup and bug fixes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_HNicolas Pitre2011-10-133-41/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given that we want the default to not have any <mach/memory.h> and given that there are now fewer cases where it is still provided than the cases where it is not at this point, this makes sense to invert the logic and just identify the exception cases. The word "need" instead of "have" was chosen to construct the config symbol so not to suggest that having a mach/memory.h file is actually a feature that one should aim for. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-s5p64x0: remove mach/memory.hNicolas Pitre2011-10-132-18/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-s3c64xx: remove mach/memory.hNicolas Pitre2011-10-132-18/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: plat-mxc: remove mach/memory.hNicolas Pitre2011-10-132-43/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-prima2: remove mach/memory.hNicolas Pitre2011-10-133-17/+3
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-zynq: remove mach/memory.hNicolas Pitre2011-10-132-22/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-bcmring: remove mach/memory.hNicolas Pitre2011-10-133-30/+2
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-davinci: remove mach/memory.hNicolas Pitre2011-10-135-41/+7
| | | | | | | | | | | | | | | | | | Move some DDR2 related defines into a private <mach/ddr2.h> beforehand. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-pxa: remove mach/memory.hNicolas Pitre2011-10-133-21/+2
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-ixp4xx: remove mach/memory.hNicolas Pitre2011-10-132-17/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-h720x: remove mach/memory.hNicolas Pitre2011-10-132-11/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-vt8500: remove mach/memory.hNicolas Pitre2011-10-132-28/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-s5pc100: remove mach/memory.hNicolas Pitre2011-10-132-18/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-tegra: remove mach/memory.hNicolas Pitre2011-10-132-28/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: plat-tcc: remove mach/memory.hNicolas Pitre2011-10-132-18/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-mmp: remove mach/memory.hNicolas Pitre2011-10-132-14/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-cns3xxx: remove mach/memory.hNicolas Pitre2011-10-132-26/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-nuc93x: remove mach/memory.hNicolas Pitre2011-10-132-21/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-mxs: remove mach/memory.hNicolas Pitre2011-10-132-24/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: spear: remove mach/memory.h and plat/memory.hNicolas Pitre2011-10-134-58/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-msm: remove mach/memory.hNicolas Pitre2011-10-132-35/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-gemini: remove mach/memory.hNicolas Pitre2011-10-132-19/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-lpc32xx: remove mach/memory.hNicolas Pitre2011-10-132-27/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-netx: remove mach/memory.hNicolas Pitre2011-10-132-26/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-versatile: remove mach/memory.hNicolas Pitre2011-10-132-28/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-ux500: remove mach/memory.hNicolas Pitre2011-10-132-18/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-nomadik: remove mach/memory.hNicolas Pitre2011-10-132-28/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-iop32x: remove mach/memory.hNicolas Pitre2011-10-132-13/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-pnx4008: remove mach/memory.hNicolas Pitre2011-10-132-21/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-w90x900: remove mach/memory.hNicolas Pitre2011-10-132-23/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-vexpress: remove mach/memory.hNicolas Pitre2011-10-132-25/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-mv78xx0: remove mach/memory.hNicolas Pitre2011-10-132-10/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-s3c2410: remove memory.hNicolas Pitre2011-10-133-36/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also removes the mach/s3c2400 version which was probably never used due to the fact that we have this line in arch/arm/Makefile: machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 [...] This is later used to construct the search path for: The compiler would be looking into mach-s3c2410 and picking up this version first. Any config that was actually expecting the mach-s3c2400 version was therefore producing a broken kernel binary. Not relying on any of them anymore would fix that issue. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-iop33x: remove mach/memory.hNicolas Pitre2011-09-262-13/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-omap2: remove mach/memory.hNicolas Pitre2011-09-263-51/+1
| | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Tony Lindgren <tony@atomide.com>
| | * ARM: OMAP: move OMAP1 memory config from plat/memory.h to its mach/memory.hNicolas Pitre2011-09-262-45/+53
| | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Tony Lindgren <tony@atomide.com>
| | * ARM: mach-orion5x: remove mach/memory.hNicolas Pitre2011-09-262-12/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-kirkwood: remove mach/memory.hNicolas Pitre2011-09-262-10/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-dove: remove include/mach/memory.hNicolas Pitre2011-09-262-10/+1
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: prepare for removal of a bunch of <mach/memory.h> filesNicolas Pitre2011-09-263-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the CONFIG_NO_MACH_MEMORY_H symbol is selected by a particular machine class, the machine specific memory.h include file is no longer used and can be removed. In that case the equivalent information can be obtained dynamically at runtime by enabling CONFIG_ARM_PATCH_PHYS_VIRT or by specifying the physical memory address at kernel configuration time. If/when all instances of mach/memory.h are removed then this symbol could be removed. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * ARM: mach-davinci: clean up debug-macro.SNicolas Pitre2011-09-261-24/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This achieves two goals: 1) Get rid of davinci_uart_v2p() and davinci_uart_p2v() which were the last users of PLAT_PHYS_OFFSET. 2) Remove the probing of the M bit in the CP15 control reg and make the access to the .data variables completely position independent. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Reviewed-by: Kevin Hilman <khilman@ti.com> Tested-by: Kevin Hilman <khilman@ti.com>
| | * ARM: mach-davinci: make DAVINCI_UART_INFO into a relative offsetNicolas Pitre2011-09-263-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step to remove PLAT_PHYS_OFFSET usage from the debug UART code. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Reviewed-by: Kevin Hilman <khilman@ti.com> Tested-by: Kevin Hilman <khilman@ti.com>
| | * ARM: mach-omap2: clean up debug-macro.SNicolas Pitre2011-09-261-39/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This achieves two goals: 1) Get rid of omap_uart_v2p() and omap_uart_p2v() which were the last users of PLAT_PHYS_OFFSET. 2) Remove the probing of the M bit in the CP15 control reg and make the access to the .data variables completely position independent. There is a catch though: the busyuart macro needs to know where the LSR register is which might be at a different offset depending on the hardware. Given that this macro is given only two registers and that one of them must be preserved, the trick is to always pass the LSR register address around, and deduce the base address for the THR register by masking out the LSR offset in senduart instead. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Tested-by: Tony Lindgren <tony@atomide.com> Reviewed-by: Kevin Hilman <khilman@ti.com>
| | * ARM: mach-omap1: clean up debug-macro.SNicolas Pitre2011-09-261-21/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This achieves two goals: 1) Get rid of omap_uart_v2p() and omap_uart_p2v() which were the last users of PLAT_PHYS_OFFSET. 2) Remove the probing of the M bit in the CP15 control reg and make the access to the .data variables completely position independent. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Tested-by: Tony Lindgren <tony@atomide.com> Reviewed-by: Kevin Hilman <khilman@ti.com>
| | * ARM: plat-omap: make OMAP_UART_INFO into a relative offsetNicolas Pitre2011-09-264-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step to remove PLAT_PHYS_OFFSET usage from the debug UART code. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Tested-by: Tony Lindgren <tony@atomide.com> Reviewed-by: Kevin Hilman <khilman@ti.com>
| | * ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-2655-58/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some platforms (like OMAP not to name it) are doing rather complicated hacks just to determine the base UART address to use. Let's give their addruart macro some slack by providing an extra work register which will allow for much needed cleanups. This is basically a no-op as this commit is only adding the extra argument to the macro but no one is using it yet. Signed-off-by: nicolas Pitre <nicolas.pitre@linaro.org> Reviewed-by: Kevin Hilman <khilman@ti.com>
| | * musb_debugfs.c: remove unneeded includes on ARMNicolas Pitre2011-09-261-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | Nothing actually requires that <mach/hardware.h>, <mach/memory.h> nor <asm/mach-types.h> be included here. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Felipe Balbi <balbi@ti.com>
| | * ARM: mach-prima2: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_sizeNicolas Pitre2011-09-062-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original comment: Restrict DMA-able region to workaround silicon limitation. The limitation restricts buffers available for DMA to SD/MMC hardware to be below 256MB. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
OpenPOWER on IntegriCloud