summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-0120-4102/+2091
|\
| * Merge branch 'next/fixes' into next/cleanupArnd Bergmann2011-10-314-81/+7
| |\
| | * Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-10-312-59/+1
| | |\
| * | \ Merge branch 'imx/cleanup' into next/cleanupArnd Bergmann2011-10-202-28/+0
| |\ \ \
| | * \ \ Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-202-28/+0
| | |\ \ \
| | | * | | arm/imx: remove mx27_setup_weimcs() from mx27.hShawn Guo2011-10-171-14/+0
| | | * | | arm/imx: remove mx31_setup_weimcs() from mx31.hShawn Guo2011-10-171-14/+0
| * | | | | Merge branch 'depends/rmk/devel-stable' into next/cleanupArnd Bergmann2011-10-081-15/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanupSascha Hauer2011-10-045-55/+23
| |\ \ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | arm/imx: remove cpu_is_xxx() check from __imx_ioremap()Shawn Guo2011-10-042-16/+7
| | * | | | | arm/imx: remove cpu_is_xxx() from arch_idle()Shawn Guo2011-10-044-39/+16
| | |/ / / /
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanupSascha Hauer2011-09-203-16/+8
| |\ \ \ \ \ \
| | | * | | | | ARM: mx5/mm: consolidate TZIC map codeJason Liu2011-09-203-3/+8
| | | * | | | | ARM: mx5/mm: Remove MX51_DEBUG related mappingJason Liu2011-09-202-13/+0
| | | |/ / / /
| | | | | | |
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-----. \ \ \ \ \ Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'clean...Sascha Hauer2011-08-2613-3978/+2060
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | / / / / | | |_|_|_|/ / / / | |/| | | | | | |
| | | | | * | | | Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/ukl/linux-2.6 into...Sascha Hauer2011-08-0344-1030/+453
| | | | | |\ \ \ \
| | | | | | * | | | ARM: mxc: drop now unused function mxc_register_deviceUwe Kleine-König2011-08-012-15/+0
| | | | | | * | | | ARM: mx5: dynamically allocate high speed i2c (imx-i2c actually)Uwe Kleine-König2011-08-011-0/+6
| | | | | | * | | | ARM: mx5: dynamically allocate fsl-usb2-udc devicesUwe Kleine-König2011-08-011-0/+5
| | | | | | * | | | ARM: mx5: dynamically allocate mxc-ehci devicesUwe Kleine-König2011-08-012-4/+16
| | | | | | * | | | ARM: mx5: fix remaining inconsistent names for irqsUwe Kleine-König2011-08-011-81/+81
| | | | | * | | | | ARM: mx50: Select IMX_HAVE_PLATFORM_FEC as done on other i.MX devicesFabio Estevam2011-07-261-1/+1
| | | | * | | | | | ARM: i.MX53: clean up iomux-mx53.hTroy Kisky2011-08-171-2346/+1184
| | | | * | | | | | ARM: i.MX51: clean up iomux-mx51.hTroy Kisky2011-08-171-1512/+758
| | | | * | | | | | ARM: i.MX51: Remove _MX51_PAD_xxx referencesTroy Kisky2011-08-171-0/+1
| | |_|/ / / / / / | |/| | | | | | |
| | | * | | | | | arm/mxc: move IMX_GPIO_NR into mach/hardware.hShawn Guo2011-08-172-5/+4
| | | * | | | | | gpio/mxc: move irq_to_gpio() into gpio-mxc driverShawn Guo2011-08-171-2/+0
| | | * | | | | | arm/mxc: use gpiolib helper for gpio_to_irqShawn Guo2011-08-171-1/+1
| | | * | | | | | arm/mxc: do not use gpio_to_irq() for static initializersShawn Guo2011-08-161-0/+2
| | |/ / / / / / | |/| | | | | |
| | * | | | | | ARM i.MX audmux v2: remove unnecessary ifdefsSascha Hauer2011-08-261-14/+4
| |/ / / / / /
* | | | | | | Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-5/+5
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-11-012-59/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'depends/rmk/gpio' into next/fixesArnd Bergmann2011-10-311-6/+0
| |\ \ \ \ \ \
| * | | | | | | plat-mxc: iomux-v3.h: implicitly enable pull-up/down when that's desiredPaul Fertser2011-10-251-5/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branches 'for-32/i2c/omap-v4', 'for-32/i2c/imx-dt', 'for-32/i2c/eg20t-v...Ben Dooks2011-11-011-4/+0
|\ \ \ \ \ \ \
| * | | | | | | i2c-imx: remove init/exit hooks from platform dataShawn Guo2011-09-141-4/+0
| |/ / / / / /
* | | | | | | Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-282-59/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | ARM: plat-mxc: remove mach/memory.hNicolas Pitre2011-10-131-43/+0
| * | | | | | ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-261-1/+1
| | |_|_|_|/ | |/| | | |
| * | | | | ARM: mxc: Remove setting of consistent dma sizeJon Medhurst2011-08-221-15/+0
| |/ / / /
* | | | | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-271-6/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | ARM: gpio: make trivial GPIOLIB implementation the defaultRussell King2011-08-121-3/+0
| * | | | ARM: gpio: consolidate trivial gpiolib implementationsRussell King2011-08-121-4/+1
| | |_|/ | |/| |
* | | | Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2011-10-252-55/+14
|\ \ \ \
| * | | | ARM: mxc: convert device creation to use platform_device_register_fullUwe Kleine-König2011-08-262-55/+14
| | |/ / | |/| |
* | | | ARM: mxc: fix Kconfig typo 'i.MX51'Paul Bolle2011-10-131-1/+1
|/ / /
* | | iMX: Fix build for iMX53Arnaud Patard (Rtp)2011-08-081-0/+8
* | | Merge commit 'v3.1-rc1' into imx-fixesSascha Hauer2011-08-0843-933/+348
|\ \ \ | |/ /
| * | dmaengine: imx-sdma: use platform_device_id to identify sdma versionShawn Guo2011-07-274-6/+5
| * | mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx()Shawn Guo2011-07-272-8/+10
OpenPOWER on IntegriCloud