summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-096-23/+36
|\
| * ARM: mxs: select HAVE_CLK_PREPARE for clockShawn Guo2011-12-281-9/+22
| * ARM: mxs: convert platform code to clk_prepare/clk_unprepareShawn Guo2011-12-286-14/+14
* | Merge branch 'samsung/driver' into next/driversArnd Bergmann2012-01-099-26/+8
|\ \
| * \ Merge branch 'restart' into for-linusRussell King2012-01-058-3/+7
| |\ \
| | * | ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| | * | ARM: restart: mxs: use new restart hookRussell King2012-01-058-2/+10
| | * | Merge branch 'restart-cleanup' into restartRussell King2012-01-057-9/+10
| | |\|
| * | | Merge branch 'devel-stable' into for-linusRussell King2012-01-052-23/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-s...Russell King2011-12-051-22/+0
| | |\ \
| | | * | ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-22/+0
| | * | | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/...Russell King2011-12-051-1/+1
| | |\ \ \
| | * \ \ \ Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/ke...Russell King2011-11-211-2/+2
| | |\ \ \ \ | | | | |/ / | | | |/| / | | | |_|/ | | |/| |
| | * | | ARM: restart: only perform setup for restart when soft-restartingRussell King2011-11-211-1/+1
* | | | | Merge branch 'omap/hwmod' into next/driversArnd Bergmann2011-12-275-6/+7
|\| | | |
| * | | | ARM: mx28: LRADC macro renamePeter Rusko2011-12-021-2/+2
| * | | | arm: mx23: recognise stmp378x as mx23Wolfram Sang2011-12-021-0/+1
| * | | | ARM: mxs: fix machines' initializers orderLauri Hintsala2011-12-022-2/+2
| * | | | ARM: mxs/tx28: add __initconst for fec pdataDong Aisheng2011-12-021-2/+2
| | |_|/ | |/| |
* | | | ARM: mx28evk: set a initial clock rate for saifDong Aisheng2011-12-021-0/+9
* | | | ARM: mx28evk: add platform data for saifDong Aisheng2011-12-024-6/+24
* | | | ARM: mxs: add saif clkmux functionsDong Aisheng2011-12-023-0/+51
|/ / /
* | / arm: mx28: fix bit operation in clock settingWolfram Sang2011-11-231-1/+1
| |/ |/|
* | arm/mxs: fix mmc device adding for mach-mx28evkShawn Guo2011-11-081-2/+2
|/
* Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-10/+2
|\
| * arm/imx: use Kconfig choice for low-level debug UART selectionShawn Guo2011-10-171-10/+2
* | Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-0113-2/+233
|\ \
| * \ Merge branch 'depends/rmk/gpio' into next/develArnd Bergmann2011-10-311-31/+1
| |\ \
| * \ \ Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-206-5/+397
| |\ \ \
| * \ \ \ Merge branch 'imx/cleanup' into imx/develArnd Bergmann2011-10-078-65/+36
| |\ \ \ \
| * | | | | arm: mach-mxs: add rtc to all boardsWolfram Sang2011-08-235-0/+8
| * | | | | arm: mach-mxs: add device for rtcWolfram Sang2011-08-235-0/+59
| * | | | | arm: mxs: mx28evk: add fixed regulators for audioWolfram Sang2011-08-231-0/+42
| * | | | | ARM: mxs: correct the using of frac div for saifDong Aisheng2011-08-231-2/+2
| * | | | | ARM: mxs: add mxs-sgtl5000 deviceDong Aisheng2011-08-231-0/+3
| * | | | | ARM: mxs: add sgtl5000 i2c deviceDong Aisheng2011-08-232-0/+18
| * | | | | ARM: mxs: add saif deviceDong Aisheng2011-08-237-0/+95
| * | | | | ARM: mxs: add saif clockDong Aisheng2011-08-231-0/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-016-5/+397
|\ \ \ \ \
| * \ \ \ \ Merge branch 'depends/rmk/devel-stable' into next/boardArnd Bergmann2011-11-012-25/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'depends/rmk/gpio' into next/boardArnd Bergmann2011-10-211-8/+0
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| * | | | | ARM: mxs: Add initial support for DENX MX28Stefano Babic2011-10-136-5/+397
| | |_|/ / | |/| | |
* | | | | Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-019-92/+39
|\ \ \ \ \
| * \ \ \ \ Merge branch 'next/fixes' into next/cleanupArnd Bergmann2011-10-314-57/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-10-312-25/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| * | | | | | Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linu...Arnd Bergmann2011-10-203-3/+3
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | ARM: mach-mxs: fix machines' initializers orderLauri Hintsala2011-10-183-3/+3
| | | |_|/ / | | |/| | |
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ 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
| |\ \| | | |