kernel_samsung_smdk4412.git - kernel for Galaxy S3

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'devel-stable' into devel	Russell King	2011-01-06	1	-12/+12
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h
\| *	watchdog: imx: use clk_get to acquire the watchdog clock	Fabio Estevam	2010-12-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
\| *	ARM: imx: Get the silicon version from the IIM module	Dinh Nguyen	2010-11-28	1	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of reading the silicon version from ROM, we should read the SREV register from the IIM. Freescale has dropped all support for MX51 REV1.0, only MX51 REV 2.0 and 3.0 are valid. Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* \|	ARM: 6483/1: arm & sh: factorised duplicated clkdev.c	Jean-Christop PLAGNIOL-VILLARD	2010-11-26	1	-1/+1
\|/ \| \| \| \| \| \| \| \| \| \| \| \|	factorise some generic infrastructure to assist looking up struct clks for the ARM & SH architecture. as the code is identical at 99% put the arch specific code for allocation as example in asm/clkdev.h Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
*	ARM: imx/clock-imx27: Pass NULL as function callback, not 0	Uwe Kleine-König	2010-10-01	1	-21/+21
\| \| \| \| \| \| \| \| \|	This fixes many sparse warnings like: arch/arm/mach-imx/clock-imx27.c:597:1: warning: Using plain integer as NULL pointer Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
*	ARM: imx: use platform ids for spi_imx devices	Uwe Kleine-König	2010-10-01	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|	The driver recently learned to handle platform ids. Make use of this new feature. The up side is that the driver needs less knowledge about the spi interfaces used on different SoCs. Acked-by: Jason Wang <jason77.wang@gmail.com> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
*	Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵	Uwe Kleine-König	2010-07-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into HEAD There are some more conflicts than detected by git, namely support for the newly added cpuimx machines needed to be converted to dynamic device registration. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Conflicts: arch/arm/mach-imx/Makefile arch/arm/mach-imx/devices.c arch/arm/mach-imx/devices.h arch/arm/mach-imx/eukrea_mbimx27-baseboard.c arch/arm/mach-mx2/Kconfig arch/arm/mach-mx25/Makefile arch/arm/mach-mx25/devices.c arch/arm/plat-mxc/include/mach/mx25.h arch/arm/plat-mxc/include/mach/mxc_nand.h
*	ARM: imx: rename mach dir for mx21 and mx27 to mach-imx	Uwe Kleine-König	2010-06-24	1	-0/+763
	Finally all imx code should end up there, start with mach-mx2. While touching all files rename some files to use a hyphen instead of an underscore. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>