lwn.git/arch/arm/mach-pxa/include/mach/gpio-pxa.h, branch docs-fixes

ARM: pxa: change gpio to platform device

2011-11-15T11:08:27+00:00

Remove most gpio macros and change gpio driver to platform driver. Signed-off-by: Haojian Zhuang

ARM: pxa: rename NR_BUILTIN_GPIO

2011-11-14T13:07:59+00:00

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

ARM: PXA: fix gpio-pxa.h build errors

2011-11-05T22:26:40+00:00

A mismerge in 43872fa (Merge branch 'depends/rmk/gpio' into next/fixes) causes these build errors: In file included from arch/arm/mach-pxa/include/mach/gpio.h:30, from arch/arm/include/asm/gpio.h:6, from include/linux/gpio.h:31, from arch/arm/mach-pxa/generic.c:20: arch/arm/mach-pxa/include/mach/gpio-pxa.h: In function ■__gpio_is_occupied■: arch/arm/mach-pxa/include/mach/gpio-pxa.h:121: error: invalid operands to binary >> (have ■void *■ and ■unsigned int■) arch/arm/mach-pxa/include/mach/gpio-pxa.h:122: error: invalid operands to binary & (have ■void *■ and ■int■) arch/arm/mach-pxa/include/mach/gpio-pxa.h:129: error: invalid operands to binary & (have ■void *■ and ■int■) So fix them. Acked-by: Arnd Bergmann Signed-off-by: Russell King

Merge branch 'depends/rmk/gpio' into next/fixes

2011-10-31T21:44:18+00:00

This sorts out merge conflicts with the arm/gpio branch that already got merged into mainline Linux. Signed-off-by: Arnd Bergmann

ARM: 7104/1: plat-pxa: break out GPIO driver specifics

2011-10-01T22:45:34+00:00

The 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 Signed-off-by: Linus Walleij Signed-off-by: Russell King