summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-015-73/+24
|\
| * Merge branch 'depends/rmk/gpio' into next/develArnd Bergmann2011-10-311-32/+1
| |\
| * \ Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-201-0/+10
| |\ \
| * \ \ Merge branch 'imx/cleanup' into imx/develArnd Bergmann2011-10-0711-4020/+2063
| |\ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| *---. \ \ \ Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-mul...Sascha Hauer2011-09-294-57/+17
| |\ \ \ \ \ \
| | | | * | | | ARM i.MX entry-macro.S: remove now unused codeSascha Hauer2011-09-261-57/+1
| | | | * | | | ARM i.MX tzic: add handle_irq functionSascha Hauer2011-09-261-0/+4
| | | | * | | | ARM i.MX avic: add handle_irq functionSascha Hauer2011-09-261-0/+10
| | * | | | | | ARM: mx25: Add the missing IIM base definitionJason Liu2011-09-231-0/+1
| | * | | | | | mx31moboard: Add poweroff supportPhilippe Rétornaz2011-09-201-0/+1
| | | |/ / / / | | |/| | | |
| | | | | | |
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-----. \ \ \ \ \ Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata...Sascha Hauer2011-08-266-32/+17
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | / / / / | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | ARM i.MX: allow to compile together all i.MX5 based SoCsSascha Hauer2011-08-241-6/+0
| | | | * | | | | ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCsSascha Hauer2011-08-241-9/+1
| | |_|/ / / / / | |/| | | | | |
| | * | | | | | ARM: mx35: use generic function for displaying silicon revisionJason Liu2011-08-261-8/+1
| | * | | | | | ARM: mx31: use generic function for displaying silicon revisionJason Liu2011-08-261-9/+2
| | * | | | | | ARM: mx25: Print silicon revision on bootJason Liu2011-08-261-0/+4
| | * | | | | | ARM: imx: Introduce generic function for displaying silicon revisionFabio Estevam2011-08-261-0/+1
| |/ / / / / /
* | | | | | | Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-012-1/+19
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branches 'imx/pata' and 'imx/sata' into next/driverArnd Bergmann2011-10-203-14/+35
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | AHCI Add the AHCI SATA feature on the MX53 platformsRichard Zhu2011-10-071-0/+10
| | |/ / / /
| * | | | | ARM: imx: Add PATA resources for other i.MX processorsFabio Estevam2011-08-242-1/+2
| * | | | | imx51: add pata deviceArnaud Patard (Rtp)2011-08-231-0/+7
| | |/ / / | |/| | |
* | | | | Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-0113-4073/+2063
|\ \ \ \ \
| * \ \ \ \ 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-044-55/+20
| |\ \ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | arm/imx: remove cpu_is_xxx() check from __imx_ioremap()Shawn Guo2011-10-041-16/+6
| | * | | | | | | arm/imx: remove cpu_is_xxx() from arch_idle()Shawn Guo2011-10-043-39/+14
| | |/ / / / / /
| | | | | | | |
| | \ \ \ \ \ \
| *-. \ \ \ \ \ \ 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-267-3949/+2035
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | | | * | | | | | ARM: mxc: drop now unused function mxc_register_deviceUwe Kleine-König2011-08-011-1/+0
| | | | * | | | | | ARM: mx5: dynamically allocate mxc-ehci devicesUwe Kleine-König2011-08-011-4/+7
| | | | * | | | | | ARM: mx5: fix remaining inconsistent names for irqsUwe Kleine-König2011-08-011-81/+81
| | | | | |_|_|/ / | | | | |/| | | |
| | | * | | | | | 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
| |/ / / / / /
* | | | | | | 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
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
OpenPOWER on IntegriCloud