lwn.git/arch/arm/mach-mx5/board-mx51_efikamx.c, branch v3.14.48

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 'next/devel' of git://git.linaro.org/people/arnd/arm-soc

2011-11-02T03:31:25+00:00

* 'next/devel' of git://git.linaro.org/people/arnd/arm-soc: (50 commits) ARM: tegra: update defconfig arm/tegra: Harmony: Configure PMC for low-level interrupts arm/tegra: device tree support for ventana board arm/tegra: add support for ventana pinmuxing arm/tegra: prepare Seaboard pinmux code for derived boards arm/tegra: pinmux: ioremap registers gpio/tegra: Convert to a platform device arm/tegra: Convert pinmux driver to a platform device arm/dt: Tegra: Add pinmux node to tegra20.dtsi arm/tegra: Prep boards for gpio/pinmux conversion to pdevs ARM: mx5: fix clock usage for suspend ARM i.MX entry-macro.S: remove now unused code ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER ARM i.MX tzic: add handle_irq function ARM i.MX avic: add handle_irq function ARM: mx25: Add the missing IIM base definition ARM i.MX avic: convert to use generic irq chip mx31moboard: Add poweroff support ARM: mach-qong: Add watchdog support ARM: davinci: AM18x: Add wl1271/wlan support ... Fix up conflicts in: arch/arm/mach-at91/at91sam9g45.c arch/arm/mach-mx5/devices-imx53.h arch/arm/plat-mxc/include/mach/memory.h

Merge branch 'depends/rmk/devel-stable' into next/cleanup

2011-10-08T19:07:42+00:00

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

ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER

2011-09-26T09:40:36+00:00

Also, add handle_irq callbacks to machine descriptors. 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 '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

ARM: mach-mx5: convert boot_params to atag_offset

2011-08-21T21:15:01+00:00

Signed-off-by: Nicolas Pitre Acked-by: Arnd Bergmann

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