lwn.git/arch/arm/mach-mx5/mx51_efika.c, branch docs-fixes

ARM i.MX: Merge i.MX5 support into mach-imx

2011-11-16T07:37:37+00:00

This patch moves the contents of arch/arm/mach-mx5 to arch/arm/mach-imx and adjusts the Makefile/Kconfig entries in a way that it's possible to compile i.MX5 together with i.MX3/6. Signed-off-by: Sascha Hauer Tested-by: Shawn Guo Tested-by: Dirk Behme

Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6

2011-11-03T16:40:51+00:00

* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits) mfd: Fix missing abx500 header file updates mfd: Add missing include to intel_msic x86, mrst: add platform support for MSIC MFD driver mfd: Expose TurnOnStatus in ab8500 sysfs mfd: Remove support for early drop ab8500 chip mfd: Add support for ab8500 v3.3 mfd: Add ab8500 interrupt disable hook mfd: Convert db8500-prcmu panic() into pr_crit() mfd: Refactor db8500-prcmu request_clock() function mfd: Rename db8500-prcmu init function mfd: Fix db5500-prcmu defines mfd: db8500-prcmu voltage domain consumers additions mfd: db8500-prcmu reset code retrieval mfd: db8500-prcmu tweak for modem wakeup mfd: Add db8500-pcmu watchdog accessor functions for watchdog mfd: hwacc power state db8500-prcmu accessor mfd: Add db8500-prcmu accessors for PLL and SGA clock mfd: Move to the new db500 PRCMU API mfd: Create a common interface for dbx500 PRCMU drivers mfd: Initialize DB8500 PRCMU regs ... Fix up trivial conflicts in arch/arm/mach-imx/mach-mx31moboard.c arch/arm/mach-omap2/board-omap3beagle.c arch/arm/mach-u300/include/mach/irqs.h drivers/mfd/wm831x-spi.c

ARM: imx+mc13xxx: remove obsolete leds and regulators flags

2011-10-24T12:09:14+00:00

Signed-off-by: Philippe Rétornaz Acked-by: Sascha Hauer Signed-off-by: Samuel Ortiz

Merge branch 'imx/cleanup' into imx/devel

2011-10-07T19:57:31+00:00

This helps resolve the conflicts between the imx cleanups and the new code that has gone into the imx tree. Conflict resolution was originally done by Sascha Hauer. Signed-off-by: Arnd Bergmann

Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features

2011-09-29T08:40:29+00:00

Conflicts: arch/arm/plat-mxc/avic.c arch/arm/plat-mxc/include/mach/common.h Signed-off-by: Sascha Hauer

efika: Configure esdhc cd/wp on efika mx/sb

2011-08-27T18:31:41+00:00

Update sdhc support on efika to make use of the latest mmc fixes. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer

Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata', 'features/multisoc' and 'features/mxs' into imx-features-for-arnd

2011-08-26T08:10:12+00:00

Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'cleanups/troy-cleanup-iomux-v3' and 'cleanups/ukl-mx5-dynamically-allocate-devices' into imx-cleanups-for-arnd

2011-08-26T08:09:31+00:00

imx: efika: Enable pata.

2011-08-23T06:55:03+00:00

Enable pata support on efika mx/sb platforms. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer

imx5: not include the unused head file

2011-08-16T07:26:58+00:00

Remove the useless and reference Signed-off-by: Jason Liu Cc: Sascha Hauer Signed-off-by: Sascha Hauer