summaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
* ARM: fix wrongly patched constantsRussell King2011-01-142-4/+4
| | | | | | | | e3d9c625 (ARM: CPU hotplug: fix hard-coded control register constants) changed the wrong constants in the hotplug assembly code. Fix this. Reported-by: viresh kumar <viresh.kumar@st.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: 6624/1: fix dependency for CONFIG_SMP_ON_UPNicolas Pitre2011-01-141-1/+1
| | | | | | | This depends on !XIP_KERNEL and not !XIP. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: 6623/1: Thumb-2: Fix out-of-range offset for Thumb-2 in proc-v7.SDave Martin2011-01-141-1/+3
| | | | | | | | | | Commit d30e45e (ARM: pgtable: switch order of Linux vs hardware page tables) introduced a pre-increment addressing offset which is out of range for Thumb-2. Thumb-2 only permits offsets <256. So split the intruction in two for Thumb-2. Signed-off-by: Dave Martin <dave.martin@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: 6622/1: fix dma_unmap_sg() documentationLinus Walleij2011-01-121-1/+1
| | | | | | | | The kerneldoc for this function is at odds with the DMA-API document, which holds, so fix it. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: 6621/1: bitops: remove condition code clobber for CLZRabin Vincent2011-01-121-1/+1
| | | | | | | | | The CLZ instruction does not alter the condition flags, so remove the "cc" clobber from the inline asm for fls(). Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org> Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: 6620/1: Change misleading warning when CONFIG_CMDLINE_FORCE is usedAlexander Holler2011-01-121-2/+4
| | | | | | | | | | | | | When CONFIG_CMDLINE_FORCE is used, the warning Ignoring unrecognised tag 0x54410009 was displayed. Change this to Ignoring tag cmdline (using the default kernel command line) Signed-off-by: Alexander Holler <holler@ahsoftware.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: 6619/1: nommu: avoid mapping vectors page when !CONFIG_MMUWill Deacon2011-01-111-0/+2
| | | | | | | | | | | | | When running without an MMU, we do not need to install a mapping for the vectors page. Attempting to do so causes a compile-time error because install_special_mapping is not defined. This patch adds compile-time guards to the vector mapping functions so that we can build nommu configurations once more. Acked-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: sched_clock: make minsec argument to clocks_calc_mult_shift() zeroRussell King2011-01-111-1/+1
| | | | | | | | | | | | | | | | | The purpose of the minsec argument is to prevent 64-bit math overflow when the number of cycles is multiplied up. However, the multipler is 32-bit, and in the sched_clock() case, the cycle counter is up to 32-bit as well. So the math can never overflow. With a value of 60, and clock rates greater than 71MHz, the calculated multiplier is unnecessarily reduced in value, which reduces accuracy by maybe 70ppt. It's almost not worth bothering with as the oscillator driving the counter won't be any more than 1ppm - unless you're using a rubidium lamp or caesium fountain frequency standard. So, set the minsec argument to zero. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: sched_clock: allow init_sched_clock() to be called earlyRussell King2011-01-113-1/+12
| | | | | | | | | | | | | | sched_clock is supposed to be initialized early - in the recently added init_early platform hook. However, in doing so we end up calling mod_timer() before the timer lists are initialized, resulting in an oops. Split the initialization in two - the part which the platform calls early which starts things off. The addition of the timer can be delayed until after we have more of the kernel initialized - when the normal time sources are initialized. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: integrator: fix compile warning in cpu.cRussell King2011-01-111-1/+1
| | | | | | | | Fix: arch/arm/mach-integrator/cpu.c: In function ■integrator_get■: arch/arm/mach-integrator/cpu.c:164: warning: ■vco.s■ may be used uninitialized in this function Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: twd: fix display of twd frequencyRussell King2011-01-111-1/+1
| | | | | | | The fraction of MHz was not being displayed correctly as the calculation was a factor of 10 out. Fix this. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: udelay: prevent math rounding resulting in short udelaysRussell King2011-01-101-0/+4
| | | | | | | | | We perform the microseconds to loops calculation using a number of multiplies and shift rights. Each shift right rounds down the resulting value, which can result in delays shorter than requested. Ensure that we always round up. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-01-06585-10855/+26414
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits) ARM: DMA: add support for DMA debugging ARM: PL011: add DMA burst threshold support for ST variants ARM: PL011: Add support for transmit DMA ARM: PL011: Ensure IRQs are disabled in UART interrupt handler ARM: PL011: Separate hardware FIFO size from TTY FIFO size ARM: PL011: Allow better handling of vendor data ARM: PL011: Ensure error flags are clear at startup ARM: PL011: include revision number in boot-time port printk ARM: vexpress: add sched_clock() for Versatile Express ARM i.MX53: Make MX53 EVK bootable ARM i.MX53: Some bug fix about MX53 MSL code ARM: 6607/1: sa1100: Update platform device registration ARM: 6606/1: sa1100: Fix platform device registration ARM i.MX51: rename IPU irqs ARM i.MX51: Add ipu clock support ARM: imx/mx27_3ds: Add PMIC support ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn() mx51: fix usb clock support MX51: Add support for usb host 2 arch/arm/plat-mxc/ehci.c: fix errors/typos ...
| * Merge branch 'devel-stable' into develRussell King2011-01-06379-5815/+20289
| |\ | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h
| | * Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2011-01-05205-3411/+13965
| | |\ | | | | | | | | | | | | devel-stable
| | | * ARM i.MX53: Make MX53 EVK bootableYong Shen2011-01-049-1/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add entries to Kconfig 2. Add machine definition 3. Add Uart platform data, pad setting and base address 4. Adjust GPIO irq number Signed-off-by: Yong Shen <yong.shen@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM i.MX53: Some bug fix about MX53 MSL codeYong Shen2011-01-042-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. pll_base address should return right value 2. uart parent clk is from pll3 Signed-off-by: Yong Shen <yong.shen@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM i.MX51: rename IPU irqsSascha Hauer2011-01-031-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM i.MX51: Add ipu clock supportSascha Hauer2011-01-031-0/+140
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM: imx/mx27_3ds: Add PMIC supportFabio Estevam2011-01-032-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MX27_3DS board has a MC13783 PMIC connected to the CSPI2 port. Add support for the PMIC. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * mx51: fix usb clock supportArnaud Patard (Rtp)2011-01-031-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current code doesn't really enable the usb clocks so if they're disabled when booting linux, the kernel/machine will hang as soon as someone is trying to read a usb register Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * MX51: Add support for usb host 2Arnaud Patard (Rtp)2011-01-034-0/+50
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * arch/arm/plat-mxc/ehci.c: fix errors/typosArnaud Patard (Rtp)2011-01-031-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is fixing some issues : - MXC_OTG_UCTRL_OPM_BIT is for USBCTRL register and not PHYCTRL register. - the MXC_EHCI_WAKEUP_ENABLED check was only clearing the bits so never allows to set them. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM: mx3/mx31_3ds: Add support for USB Host2 portFabio Estevam2011-01-031-0/+77
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM: mx3/mx31_3ds: Add support for OTG host modeFabio Estevam2011-01-032-1/+37
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM: imx/mx25_3ds: Add USB supportFabio Estevam2011-01-032-1/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM: imx/mx27_3ds: Add USB OTG supportFabio Estevam2011-01-032-0/+74
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM: mx3/mx35_3ds: Add USB OTG Host modeFabio Estevam2011-01-031-1/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * Merge branch 'sgu/mxs-core-v8' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Sascha Hauer2011-01-0385-1540/+6557
| | | |\ | | | | | | | | | | | | | | | into imx-for-2.6.38-new
| | | | * ARM: mxs: Add build configuration for mxsShawn Guo2010-12-207-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Add initial mx28evk supportShawn Guo2010-12-201-0/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add initial mx28evk support with duart and fec0. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Add initial mx23evk supportShawn Guo2010-12-201-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add initial mx23evk support with duart. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Dynamically allocate fec devicesShawn Guo2010-12-203-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamically allocate fec devices for MX28, which gets dual fec interface. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Dynamically allocate duart devicesShawn Guo2010-12-205-0/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamically allocate duart devices for MX23 and MX28. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Add static memory mappingShawn Guo2010-12-202-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create static memory mapping for MX23 and MX28. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Add clock supportShawn Guo2010-12-207-0/+2649
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clock for MXS-based SoCs, MX23 and MX28. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Add iomux supportShawn Guo2010-12-204-0/+1158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MXS-based SoCs implements iomux functions in block PINCTRL. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Add gpio supportShawn Guo2010-12-203-0/+394
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MXS-based SoCs implement gpio support in block PINCTRL. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Add timer supportShawn Guo2010-12-201-0/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are 2 versions of the timrot on Freescale MXS-based SoCs. The v1 on MX23 only gets 16 bits counter, while v2 on MX28 extends the counter to 32 bits. The implementation uses two timers, one for clock_event and another for clocksource. MX28 uses timrot 0 and 1, while MX23 uses 0 and 2. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Add low-level debug UART supportShawn Guo2010-12-202-0/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DEBUG_LL support, which is incompatible with multi-soc MXS image because of different DUART base address on MX23 and MX28 - uncompress message support Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Add interrupt supportShawn Guo2010-12-202-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Interrupt Collector (ICOLL) support for MXS-based. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Add reset routinesShawn Guo2010-12-202-0/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The mxs wdog is implemented in RTC block. - There is a generic software reset routine for most modules on mxs. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Add helper definition and functionShawn Guo2010-12-134-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add helper definition and function for MXS-based. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | | * ARM: mxs: Add core definitionsShawn Guo2010-12-136-0/+523
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core definitions for MXS-based SoC MX23 and MX28. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | * | arm: mx50: add mx50 reference design board supportRichard Zhao2011-01-034-0/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add basic function and uart device support. Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | arm: mx50: add core functions support except clockRichard Zhao2011-01-0314-1/+1415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core definitions and memory map, gpio, irq, iomux, uart device support. Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | arm: mx5: mx51/53 have different mxc_cpu_type definitionRichard Zhao2011-01-031-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | arm: mx51: define mx51's own MXC_GPIO_IRQSRichard Zhao2011-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mx5 SoCs have different GPIO port count. Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | arm: plat-mxc: add full parameter macro to define gpio portRichard Zhao2011-01-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | ARM: mx5: use config to define boot related addressesRichard Zhao2011-01-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
OpenPOWER on IntegriCloud