summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'imx/imx6q' into next/socArnd Bergmann2011-11-0214-1/+2739
|\
| * arm/imx: merge i.MX3 and i.MX6Sascha Hauer2011-10-311-4/+3
| * arm/imx6q: add suspend/resume supportShawn Guo2011-10-313-1/+99
| * arm/imx6q: add device tree machine supportShawn Guo2011-10-312-1/+85
| * arm/imx6q: add smp and cpu hotplug supportShawn Guo2011-10-316-0/+241
| * arm/imx6q: add core drivers clock, gpc, mmdc and srcShawn Guo2011-10-316-0/+2263
| * arm/imx6q: add core definitions and low-level debug uartShawn Guo2011-10-314-0/+53
| * Merge branch 'imx/devel' into imx/imx6qArnd Bergmann2011-10-3147-384/+481
| |\
* | \ Merge branch 'highbank/soc' into next/socArnd Bergmann2011-11-022-4/+2
|\ \ \
| * \ \ Merge branch 'dt/gic' into highbank/socArnd Bergmann2011-10-3126-27/+27
| |\ \ \ | | |/ /
| | | |
| | \ \
| *-. \ \ Merge branches 'depends/rmk/io', 'depends/rmk/l2x0' and 'depends/rmk/gpio' in...Arnd Bergmann2011-10-302-4/+2
| |\ \ \ \
| | | * | | ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.hRussell King2011-08-082-4/+2
| | |/ / /
* | | | | Merge branch 'imx/devel' into next/dtArnd Bergmann2011-11-0147-384/+481
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-203-3/+3
| |\ \ \ | | |/ /
| * | | Merge branch 'imx/cleanup' into imx/develArnd Bergmann2011-10-0711-289/+279
| |\ \ \
| | | \ \
| | | \ \
| | *-. \ \ Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanupSascha Hauer2011-10-046-260/+259
| | |\ \ \ \
| | | * | | | arm/imx: remove cpu_is_xxx() check from __imx_ioremap()Shawn Guo2011-10-041-0/+19
| | | * | | | arm/imx: remove cpu_is_xxx() from arch_idle()Shawn Guo2011-10-042-1/+31
| | | * | | | arm/imx: change mxc_init_l2x0() to an imx31/35 specific callShawn Guo2011-09-283-57/+38
| | | * | | | arm/imx: rename mm-imx31.c to mm-imx3.cShawn Guo2011-09-282-2/+2
| | | * | | | arm/imx: merge mm-imx35.c into mm-imx31.cShawn Guo2011-09-283-110/+79
| | | |/ / /
| | | | | |
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | *---. \ \ \ Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'clean...Sascha Hauer2011-08-266-29/+20
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | | | * | | ARM: imx/armadillo5x0: dynamically allocate physmap-flash deviceUwe Kleine-König2011-08-011-11/+7
| | | | | * | | ARM: imx/mx1ads: dynamically allocate physmap-flash deviceUwe Kleine-König2011-08-011-10/+5
| | | | | | |/ | | | | | |/|
| | | | * | | arm/mxc: do not use gpio_to_irq() for static initializersShawn Guo2011-08-163-3/+3
| | | |/ / / | | |/| | |
| | | * | | ARM i.MX: remove ARCH_MX* macros from MakefileSascha Hauer2011-08-261-5/+5
| | |/ / /
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| *---. \ \ \ Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-mul...Sascha Hauer2011-09-2930-0/+49
| |\ \ \ \ \ \
| | | | * | | | ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLERSascha Hauer2011-09-2629-0/+30
| | | | |/ / /
| | * | | | | mx31moboard: Add poweroff supportPhilippe Rétornaz2011-09-201-0/+17
| | * | | | | ARM: mach-qong: Add watchdog supportFabio Estevam2011-09-202-0/+2
| | | | | | |
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-----. \ \ \ \ \ Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata...Sascha Hauer2011-08-2613-96/+143
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | / / / / | | | | |_|/ / / / | | | |/| | | / / | | | | | | |/ / | | | | | |/| |
| | | | * | | | ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCsSascha Hauer2011-08-241-33/+17
| | | | | |/ / | | | | |/| |
| | | * | | | ARM: imx: Define functions for registering PATAFabio Estevam2011-08-243-0/+12
| | | * | | | ARM: imx: Add PATA clock supportFabio Estevam2011-08-243-6/+6
| | | | |/ / | | | |/| |
| | * | | | ARM: mx35: use generic function for displaying silicon revisionJason Liu2011-08-262-17/+16
| | * | | | ARM: mx31: use generic function for displaying silicon revisionJason Liu2011-08-262-24/+29
| | * | | | ARM: mx27: Print silicon revision on bootJason Liu2011-08-262-15/+15
| | * | | | ARM: mx25: Print silicon revision on bootJason Liu2011-08-263-1/+48
| | | |/ / | | |/| |
| * | | | ARM: mach-imx/mx25_3ds: Add FlexCAN supportFabio Estevam2011-08-262-0/+11
| * | | | ARM: i.MX: initialize l2x0 at early_init timeJason Liu2011-08-261-1/+1
| |/ / /
* | | | Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stableRussell King2011-09-163-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | ARM: 7051/1: cpuimx* boards: fix mach-types errorsEric Bénard2011-08-223-3/+3
| |/ /
* | | ARM: mach-imx: convert boot_params to atag_offsetNicolas Pitre2011-08-2126-27/+27
|/ /
* | Merge commit 'v3.1-rc1' into imx-fixesSascha Hauer2011-08-0847-220/+438
|\ \ | |/
| * dmaengine: imx-sdma: use platform_device_id to identify sdma versionShawn Guo2011-07-276-9/+8
| * mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx()Shawn Guo2011-07-272-5/+5
| * mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5Shawn Guo2011-07-274-2/+8
| * net/fec: gasket needs to be enabled for some i.mxShawn Guo2011-07-273-3/+4
| * serial/imx: get rid of the uses of cpu_is_mx1()Shawn Guo2011-07-276-26/+30
| * Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-07-267-1/+198
| |\
OpenPOWER on IntegriCloud