summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into develRussell King2009-09-121-1/+1
|\
| * ARM: 5673/1: U300 fix initsection compile warningLinus Walleij2009-08-151-1/+1
| | | | | | | | | | | | | | | | | | The u300_init_check_chip() function was not properly tagged with the __init macro and provided a initsection mismatch on compilation. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'devel-stable' into develRussell King2009-09-121-2/+2
|\| | | | | | | | | | | Conflicts: MAINTAINERS arch/arm/mm/fault.c
| * [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>
| |
| \
*-. | Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and ↵Russell King2009-09-121-41/+80
|\ \| | | | | | | | | | 'w90x900' into devel
| | * [ARM] 5581/1: U300 clock updatesLinus Walleij2009-07-021-41/+80
| |/ | | | | | | | | | | | | | | | | | | | | | | This adds a few default locks to the clocks (the clocks were used before the locks were initialized by code), then renames the clocks a bit to fit with the latest driver names (some changed during review). Lastly it moves the initialization of the clock debugfs entry to module_init() initcall level since the debugfs isn't up in core_initcall(). Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* / MMC: MMCI: allow GPIOs to be passedRussell King2009-07-091-0/+2
|/ | | | | | | | Add and initialize the gpio_wp and gpio_cd members. We need to ensure that all users are covered, because GPIO 0 may be valid. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Linus Walleij <linus.walleij@stericsson.com>
* Merge branch 'u300' into develRussell King2009-06-142-3/+3
| | | | | | | | Conflicts: arch/arm/Makefile Updates: arch/arm/mach-u300/core.c arch/arm/mach-u300/timer.c
* [ARM] 5535/1: U300 Makefile.bootLinus Walleij2009-06-041-0/+15
| | | | | | | | | The Makefile.boot file for the U300 port. This will compile the kernel for different ZRELADDR depending on the location of physical RAM in the chosen configuration. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] make U300 clk_set_rate() return a _real_ errnoRussell King2009-05-311-1/+1
| | | | | | Another stupid instance of "return -1"-ism. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 5510/1: U300 GPIO debug and init fixesLinus Walleij2009-05-181-22/+24
| | | | | | | | | | | This moves the GPIO driver away from using __devinit and __devexit It also removes all printk() in favor of using dev_* print macros on pdev->dev struct instead. Surplus prints are removed, and the platform_device_probe() function is used instead of putting a .probe function in the platform driver struct. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 5473/1: U300 core machine supportLinus Walleij2009-04-2815-0/+1716
| | | | | | | | | | | | | | This adds core support for the ST-Ericsson U300 series platforms: U300, U330, U335 and U365. Supports memory mappings, interrupt controller, system timer (clocksource and clockevents), and binds to the existing drivers for the PrimeCells used in this design: PL190 (VIC), PL180 (MMC/SD host) and PL011 (UART). This is intented to serve as starting point for our mainling work, more patches to follow. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 5474/1: U300 clocking frameworkLinus Walleij2009-04-283-0/+1547
| | | | | | | | This adds the clocking framework and hooks into the clkdevice for U300 series platforms. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 5471/2: U300 GPIO and PADMUX supportLinus Walleij2009-04-284-0/+1068
| | | | | | | | | | This adds GPIO and PADMUX headers and implementation for the U300 platform. This is an implementation in isolation that depend on later patches in this series to plug into the framework. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 5470/1: U300 register definitionsLinus Walleij2009-04-285-0/+970
This adds registers, interrupt numbers and IO mappings for the U300 series platforms core support, including basic block offsets and registers definitions for the system controller. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>