summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'randconfig/mach' into fixesArnd Bergmann2012-08-233-7/+7
|\
| * ARM: imx: build i.MX6 functions only when neededArnd Bergmann2012-08-232-4/+3Star
| * ARM: imx: fix ksz9021rn_phy_fixupArnd Bergmann2012-08-231-2/+2
| * ARM: imx: build pm-imx5 code only when PM is enabledArnd Bergmann2012-08-231-1/+2
* | ARM: imx6: spin the cpu until hardware takes it downShawn Guo2012-08-231-20/+3Star
* | ARM i.MX6q: Add virtual 1/3.5 dividers in the LDB clock pathPhilipp Zabel2012-08-171-3/+5
|/
* Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixesArnd Bergmann2012-08-072-4/+6
|\
| * i.MX27: Fix emma-prp and csi clocks.Javier Martin2012-08-071-3/+5
| * ARM: clk-imx31: Fix the keypad clock nameFabio Estevam2012-08-031-1/+1
* | ARM: imx: enable emi_slow_gate clock for imx5Shawn Guo2012-08-031-0/+1
|/
* Merge tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/li...Linus Torvalds2012-07-263-29/+28Star
|\
| * gpio/mxc: use the edge_sel feature if availableBenoît Thébaudeau2012-07-173-29/+28Star
* | Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-07-243-10/+21
|\ \
| * | ARM: imx: clk-imx31: Fix clock id for rnga driverFabio Estevam2012-07-161-1/+1
| * | ARM: i.MX5x CSPI: Fixed clock name for CSPIAlexander Shiyan2012-07-161-1/+1
| * | ARM: i.MX5x clocks: Fix GPT clocksAlexander Shiyan2012-07-161-4/+4
| * | ARM: i.MX5x clocks: Fix parent for PWM clocksAlexander Shiyan2012-07-161-2/+2
| * | ARM: i.MX5x clocks: Add EPIT supportAlexander Shiyan2012-07-161-0/+9
| * | ARM: mx27: Reenable silicon version printFabio Estevam2012-07-091-0/+2
| * | ARM: clk-imx27: Fix rtc clock idFabio Estevam2012-07-092-2/+2
* | | Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-07-249-47/+116
|\ \ \
| * \ \ Merge branch 'imx/cpuidle' into next/pmOlof Johansson2012-07-019-47/+116
| |\ \ \
| | * | | ARM: imx: Add imx6q cpuidle driverRobert Lee2012-06-051-0/+19
| | * | | ARM: imx: Add imx5 cpuidleRobert Lee2012-06-051-2/+41
| | * | | ARM: imx: Enable imx53 low power idleRobert Lee2012-06-058-1/+16
| | * | | ARM: imx: clean and consolidate imx5 suspend and idle codeRobert Lee2012-06-052-46/+42Star
* | | | | Merge tag 'irq' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-07-2445-278/+194Star
|\ \ \ \ \
| * \ \ \ \ Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2...Arnd Bergmann2012-07-061-4/+0Star
| |\ \ \ \ \
| | * | | | | ARM: imx: select USE_OFUwe Kleine-König2012-07-061-4/+0Star
| * | | | | | Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2...Arnd Bergmann2012-07-0244-274/+194Star
| |\| | | | | | | |_|_|_|/ | |/| | | |
| | * | | | ARM: imx: remove unneeded mach/irq.h inclusionShawn Guo2012-07-0114-14/+0Star
| | * | | | ARM: imx: add a legacy irqdomain for mx31adsShawn Guo2012-07-011-17/+31
| | * | | | ARM: imx: pass gpio than irq number into mxc_expio_initShawn Guo2012-07-014-9/+4Star
| | * | | | ARM: imx: leave irq_base of wm8350_platform_data uninitializedShawn Guo2012-07-011-1/+0Star
| | * | | | dma: ipu: remove the use of ipu_platform_dataShawn Guo2012-07-0111-53/+13Star
| | * | | | ARM: imx: move irq_domain_add_legacy call into avic driverShawn Guo2012-07-011-15/+0Star
| | * | | | ARM: imx: move irq_domain_add_legacy call into tzic driverShawn Guo2012-07-012-30/+0Star
| | * | | | gpio/mxc: move irq_domain_add_legacy call into gpio driverShawn Guo2012-07-014-51/+0Star
| | * | | | ARM: imx: eliminate macro IRQ_GPIOx()Shawn Guo2012-07-0111-36/+55
| | * | | | ARM: imx: eliminate macro IOMUX_TO_IRQ()Shawn Guo2012-07-0111-42/+78
| | * | | | ARM: imx: eliminate macro IMX_GPIO_TO_IRQ()Shawn Guo2012-07-017-8/+15
| | | |/ / | | |/| |
* | | | | Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-07-246-3/+156
|\ \ \ \ \
| * \ \ \ \ Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2...Arnd Bergmann2012-07-123-1/+52
| |\ \ \ \ \
| | * | | | | ARM: imx6q: ensure ANATOP controller is availableOtavio Salvador2012-07-121-0/+1
| | * | | | | ARM: imx6q: disable usb charger detectorRichard Zhao2012-07-121-0/+41
| | * | | | | ARM: imx6q: add usbphy clocksRichard Zhao2012-07-121-1/+6
| | * | | | | ARM: imx6q: add usb controller clock lookupsRichard Zhao2012-07-121-0/+4
| * | | | | | Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dtArnd Bergmann2012-07-124-0/+91
| |\ \ \ \ \ \
| | * | | | | | ARM i.MX31: Add devicetree supportDenis 'GNUtoo' Carikli2012-07-104-0/+91
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge tag 'v3.5-rc6' into next/dtArnd Bergmann2012-07-122-2/+9
| |\| | | | | | | |/ / / / | |/| | | |