summaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'omap4_upstream' of ↵Russell King2009-08-037-54/+346
|\ | | | | | | git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into devel-stable
| * ARM: OMAP4: Update the GPIO supportSyed Rafiuddin2009-07-281-51/+198
| | | | | | | | | | | | This patch adds GPIO support on OMAP4430 development platform. Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
| * ARM: OMAP4: Add UART4 supportSyed Rafiuddin2009-07-282-1/+11
| | | | | | | | | | | | This patch adds UART4 support on OMAP4430 development platform. Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
| * ARM: OMAP4: Add McBSP supportSyed Rafiuddin2009-07-283-2/+49
| | | | | | | | | | | | | | This patch creates McBSP support on OMAP4430 development platform. This patch includes corresponding base address changes for OMAP4. Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com>
| * OMAP4: sDMA: Update the request lines and new registers.Santosh Shilimkar2009-07-241-0/+88
| | | | | | | | | | | | | | | | | | This patch updates the platform dma.h with new dma request lines for OMAP4 peripherals. Also additional hardware register of OMAP4 sDMA module are included. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | Include linux/sched.h in arch/arm/mm/fault.cCatalin Marinas2009-07-241-0/+1
| | | | | | | | | | | | | | When building with !MMU, task_struct is not defined. Just include the relevant file. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | nommu: Do not set PRRR and NMRR in proc-v7.S if !MMUCatalin Marinas2009-07-241-1/+1
| | | | | | | | | | | | ARMv7-R profile CPUs do not have these registers. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | nommu: Fix compressed/head.S to not perform MMU specific operationsCatalin Marinas2009-07-241-0/+14
| | | | | | | | Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | nommu: Do not allow REALVIEW_HIGH_PHYS_OFFSET if !MMUCatalin Marinas2009-07-241-1/+1
| | | | | | | | Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | nommu: Add #ifdef CONFIG_MMU around the PTE sanity checksCatalin Marinas2009-07-241-0/+2
| | | | | | | | Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | nommu: Include asm/setup.h in arch/arm/mm/nommu.cCatalin Marinas2009-07-241-0/+1
| | | | | | | | | | | | This is needed for the struct meminfo definition. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | nommu: Add noMMU support to the DMA APICatalin Marinas2009-07-241-22/+72
| | | | | | | | Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | nommu: Remove the memory_start/end variables from ARM page-nommu.hCatalin Marinas2009-07-241-3/+0
| | | | | | | | | | | | These variables do not seem to be used anywhere in the kernel. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | nommu: Enables to select noMMU modeHyok S. Choi2009-07-241-4/+7
| | | | | | | | | | | | | | | | MMU option is now selectable. Signed-off-by: Hyok S. Choi <hyok.choi@samsung.com>
* | nommu: Do not override the CP15 control reg value returned from initfuncCatalin Marinas2009-07-241-1/+4
| | | | | | | | | | | | | | | | | | | | The patch removes the "mrc" instruction in head-nommu.S overriding the r0 register containing the value to be written in the CP15 system control register. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | nommu: ptrace supportPaul Brook2009-07-242-1/+15
| | | | | | | | | | | | | | | | | | The patch below adds ARM ptrace functions to get the process load address. This is required for useful userspace debugging on mmuless systems. These values are obtained by reading magic offsets with PTRACE_PEEKUSR, as on other nommu targets. I picked arbitrary large values for the offsets. Signed-off-by: Paul Brook <paul@codesourcery.com>
* | nommu: Add MMU-less support for the RealView boardsCatalin Marinas2009-07-241-0/+4
| | | | | | | | | | | | This patch defines the IO_ADDRESS macro for the !CONFIG_MMU case. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | nommu: Add MMU-less support for Integrator platformsCatalin Marinas2009-07-242-8/+12
| | | | | | | | | | | | | | | | | | This patch redefines the IO_ADDRESS macro in include/asm-arm/hardware.h. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | nommu: Remove the context.id from asm-offsets.c when !MMUCatalin Marinas2009-07-241-0/+2
| | | | | | | | | | | | | | | | There is no MMU context switching on MMU-less systems. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | nommu: Fix the fault processing for the MMU-less caseCatalin Marinas2009-07-241-0/+22
| | | | | | | | | | | | | | | | | | The patch adds the necessary ifdefs around functions that only make sense when the MMU is enabled. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | Thumb-2: Add Thumb-2 support to the build filesCatalin Marinas2009-07-243-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the necessary entries to the Makefile and Kconfig files for building the Thumb-2 kernel. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | Thumb-2: Make the uImage entry an odd numberCatalin Marinas2009-07-241-1/+8
| | | | | | | | | | | | | | This allows U-Boot to branch to the kernel in Thumb-2 mode via "mov pc, lr". Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | Thumb-2: Pass a Thumb-2 address to the secondary CPUs to jump toCatalin Marinas2009-07-241-12/+6
| | | | | | | | | | | | | | This patch sets bit 0 in the startup address passed to the secondary CPUs so that they branch into Thumb-2 mode. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | Thumb-2: Add support for loadable modulesCatalin Marinas2009-07-243-0/+62
| | | | | | | | | | | | | | | | | | | | Modules compiled to Thumb-2 have two additional relocations needing to be resolved at load time, R_ARM_THM_CALL and R_ARM_THM_JUMP24, for BL and B.W instructions. The maximum Thumb-2 addressing range is +/-2^24 (+/-16MB) therefore the MODULES_VADDR macro in asm/memory.h is set to (MODULES_END - 8MB) for the Thumb-2 compiled kernel. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | Thumb-2: Implement the unified boot codeCatalin Marinas2009-07-241-68/+99
| | | | | | | | | | | | | | This patch adds the ARM/Thumb-2 unified support for the arch/arm/boot/* files. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | Thumb-2: Implement the unified VFP supportCatalin Marinas2009-07-241-16/+32
| | | | | | | | | | | | | | | | This patch modifies the VFP files for the ARM/Thumb-2 unified assembly syntax. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | Thumb-2: Implement the unified arch/arm/lib functionsCatalin Marinas2009-07-2420-98/+229
| | | | | | | | | | | | | | | | | | | | This patch adds the ARM/Thumb-2 unified support for the arch/arm/lib/* files. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | Thumb-2: Implement the unified arch/arm/mm supportCatalin Marinas2009-07-243-11/+30
| | | | | | | | | | | | | | This patch adds the ARM/Thumb-2 unified support to the arch/arm/mm/* files. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | Thumb-2: Implementation of the unified start-up and exceptions codeCatalin Marinas2009-07-2411-120/+263
| | | | | | | | | | | | | | This patch implements the ARM/Thumb-2 unified kernel start-up and exception handling code. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | Thumb-2: Add macros for the unified assembler syntaxCatalin Marinas2009-07-243-1/+130
| | | | | | | | | | | | | | | | This patch adds various C and assembler macros that help with using the unified assembler syntax for compiling files to either ARM or Thumb-2 modes. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* | Thumb-2: Add some .align statements to the .S filesCatalin Marinas2009-07-245-0/+13
|/ | | | | | | | Since the Thumb-2 instructions can be 16-bit wide, data in the .text sections may not be aligned to a 32-bit word and this leads to unaligned exceptions. This patch does not affect the ARM code generation. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-07-1817-47/+474
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/home/rmk/linux-2.6-arm: ARM: Realview & Versatile: Fix i2c_board_info definitions [ARM] 5608/1: Updated U300 defconfig [ARM] 5606/1: Fix ep93xx watchdog driver headers [ARM] 5594/1: Correct U300 VIC init PM setting [ARM] 5595/1: ep93xx: missing header in dma-m2p.c [ARM] Kirkwood: Correct header define [ARM] pxa: fix ULPI_{DIR,NXT,STP} MFP defines backlight: fix pwm_bl.c to notify platform code when suspending [ARM] pxa: use kzalloc() in pxa_init_gpio_chip() [ARM] pxa: correct I2CPWR clock for pxa3xx pxamci: correct DMA flow control ARM: add support for the EET board, based on the i.MX31 pcm037 module pcm037: add MT9T031 camera support Armadillo 500 add NAND flash device support (resend). ARM MXC: Armadillo 500 add NOR flash device support (resend). mx31: remove duplicated #include
| * ARM: Realview & Versatile: Fix i2c_board_info definitionsRussell King2009-07-182-4/+2
| | | | | | | | | | | | | | | | | | | | Fix i2c_board_info definitions - we were defining the 'type' field of these structures twice since the first argument of I2C_BOARD_INFO sets this field. Move the second definition into I2C_BOARD_INFO(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Jean Delvare <khali@linux-fr.org> Acked-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] 5608/1: Updated U300 defconfigLinus Walleij2009-07-171-10/+8
| | | | | | | | | | | | | | | | | | | | Removed the LBD support that isn't of any use right now at least, then remove remnants of the TCM config flags that somehow crept in by mistake (not yet merged patch for 2.6.32) and then the usual defconfig noise from updated menus. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 5594/1: Correct U300 VIC init PM settingLinus Walleij2009-07-091-2/+2
| | | | | | | | | | | | | | | | | | | | This makes the VIC resume from suspend flagged IRQ:s identical to the flags indicating all possible interrupts. This is perhaps not the optimal setting but setting it to 0 makes the system suspend and never come back again (all IRQ sources masked off). Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 5595/1: ep93xx: missing header in dma-m2p.cHartley Sweeten2009-07-091-0/+1
| | | | | | | | | | | | | | | | <linux/io.h> was getting included by <mach/ts72xx.h>, is should be included by this file. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6Russell King2009-07-098-19/+454
| |\
| | * ARM: add support for the EET board, based on the i.MX31 pcm037 moduleGuennadi Liakhovetski2009-06-235-6/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "EET" variant of the pcm037 board has an OLED display, using a S6E63D6 display controller on the first SPI interface, using GPIO57 as a chip-select for it. S6E63D6 is initialised in the boot-loader, so we only have to take care of the LCD. EET also adds several buttons and LEDs on GPIOs. This patch adds a "pcm037_variant=" kernel command line parameter to specify at boot-time which board the kernel is running on, default is "pcm970", specify "eet" for the EET board. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * pcm037: add MT9T031 camera supportGuennadi Liakhovetski2009-06-232-12/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the MT9T031 CMOS camera sensor from Aptina to the PCM037 board. Also add two I2C iomux pin definitions, needed for pcm037. Also remove now unneeded #ifdef CONFIG_I2C_IMX. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * Armadillo 500 add NAND flash device support (resend).Alberto Panizzo2009-06-231-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since recent mxc_nand driver fixes from linux-mtd this patch add support for ST NAND02GW3B2CN6 (2k pages flash) placed on the armadillo 500 motherboard. Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM MXC: Armadillo 500 add NOR flash device support (resend).Alberto Panizzo2009-06-231-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | This patch add support for NOR flash mapping through the physmap driver. The purpose is to maintain the original Atmark partition model. Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * mx31: remove duplicated #includeHuang Weiyi2009-06-231-1/+0
| | | | | | | | | | | | | | | | | | | | | Remove duplicated #include in arch/arm/mach-mx3/devices.c. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | Merge branch 'for-rmk' of git://git.marvell.com/orionRussell King2009-07-091-1/+1
| |\ \
| | * | [ARM] Kirkwood: Correct header defineSimon Kagstrom2009-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct define typo (. -> ,) Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | | Merge branch 'fix' of ↵Russell King2009-07-093-11/+6
| |\ \ \ | | |/ / | |/| | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
| | * | [ARM] pxa: fix ULPI_{DIR,NXT,STP} MFP definesMike Rapoport2009-07-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attepmpt to configure ULPI pins gives the following compile error: CC arch/arm/mach-pxa/cm-x300.o arch/arm/mach-pxa/cm-x300.c:155: error: 'MFP_MFP_AF0' undeclared here (not in a function) arch/arm/mach-pxa/cm-x300.c:155: error: 'MFP_MFP_DS01X' undeclared here (not in a function) make[2]: *** [arch/arm/mach-pxa/cm-x300.o] Error 1 make[1]: *** [arch/arm/mach-pxa] Error 2 make: *** [sub-make] Error 2 Fix it. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| | * | [ARM] pxa: use kzalloc() in pxa_init_gpio_chip()Daniel Mack2009-07-031-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As slab is available early now, use kzalloc() rather than alloc_bootmem_low() in pxa_init_gpio_chip(). This removes the following boot time warning: <4>------------[ cut here ]------------ <4>WARNING: at mm/bootmem.c:535 alloc_arch_preferred_bootmem+0x2c/0x54() <d>Modules linked in: [<c0029430>] (unwind_backtrace+0x0/0xdc) from [<c0036f64>] (warn_slowpath_common+0x4c/0x80) [<c0036f64>] (warn_slowpath_common+0x4c/0x80) from [<c000ede0>] (alloc_arch_preferred_bootmem+0x2c/0x54) [<c000ede0>] (alloc_arch_preferred_bootmem+0x2c/0x54) from [<c000f2e4>] (___alloc_bootmem_nopanic+0x34/0xd0) [<c000f2e4>] (___alloc_bootmem_nopanic+0x34/0xd0) from [<c000f6e4>] (___alloc_bootmem+0xc/0x34) [<c000f6e4>] (___alloc_bootmem+0xc/0x34) from [<c000cb20>] (pxa_init_gpio+0x48/0x228) [<c000cb20>] (pxa_init_gpio+0x48/0x228) from [<c0009794>] (init_IRQ+0x34/0x44) [<c0009794>] (init_IRQ+0x34/0x44) from [<c00089d4>] (start_kernel+0x144/0x264) [<c00089d4>] (start_kernel+0x144/0x264) from [<a0008034>] (0xa0008034) <4>---[ end trace 1b75b31a2719ed1c ]--- Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| | * | [ARM] pxa: correct I2CPWR clock for pxa3xxDaniel Mack2009-07-031-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit f23d4911319fd, the pwr-i2c device name changed due to the newly introduced device table. This patch fixes the clock so the driver's probe will succeed again. Signed-off-by: Daniel Mack <daniel@caiaq.de> Acked-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | / sched: INIT_PREEMPT_COUNTPeter Zijlstra2009-07-101-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull the initial preempt_count value into a single definition site. Maintainers for: alpha, ia64 and m68k, please have a look, your arch code is funny. The header magic is a bit odd, but similar to the KERNEL_DS one, CPP waits with expanding these macros until the INIT_THREAD_INFO macro itself is expanded, which is in arch/*/kernel/init_task.c where we've already included sched.h so we're good. Cc: tony.luck@intel.com Cc: rth@twiddle.net Cc: geert@linux-m68k.org Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Matt Mackall <mpm@selenic.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | [ARM] pgtable: file pte layout documentationRussell King2009-07-051-9/+14
| | | | | | | | | | | | Document the layout of our file PTE entries. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>