Revision tags: v3.4-rc7, v3.4-rc6, v3.4-rc5, v3.4-rc4, v3.4-rc3, v3.4-rc2 |
|
#
2acd1b6f |
| 04-Apr-2012 |
Shawn Guo <shawn.guo@linaro.org> |
ARM: i.MX6: implement clocks using common clock framework Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Philipp
ARM: i.MX6: implement clocks using common clock framework Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
show more ...
|
#
5b48a614 |
| 03-Apr-2012 |
Sascha Hauer <s.hauer@pengutronix.de> |
ARM i.MX35: implement clocks using common clock framework This patch also adds the SPDIF baud clock mux and dividers. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed
ARM i.MX35: implement clocks using common clock framework This patch also adds the SPDIF baud clock mux and dividers. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
show more ...
|
Revision tags: v3.4-rc1 |
|
#
b8d4176f |
| 19-Mar-2012 |
Sascha Hauer <s.hauer@pengutronix.de> |
ARM i.MX5: implement clocks using common clock framework Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
|
#
932d67d4 |
| 08-May-2012 |
Eric Bénard <eric@eukrea.com> |
ARM: imx: eukrea_mbimxsd: add audio support Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
|
#
f5c85d92 |
| 08-May-2012 |
Eric Bénard <eric@eukrea.com> |
ARM: imx: eukrea_cpuimx51sd: add watchdog support Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutron
ARM: imx: eukrea_cpuimx51sd: add watchdog support Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
show more ...
|
#
a88da890 |
| 08-May-2012 |
Eric Bénard <eric@eukrea.com> |
ARM: imx: eukrea-cpuimx51: remove board this board is not publicly available and is replaced by cpuimx51sd Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@
ARM: imx: eukrea-cpuimx51: remove board this board is not publicly available and is replaced by cpuimx51sd Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
show more ...
|
#
0e189858 |
| 08-May-2012 |
Eric Bénard <eric@eukrea.com> |
ARM: imx: eukrea_mbimxsd35: add spi controler and spidev support Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Sascha Hauer <s.
ARM: imx: eukrea_mbimxsd35: add spi controler and spidev support Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
show more ...
|
#
4692cba1 |
| 08-May-2012 |
Eric Bénard <eric@eukrea.com> |
ARM: imx: eukrea_cpuimx25: add watchdog support Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix
ARM: imx: eukrea_cpuimx25: add watchdog support Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
show more ...
|
#
49ed9407 |
| 08-May-2012 |
Eric Bénard <eric@eukrea.com> |
ARM: imx: eukrea_mbimxsd25: add spi controler and spidev support Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Sascha Hauer <s.
ARM: imx: eukrea_mbimxsd25: add spi controler and spidev support Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
show more ...
|
#
32329a2c |
| 02-May-2012 |
Dong Aisheng <dong.aisheng@linaro.org> |
ARM: imx6q: switch to use pinctrl subsystem Acked-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo
ARM: imx6q: switch to use pinctrl subsystem Acked-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
show more ...
|
Revision tags: v3.3 |
|
#
95878cbe |
| 18-Mar-2012 |
Sascha Hauer <s.hauer@pengutronix.de> |
ARM i.MX31: implement clocks using common clock framework Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
|
Revision tags: v3.3-rc7 |
|
#
e038ed50 |
| 09-Mar-2012 |
Sascha Hauer <s.hauer@pengutronix.de> |
ARM i.MX27: implement clocks using common clock framework Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
|
#
93421e42 |
| 09-Mar-2012 |
Sascha Hauer <s.hauer@pengutronix.de> |
ARM i.MX21: implement clocks using common clock framework Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
|
#
cd73785f |
| 09-Mar-2012 |
Sascha Hauer <s.hauer@pengutronix.de> |
ARM i.MX1: implement clocks using common clock framework This also changes the DMA clkdev lookup to use the imx-dma driver name and "ahb" as connection ID to request the hclk dma clock.
ARM i.MX1: implement clocks using common clock framework This also changes the DMA clkdev lookup to use the imx-dma driver name and "ahb" as connection ID to request the hclk dma clock. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
show more ...
|
#
6bbaec56 |
| 08-Mar-2012 |
Sascha Hauer <s.hauer@pengutronix.de> |
ARM i.MX25: implement clocks using common clock framework Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
|
#
8e3e26a8 |
| 24-Apr-2012 |
Marc Kleine-Budde <mkl@pengutronix.de> |
arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig This patch fixes the following linker error: arch/arm/mach-imx/built-in.o: In function `mx35_3ds_init': ma
arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig This patch fixes the following linker error: arch/arm/mach-imx/built-in.o: In function `mx35_3ds_init': mach-mx35_3ds.c:(.init.text+0x4b0): undefined reference to `imx_add_ipu_core' mach-mx35_3ds.c:(.init.text+0x4c4): undefined reference to `imx_alloc_mx3_camera' mach-mx35_3ds.c:(.init.text+0x520): undefined reference to `imx_add_mx3_sdc_fb' mach-mx35_3ds.c:(.init.text+0x590): undefined reference to `imx35_ipu_core_data' Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Cc: Fabio Estevam <festevam@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
show more ...
|
#
ef08e782 |
| 29-Mar-2012 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma Pull slave-dmaengine update from Vinod Koul: "This includes the cookie cleanup by Russell, the addition of context
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma Pull slave-dmaengine update from Vinod Koul: "This includes the cookie cleanup by Russell, the addition of context parameter for dmaengine APIs, more arm dmaengine driver cleanup by moving code to dmaengine, this time for imx by Javier and pl330 by Boojin along with the usual driver fixes." Fix up some fairly trivial conflicts with various other cleanups. * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (67 commits) dmaengine: imx: fix the build failure on x86_64 dmaengine: i.MX: Fix merge of cookie branch. dmaengine: i.MX: Add support for interleaved transfers. dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages. dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk'. dmaengine: imx-dma: remove unused arg of imxdma_sg_next. dmaengine: imx-dma: remove internal structure. dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure. dmaengine: imx-dma: remove 'in_use' field of 'internal' structure. dmaengine: imx-dma: remove sg member from internal structure. dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function. dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function. dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function. dmaengine: imx-dma: remove dma_mode member of internal structure. dmaengine: imx-dma: remove data member from internal structure. dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c dmaengine: at_hdmac: add slave config operation dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic dmaengine/dma_slave: introduce inline wrappers dma: imx-sdma: Treat firmware messages as warnings instead of erros ...
show more ...
|
#
66f03c61 |
| 27-Mar-2012 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull "ARM: device tree work" from Arnd Bergmann: "Most of these patches convert code from using static platfo
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull "ARM: device tree work" from Arnd Bergmann: "Most of these patches convert code from using static platform data to describing the hardware in the device tree. This is only the first half of the changes for v3.4 because a lot of patches for this topic came in the last week before the merge window. Signed-off-by: Arnd Bergmann <arnd@arndb.de>" Fix up trivial conflicts in arch/arm/mach-vexpress/{Kconfig,core.h} * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (86 commits) Document: devicetree: add OF documents for arch-mmp ARM: dts: append DTS file of pxa168 ARM: mmp: append OF support on pxa168 ARM: mmp: enable rtc clk in pxa168 i2c: pxa: add OF support serial: pxa: add OF support arm/dts: mt_ventoux: very basic support for TeeJet Mt.Ventoux board ARM: OMAP2+: Remove extra ifdefs for board-generic ARM: OMAP2+: Fix build error when only ARCH_OMAP2/3 or 4 is selected ASoC: DT: Add digital microphone binding to PAZ00 board. ARM: dt: Add ARM PMU to tegra*.dtsi ARM: at91: at91sam9x5cm/dt: add leds support ARM: at91: usb_a9g20/dt: add gpio-keys support ARM: at91: at91sam9m10g45ek/dt: add gpio-keys support ARM: at91: at91sam9m10g45ek/dt: add leds support ARM: at91: usb_a9g20/dt: add leds support ARM: at91/pio: add new PIO3 features ARM: at91: add sam9_smc.o to at91sam9x5 build ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter ARM: at91/tc: add device tree support to atmel_tclib ...
show more ...
|
#
34800598 |
| 27-Mar-2012 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull "ARM: driver specific updates" from Arnd Bergmann: "These are all specific to some driver. They ar
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull "ARM: driver specific updates" from Arnd Bergmann: "These are all specific to some driver. They are typically the platform side of a change in the drivers directory, such as adding a new driver or extending the interface to the platform. In cases where there is no maintainer for the driver, or the maintainer prefers to have the platform changes in the same branch as the driver changes, the patches to the drivers are included as well. A much smaller set of driver updates that depend on other branches getting merged first will be sent later. The new export of tegra_chip_uid conflicts with other changes in fuse.c. In rtc-sa1100.c, the global removal of IRQF_DISABLED conflicts with the cleanup of the interrupt handling of that driver. Signed-off-by: Arnd Bergmann <arnd@arndb.de>" Fixed up aforementioned trivial conflicts. * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits) ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci mmc: sdhci-s3c: add platform data for the second capability ARM: SAMSUNG: support the second capability for samsung-soc ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1 ARM: EXYNOS: Enable MDMA driver regulator: Remove bq24022 regulator driver rtc: sa1100: add OF support pxa: magician/hx4700: Convert to gpio-regulator from bq24022 ARM: OMAP3+: SmartReflex: fix error handling ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API ARM: OMAP3+: SmartReflex: micro-optimization for sanity check ARM: OMAP3+: SmartReflex: misc cleanups ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata() ARM: OMAP3+: hwmod: add SmartReflex IRQs ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register ARM: OMAP3+: SmartReflex: Add a shutdown hook ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP ... Conflicts: arch/arm/mach-tegra/Makefile arch/arm/mach-tegra/fuse.c drivers/rtc/rtc-sa1100.c
show more ...
|
#
a754a87c |
| 24-Mar-2012 |
Arnd Bergmann <arnd@arndb.de> |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards The asoc branch that was already merged into v3.4 contains some board-level changes t
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards The asoc branch that was already merged into v3.4 contains some board-level changes that conflict with patches we already have here, so pull in that branch to resolve the conflicts. Conflicts: arch/arm/mach-imx/mach-imx27_visstrim_m10.c arch/arm/mach-omap2/board-omap4panda.c Signed-off-by: Arnd Bergmann <arnd@arndb.de> [olof: Amended fix for mismerge as reported by Kevin Hilman] Signed-off-by: Olof Johansson <olof@lixom.net>
show more ...
|
#
6bd08127 |
| 22-Mar-2012 |
Javier Martin <javier.martin@vista-silicon.com> |
dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c It is mainly a simple merge changing the prefix of some functions to fit the imx-dma namings. As there are no users of the
dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c It is mainly a simple merge changing the prefix of some functions to fit the imx-dma namings. As there are no users of the old dma-v1.c api we can safely remove this file. Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
show more ...
|
#
3c77c29c |
| 05-Mar-2012 |
Shawn Guo <shawn.guo@linaro.org> |
ASoC: imx: move audmux driver into sound/soc/imx As audmux becomes a platform driver and its callers are all ASoC machine drivers, there is no reason to keep it in arch folder, so mo
ASoC: imx: move audmux driver into sound/soc/imx As audmux becomes a platform driver and its callers are all ASoC machine drivers, there is no reason to keep it in arch folder, so move it to sound/soc/imx. One bonus point would be those ASoC machine drivers stop including mach/audmux.h, since it's been moved to sound/soc/imx/imx-audmux.h. This should be a move to the right direction in terms of single kernel image goal. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
show more ...
|
#
2405fc97 |
| 05-Mar-2012 |
Shawn Guo <shawn.guo@linaro.org> |
ARM: imx: merge audmux-v1 and audmux-v2 It merges audmux-v1 and audmux-v2 under arch/arm/plat-mxc into one. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Haue
ARM: imx: merge audmux-v1 and audmux-v2 It merges audmux-v1 and audmux-v2 under arch/arm/plat-mxc into one. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
show more ...
|
#
721d6d1e |
| 02-Mar-2012 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards * 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2.6: mx31moboa
Merge branch 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards * 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2.6: mx31moboard: Add watchdog support mx31moboard: update maintainer
show more ...
|
Revision tags: v3.3-rc6, v3.3-rc5, v3.3-rc4, v3.3-rc3, v3.3-rc2 |
|
#
31776fbc |
| 20-Jan-2012 |
Philippe Rétornaz <philippe.retornaz@epfl.ch> |
mx31moboard: Add watchdog support Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
|