kernel_goldelico_gta04.git - kernel/goldelico/gta04

	Commit message (Collapse)	Author	Age	Files	Lines
*	ARM: mmp: remove mach/gpio-pxa.h	Paul Bolle	2012-07-04	1	-29/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Commit 157d2644cb0c1e71a18baaffca56d2b1d0ebf10f ("ARM: pxa: change gpio to platform device") removed all includes of mach/gpio-pxa.h. It kept this unused header in the tree. Using it can't work, as it itself includes the non-existent header plat/gpio-pxa.h. This header can safely be removed. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
*	Merge branch 'mxs/saif' into next/drivers	Arnd Bergmann	2011-12-06	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Conflicts: drivers/net/ethernet/cadence/Kconfig
\| *	ARM: mmp: fix build error on gpio	Haojian Zhuang	2011-11-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Parameters of GPIO_REG() should be assigned as volatile. arch/arm/plat-pxa/include/plat/gpio.h: In function ‘gpio_get_value’: arch/arm/plat-pxa/include/plat/gpio.h:12:21: error: invalid operands to binary & (have ‘void *’ and ‘int’) arch/arm/plat-pxa/include/plat/gpio.h: In function ‘gpio_set_value’: arch/arm/plat-pxa/include/plat/gpio.h:21:4: error: lvalue required as left operand of assignment arch/arm/plat-pxa/include/plat/gpio.h:23:4: error: lvalue required as left operand of assignment Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* \|	ARM: pxa: rename NR_BUILTIN_GPIO	Haojian Zhuang	2011-11-14	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	NR_BUILTIN_GPIO is both defined in arch-pxa and arch-mmp. Now replace it with PXA_NR_BUILTIN_GPIO and MMP_NR_BUILTIN_GPIO. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
* \|	ARM: pxa: rename gpio_to_irq and irq_to_gpio	Haojian Zhuang	2011-11-14	1	-0/+1
\|/ \| \| \| \| \| \|	Avoid to define gpio_to_irq() and irq_to_gpio() for potential name confliction since multiple architecture will be built together. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
*	Merge branch 'depends/rmk/gpio' into next/fixes	Arnd Bergmann	2011-10-31	1	-1/+1
\| \| \| \| \| \| \|	This sorts out merge conflicts with the arm/gpio branch that already got merged into mainline Linux. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
*	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	Linus Walleij	2011-10-01	1	-0/+30
	The <mach/gpio.h> file is included from upper directories and deal with generic GPIO and gpiolib stuff. Break out the platform and driver specific defines and functions into its own header file. Cc: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>