aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
Commit message (Collapse)AuthorAge
...
* | | | Merge branch 'next/soc' of ↵Linus Torvalds2011-07-26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc * 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: MAINTAINERS: add maintainer of CSR SiRFprimaII machine ARM: CSR: initializing L2 cache ARM: CSR: mapping early DEBUG_LL uart ARM: CSR: Adding CSR SiRFprimaII board support OMAP4: clocks: Update the clock tree with 4460 clock nodes OMAP4: PRCM: OMAP4460 specific PRM and CM register bitshifts OMAP4: ID: add omap_has_feature for max freq supported OMAP: ID: introduce chip detection for OMAP4460 ARM: Xilinx: merge board file into main platform code ARM: Xilinx: Adding Xilinx board support Fix up conflicts in arch/arm/mach-omap2/cm-regbits-44xx.h
| * \ \ \ Merge branch 'zynq/master' of ↵Arnd Bergmann2011-07-17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc Conflicts: arch/arm/Kconfig arch/arm/mm/Kconfig
| | * | | | ARM: Xilinx: Adding Xilinx board supportJohn Linn2011-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 1st board support is minimal to get a system up and running on the Xilinx platform. This platform reuses the clock implementation from plat-versatile, and it depends entirely on CONFIG_OF support. There is only one board support file which obtains all device information from a device tree dtb file which is passed to the kernel at boot time. Signed-off-by: John Linn <john.linn@xilinx.com>
| * | | | | ARM: CSR: Adding CSR SiRFprimaII board supportBinghua Duan2011-07-08
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SiRFprimaII is the latest generation application processor from CSR’s Multifunction SoC product family. Designed around an ARM cortex A9 core, high-speed memory bus, advanced 3D accelerator and full-HD multi-format video decoder, SiRFprimaII is able to meet the needs of complicated applications for modern multifunction devices that require heavy concurrent applications and fluid user experience. Integrated with GPS baseband, analog and PMU, this new platform is designed to provide a cost effective solution for Automotive and Consumer markets. This patch adds the basic support for this SoC and EVB board based on device tree. It is following the ZYNQ of Xilinx in some degree. Signed-off-by: Binghua Duan <Binghua.Duan@csr.com> Signed-off-by: Rongjun Ying <Rongjun.Ying@csr.com> Signed-off-by: Zhiwu Song <Zhiwu.Song@csr.com> Signed-off-by: Yuping Luo <Yuping.Luo@csr.com> Signed-off-by: Bin Shi <Bin.Shi@csr.com> Signed-off-by: Huayi Li <Huayi.Li@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
* | | | | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-07-24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (237 commits) ARM: 7004/1: fix traps.h compile warnings ARM: 6998/2: kernel: use proper memory barriers for bitops ARM: 6997/1: ep93xx: increase NR_BANKS to 16 for support of 128MB RAM ARM: Fix build errors caused by adding generic macros ARM: CPU hotplug: ensure we migrate all IRQs off a downed CPU ARM: CPU hotplug: pass in proper affinity mask on IRQ migration ARM: GIC: avoid routing interrupts to offline CPUs ARM: CPU hotplug: fix abuse of irqdesc->node ARM: 6981/2: mmci: adjust calculation of f_min ARM: 7000/1: LPAE: Use long long printk format for displaying the pud ARM: 6999/1: head, zImage: Always Enter the kernel in ARM state ARM: btc: avoid invalidating the branch target cache on kernel TLB maintanence ARM: ARM_DMA_ZONE_SIZE is no more ARM: mach-shark: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size ARM: mach-sa1100: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size ARM: mach-realview: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size ARM: mach-pxa: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size ARM: mach-ixp4xx: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size ARM: mach-h720x: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size ...
| * \ \ \ \ Merge branch 'devel-stable' into for-nextRussell King2011-07-22
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/kernel/entry-armv.S
| | * | | | | ARM: Fix build errors caused by adding generic macrosRussell King2011-07-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 66a625a (ARM: mm: proc-macros: Add generic proc/cache/tlb struct definition macros) introduced build errors when PM_SLEEP is not enabled. The per-CPU do_suspend/do_resume functions are defined via the preprocessor to constant 0. However, the macros which use these were converted to assembly, resulting in undefined references to these functions. Fix that by moving the ! ifdef section into proc-macros.S and deleting it from all effected proc-*.S files. Acked-by: Dave Martin <dave.martin@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | | | Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into ↵Russell King2011-07-18
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | devel-stable
| | | * | | | | ARM: ARM_DMA_ZONE_SIZE is no moreNicolas Pitre2011-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One less dependency on mach/memory.h. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | | * | | | | ARM: change ARM_DMA_ZONE_SIZE into a variableNicolas Pitre2011-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having this value defined at compile time prevents multiple machines with conflicting definitions to coexist. Move it to a variable in preparation for having a per machine value selected at run time. This is relevant only when CONFIG_ZONE_DMA is selected. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * | | | | | Merge branch 'kprobes-thumb' of git://git.yxit.co.uk/linux into devel-stableRussell King2011-07-15
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | ARM: proc: add definition of cpu_reset for ARMv6 and ARMv7 coresWill Deacon2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds simple definitions of cpu_reset for ARMv6 and ARMv7 cores, which disable the MMU via the SCTLR. Signed-off-by: Will Deacon <will.deacon@arm.com>
| | * | | | | | ARM: proc: add proc info for Cortex-A15MP using classic page tablesWill Deacon2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multicore implementations of the Cortex-A15 require bit 6 of the auxiliary control register to be set in order for cache and TLB maintenance operations to be broadcast between CPUs. This patch adds a new proc_info structure for Cortex-A15, which enables the SMP bit during setup and includes the new HWCAP for integer division. Signed-off-by: Will Deacon <will.deacon@arm.com>
| | * | | | | | ARM: proc: add Cortex-A5 proc infoPawel Moll2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds processor info for ARM Ltd. Cortex A5, which has SCU initialisation procedure identical to A9. Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
| | * | | | | | ARM: proc: convert v7 proc infos into a common macroPawel Moll2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As most of the proc info content is common across all v7 processors, this patch converts existing A9 and generic v7 descriptions into a macro (allowing extra flags in future). Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
| | * | | | | | ARM: mm: tlb-v7: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: tlb-v6: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: tlb-v4wbi: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: tlb-v4wb: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: tlb-v4: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: tlb-v3: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: tlb-fa: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-xscale: Use new generic struct definition macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this patch, xscale_80200_A0_A1 is missing the icache_flush_all entry, which would result in the wrong functions being called at run-time. This patch re-uses xscale_icache_flush_all for xscale_80200_A0_A1_cache_fns. Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-xsc3: Use new generic struct definition macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-v7: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-v6: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-sa1100: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-sa110: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-mohawk: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch also defines a suitable flush_icache_all implementation which would otherwise be missing, resulting in a link failure. Thanks to Nicolas Pitre for suggesting the code for this. Signed-off-by: Dave Martin <dave.martin@linaro.org> Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * | | | | | ARM: mm: proc-feroceon: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org> Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * | | | | | ARM: mm: proc-fa526: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm9tdmi: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm946: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm940: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm926: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm925: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm922: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm920: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm7tdmi: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm740: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm720: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm6_7: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm1026: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm1022: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm1020e: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: proc-arm1020: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: cache-v7: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: cache-v6: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: cache-v4wt: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>
| | * | | | | | ARM: mm: cache-v4wb: Use the new processor struct macrosDave Martin2011-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Martin <dave.martin@linaro.org>