summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanupSascha Hauer2011-10-043-47/+22
|\ \
| | * ARM: mxs: Consolidate mm-mx23.c and mm-mx28.c into a single fileFabio Estevam2011-10-043-47/+22
| |/
| |
| \
*-. \ Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanupSascha Hauer2011-09-201-12/+11
|\ \ \ | | |/
| * | ARM: mach-mxs/mx28evk: Only register devices if their GPIO requests succeededFabio Estevam2011-09-201-12/+11
| | |
| \ \
*-. \ \ Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'clean...Sascha Hauer2011-08-265-7/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| | * arm/mxs: move MXS_GPIO_NR into mach/mxs.hShawn Guo2011-08-171-2/+0
| | * gpio/mxs: move irq_to_gpio() into gpio-mxs driverShawn Guo2011-08-172-2/+2
| |/ |/|
| * ARM: mxs: Remove unused header fileFabio Estevam2011-08-173-3/+0
|/
* Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-07-263-0/+29
|\
| * arm: mxs: add mmc-device for mach-tx28Wolfram Sang2011-07-072-0/+7
| * ARM: mxs/mx28evk: add leds-gpio device for heartbeatShawn Guo2011-07-072-0/+22
| * Merge remote-tracking branch 'grant/gpio/next-mx' into devel-featuresSascha Hauer2011-07-0710-369/+68
| |\
* | \ Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-07-261-7/+0
|\ \ \
| * | | ARM: Consolidate the clkdev header filesKyungmin Park2011-07-191-7/+0
* | | | Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-07-252-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | ARM: mxs/tx28: convert to new leds-gpio registration helperUwe Kleine-König2011-07-072-3/+3
* | | | Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2011-07-253-8/+3
|\ \ \ \
| * \ \ \ Merge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 i...Arnd Bergmann2011-07-151-0/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | ARM: mxs-dma: include <linux/dmaengine.h>Dong Aisheng2011-07-151-0/+2
| | |/ /
| * | | ARM: mxs/tx28: according to the TX28's datasheet D4-D7 are not used for MMC0Uwe Kleine-König2011-07-071-8/+0
| * | | ARM i.MX23/28: platform-mxsfb: Add missing include of linux/dma-mapping.hAxel Lin2011-07-071-0/+1
| |/ /
* | | Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-07-2210-369/+68
|\ \ \ | | |/ | |/|
| * | gpio/mxs: Change gpio-mxs into an upstanding gpio driverShawn Guo2011-06-066-2/+67
| * | gpio/mxs: Move Freescale mxs gpio driver to drivers/gpioGrant Likely2011-06-064-367/+1
* | | net: remove mm.h inclusion from netdevice.hAlexey Dobriyan2011-06-213-0/+3
| |/ |/|
* | arm: mxs: include asm/processor.h for cpu_relax()Wolfram Sang2011-06-061-0/+2
|/
* Merge branch 'devel-stable' into for-linusRussell King2011-05-239-12/+14
|\
| * Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev...Russell King2011-05-208-11/+13
| |\
| | * mx23: register clocks for mmcPeter Korsgaard2011-05-191-0/+2
| | * arm: mach-imx/mxs: drop 'default' boardsWolfram Sang2011-05-191-2/+0
| | * ARM: mxs: fix naming of struct holding info for mxs-i2c devicesUwe Kleine-König2011-05-193-5/+7
| | * ARM: mxs/i.MX23: make i2c defines consistent and match the reference manualWolfram Sang2011-05-191-1/+1
| | * ARM: mxs/mach-mx2[38]evk: Set the initial value on gpio_request_oneFabio Estevam2011-05-192-3/+3
| * | Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into de...Russell King2011-05-071-1/+1
| |\ \ | | |/ | |/|
| | * ARM: zImage: remove the static qualifier from global data variablesNicolas Pitre2011-05-071-1/+1
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generi...Russell King2011-05-233-0/+131
|\ \ \ \ \ | | |_|/ / | |/| | |
| | | * | ARM: mach-mxs: add stmp378x-devbWolfram Sang2011-05-023-0/+131
| | |/ /
* | | | clocksource: convert MXS timrotv2 to 32-bit down counting clocksourceRussell King2011-05-231-13/+7
|/ / /
* | | ARM: mxs/clock-mx28: fix up name##_set_rateUwe Kleine-König2011-04-121-1/+6
|/ /
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-03-3013-6/+302
|\ \ | |/ |/|
| * ARM: mxs/mx28evk: add mmc deviceShawn Guo2011-03-252-0/+90
| * ARM: mxs/mx23evk: add mmc deviceShawn Guo2011-03-252-0/+45
| * ARM: mxs: dynamically allocate mmc deviceShawn Guo2011-03-258-0/+131
| * ARM: mxs: configure and register the second FEC device on TX28/STK5-V4Lothar Waßmann2011-03-232-6/+36
* | arm: Fold irq_set_chip/irq_set_handlerThomas Gleixner2011-03-292-4/+3
* | arm: Cleanup the irq namespaceThomas Gleixner2011-03-292-7/+7
|/
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2011-03-221-0/+26
|\
| * dmaengine: mxs-dma: add dma support for i.MX23/28Shawn Guo2011-03-021-0/+26
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb...Linus Torvalds2011-03-181-0/+18
|\ \
| * | mmc: mxs-mmc: add mmc host driver for i.MX23/28Shawn Guo2011-03-151-0/+18
OpenPOWER on IntegriCloud