summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mm-imx3.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanupOlof Johansson2012-11-061-3/+2
|\
| * ARM: imx: fix return value check in imx3_init_l2x0()Wei Yongjun2012-10-081-3/+2
* | ARM: imx: call mxc_device_init() in soc specific functionShawn Guo2012-10-151-0/+4
* | ARM: imx: include hardware.h rather than mach/hardware.hShawn Guo2012-10-151-2/+1
* | ARM: imx: include common.h rather than mach/common.hShawn Guo2012-10-151-1/+1
* | ARM: imx: move platform device code into mach-imxShawn Guo2012-10-151-1/+1
* | ARM: imx: move iomux drivers and headers into mach-imxShawn Guo2012-10-151-1/+1
|/
* Merge tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/li...Linus Torvalds2012-07-261-4/+3
|\
| * gpio/mxc: use the edge_sel feature if availableBenoît Thébaudeau2012-07-171-4/+3
* | Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2...Arnd Bergmann2012-07-021-1/+0
|\ \ | |/ |/|
| * ARM: imx: remove unneeded mach/irq.h inclusionShawn Guo2012-07-011-1/+0
* | Merge branch 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into f...Olof Johansson2012-06-071-0/+2
|\ \
| * | ARM: imx: only call l2x0_init if it's availableUwe Kleine-König2012-05-291-0/+2
* | | ARM: mx31: Add pinctrl_provide_dummies()Fabio Estevam2012-06-071-0/+2
| |/ |/|
* | Merge branch 'imx/pinctrl' into imx/clockArnd Bergmann2012-05-141-0/+2
|\ \
| * | ARM: imx: enable pinctrl dummy statesDong Aisheng2012-05-081-0/+2
| |/
* / ARM i.MX3: Make ccm base address a variableSascha Hauer2012-04-251-0/+6
|/
* Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-03-301-0/+1
|\
| * ARM: fix builds due to missing <asm/system_misc.h> includesOlof Johansson2012-03-301-0/+1
* | Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2012-03-291-5/+5
|\ \ | |/ |/|
| * ARM: imx: convert to common runtime ioremap hookRob Herring2012-03-061-5/+5
* | Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-271-0/+11
|\ \
| * \ Merge tag 'imx35-imx5-aips-setup' of git://git.pengutronix.de/git/imx/linux-2...Olof Johansson2012-03-081-0/+4
| |\ \
| | * | ARM: mx35: Setup the AIPS registersFabio Estevam2012-03-071-0/+4
| * | | Merge branch 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6 in...Arnd Bergmann2012-03-021-0/+5
| |\ \ \ | | |_|/ | |/| |
| | * | ARM: mx3: Setup AIPS registersFabio Estevam2012-03-021-0/+3
| | * | ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFIFabio Estevam2012-03-021-0/+2
| | |/
* | | Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2012-03-271-1/+1
|\ \ \
| * | | ARM: mach-imx: mx3: Fix section mismatch in imx3_init_l2x0()Fabio Estevam2012-02-271-1/+1
| | |/ | |/|
* | | Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-231-27/+25
|\ \ \ | | |/ | |/|
| * | ARM: plat-mxc: hook special idle handlers to arm_pm_idleNicolas Pitre2012-01-201-27/+25
| |/
* / ARM: imx: convert audmux to a platform driverRichard Zhao2012-03-061-0/+13
|/
* Merge branch 'cleanups/assorted' into imx-fixes-for-arndSascha Hauer2011-11-221-25/+28
|\
| * arm/imx: remove imx_idle hook and use pm_idle insteadShawn Guo2011-11-111-25/+28
* | ARM: imx/mm-imx3: conditionally compile i.MX31 and i.MX35 codeUwe Kleine-König2011-11-221-27/+31
|/
* 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-041-0/+30
* arm/imx: change mxc_init_l2x0() to an imx31/35 specific callShawn Guo2011-09-281-0/+38
* arm/imx: rename mm-imx31.c to mm-imx3.cShawn Guo2011-09-281-0/+169