Revision tags: v3.8-rc1 |
|
#
9c7466b2 |
| 13-Dec-2012 |
Olof Johansson <olof@lixom.net> |
ARM: arm-soc: Merge branch 'next/pm2' into next/pm
Another smaller branch merged into next/pm before pull request.
Signed-off-by: Olof Johansson <olof@lixom.net>
|
#
d01e4afd |
| 12-Dec-2012 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC cleanups on various subarchitectures from Olof Johansson: "Cleanup patches for various ARM platforms an
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC cleanups on various subarchitectures from Olof Johansson: "Cleanup patches for various ARM platforms and some of their associated drivers. There's also a branch in here that enables Freescale i.MX to be part of the multiplatform support -- the first "big" SoC that is moved over (more multiplatform work comes in a separate branch later during the merge window)."
Conflicts fixed as per Olof, including a silent semantic one in arch/arm/mach-omap2/board-generic.c (omap_prcm_restart() was renamed to omap3xxx_restart(), and a new user of the old name was added).
* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (189 commits) ARM: omap: fix typo on timer cleanup ARM: EXYNOS: Remove unused regs-mem.h file ARM: EXYNOS: Remove unused non-dt support for dwmci controller ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan ARM: OMAP3: cm-t3517: use GPTIMER for system clock ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER ARM: SAMSUNG: use devm_ functions for ADC driver ARM: EXYNOS: no duplicate mask/unmask in eint0_15 ARM: S3C24XX: SPI clock channel setup is fixed for S3C2443 ARM: EXYNOS: Remove i2c0 resource information and setting of device names ARM: Kirkwood: checkpatch cleanups ARM: Kirkwood: Fix sparse warnings. ARM: Kirkwood: Remove unused includes ARM: kirkwood: cleanup lsxl board includes ARM: integrator: use BUG_ON where possible ARM: integrator: push down SC dependencies ARM: integrator: delete static UART1 mapping ARM: integrator: delete SC mapping on the CP ARM: integrator: remove static CP syscon mapping ARM: integrator: remove static AP syscon mapping ...
show more ...
|
Revision tags: v3.7, v3.7-rc8 |
|
#
68fb3170 |
| 30-Nov-2012 |
Olof Johansson <olof@lixom.net> |
Merge branch 'next/cleanup' into next/pm2
By Tony Lindgren (36) and others via Tony Lindgren (22) and others * next/cleanup: (303 commits) ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan AR
Merge branch 'next/cleanup' into next/pm2
By Tony Lindgren (36) and others via Tony Lindgren (22) and others * next/cleanup: (303 commits) ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan ARM: OMAP3: cm-t3517: use GPTIMER for system clock ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER ARM: SAMSUNG: use devm_ functions for ADC driver ARM: EXYNOS: no duplicate mask/unmask in eint0_15 ARM: S3C24XX: SPI clock channel setup is fixed for S3C2443 ARM: EXYNOS: Remove i2c0 resource information and setting of device names ARM: Kirkwood: checkpatch cleanups ARM: Kirkwood: Fix sparse warnings. ARM: Kirkwood: Remove unused includes ARM: kirkwood: cleanup lsxl board includes ARM: integrator: use BUG_ON where possible ARM: integrator: push down SC dependencies ARM: integrator: delete static UART1 mapping ARM: integrator: delete SC mapping on the CP ARM: integrator: remove static CP syscon mapping ARM: integrator: remove static AP syscon mapping ARM: integrator: hook the CP into the SoC bus ARM: integrator: hook the AP into the SoC bus ARM: OMAP2+: Fix compiler warning for 32k timer ...
show more ...
|
Revision tags: v3.7-rc7, v3.7-rc6 |
|
#
bac2f668 |
| 16-Nov-2012 |
Arnd Bergmann <arnd@arndb.de> |
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX dt updates for 3.8
* tag 'imx-dt' of git://git.pengutronix.de/git
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX dt updates for 3.8
* tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6: Add device tree file for the armadeus apf27 ARM i.MX: Add Ka-Ro TX25 devicetree ARM i.MX25: Add devicetree ARM i.MX25: Add devicetree support ARM i.MX25: Add missing clock gates
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
show more ...
|
#
db2f95de |
| 16-Nov-2012 |
Arnd Bergmann <arnd@arndb.de> |
Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX SoC updates
based on imx-multiplatform branch.
* tag 'imx-soc'
Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX SoC updates
based on imx-multiplatform branch.
* tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6: ARM i.MX51 babbage: Add display support ARM i.MX6: Add IPU support ARM i.MX51: Add IPU support ARM i.MX53: Add IPU support ARM i.MX5: switch IPU clk support to devicetree bindings ARM i.MX6: fix ldb_di_sel mux ARM i.MX51: setup MIPI during startup mx2_camera: Fix regression caused by clock conversion ARM: clk-imx27: Add missing clock for mx2-camera ARM i.MX27: Fix low reference clock path ARM: dts: imx27-3ds: Remove local watchdog inclusion watchdog: Support imx watchdog on SOC_IMX53 ARM: mach-imx: Support for DryIce RTC in i.MX53 ARM : i.MX27 : split code for allocation of ressources of camera and eMMA
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
show more ...
|
#
89a41503 |
| 16-Nov-2012 |
Sascha Hauer <s.hauer@pengutronix.de> |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x
|
#
53640f41 |
| 12-Nov-2012 |
Sascha Hauer <s.hauer@pengutronix.de> |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into imx25-dt
|
Revision tags: v3.7-rc5, v3.7-rc4, v3.7-rc3, v3.7-rc2 |
|
#
4afe30df |
| 16-Oct-2012 |
Olof Johansson <olof@lixom.net> |
Merge branch 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup
From Shawn Guo: "Here is the imx multi-platform support [1] that missed 3.7 merge window. Pleas
Merge branch 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup
From Shawn Guo: "Here is the imx multi-platform support [1] that missed 3.7 merge window. Please pull it for 3.8 and exposing on linux-next. As it touches a lot of files, I send it early, so that people can base their works off it to avoid conflicts."
* 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6: (31 commits) ARM: imx: enable multi-platform build ARM: imx: call mxc_device_init() in soc specific function ARM: imx: remove header file mach/irqs.h ARM: imx: include hardware.h rather than mach/hardware.h ARM: imx: move debug macros to include/debug video: imxfb: remove cpu_is_xxx by using platform_device_id mmc: mxcmmc: remove cpu_is_xxx by using platform_device_id media: mx2_camera: remove cpu_is_xxx by using platform_device_id dma: imx-dma: remove cpu_is_xxx by using platform_device_id dma: imx-dma: retrieve MEM and IRQ from resources dma: imx-dma: use devm_kzalloc and devm_request_irq rtc: mxc_rtc: remove cpu_is_xxx by using platform_device_id mtd: mxc_nand: remove cpu_is_xxx by using platform_device_id i2c: imx: remove cpu_is_xxx by using platform_device_id watchdog: imx2_wdt: remove unneeded mach/hardware.h inclusion video: mx3fb: remove unneeded mach/hardware.h inclusion usb: ehci-mxc: remove unneeded mach/hardware.h inclusion ASoC: imx-ssi: remove unneeded mach/hardware.h inclusion dma: imx-sdma: remove unneeded mach/hardware.h inclusion dma: ipu: rename mach/ipu.h to include/linux/dma/ipu-dma.h ...
Signed-off-by: Olof Johansson <olof@lixom.net>
show more ...
|
Revision tags: v3.7-rc1, v3.6, v3.6-rc7, v3.6-rc6 |
|
#
50f2de61 |
| 14-Sep-2012 |
Shawn Guo <shawn.guo@linaro.org> |
ARM: imx: include hardware.h rather than mach/hardware.h
It moves a bunch of header files included in hardware.h and itself from mach-imx/include/mach to mach-imx, and updates users to include hardw
ARM: imx: include hardware.h rather than mach/hardware.h
It moves a bunch of header files included in hardware.h and itself from mach-imx/include/mach to mach-imx, and updates users to include hardware.h rather than mach/hardware.h. The files in mach-imx/devices will need to include "../hardware.h".
Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Arnd Bergmann <arnd@arndb.de>
show more ...
|