kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-10-16 22:39:48 +00:00
Code Issues Releases Packages Activity

Merge remote-tracking branch 'grant/gpio/next-mx' into devel-features

Browse source 
Conflicts:
	arch/arm/mach-imx/mach-mx31_3ds.c
	arch/arm/mach-imx/mach-scb9328.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2011-07-07 10:00:49 +02:00
commit e59a7943f2
70 changed files with 1042 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-imx/mach-apf9328.c
View file

2
arch/arm/mach-imx/mach-armadillo5x0.c
View file

2
arch/arm/mach-imx/mach-bug.c
View file

2
arch/arm/mach-imx/mach-cpuimx27.c
View file

2
arch/arm/mach-imx/mach-cpuimx35.c
View file

2
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
View file

2
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
View file

2
arch/arm/mach-imx/mach-imx27ipcam.c
View file

2
arch/arm/mach-imx/mach-imx27lite.c
View file

2
arch/arm/mach-imx/mach-kzm_arm11_01.c
View file

2
arch/arm/mach-imx/mach-mx1ads.c
View file

2
arch/arm/mach-imx/mach-mx21ads.c
View file

2
arch/arm/mach-imx/mach-mx25_3ds.c
View file

2
arch/arm/mach-imx/mach-mx27_3ds.c
View file

2
arch/arm/mach-imx/mach-mx27ads.c
View file

2
arch/arm/mach-imx/mach-mx31_3ds.c
View file

2
arch/arm/mach-imx/mach-mx31ads.c
View file

2
arch/arm/mach-imx/mach-mx31lilly.c
View file

2
arch/arm/mach-imx/mach-mx31lite.c
View file

2
arch/arm/mach-imx/mach-mx31moboard.c
View file

2
arch/arm/mach-imx/mach-mx35_3ds.c
View file

2
arch/arm/mach-imx/mach-mxt_td60.c
View file

2
arch/arm/mach-imx/mach-pca100.c
View file

2
arch/arm/mach-imx/mach-pcm037.c
View file

2
arch/arm/mach-imx/mach-pcm038.c
View file

2
arch/arm/mach-imx/mach-pcm043.c
View file

2
arch/arm/mach-imx/mach-qong.c
View file

2
arch/arm/mach-imx/mach-scb9328.c
View file

2
arch/arm/mach-imx/mach-vpr200.c
View file

17
arch/arm/mach-imx/mm-imx1.c
View file

21
arch/arm/mach-imx/mm-imx21.c
View file

16
arch/arm/mach-imx/mm-imx25.c
View file

21
arch/arm/mach-imx/mm-imx27.c
View file

15
arch/arm/mach-imx/mm-imx31.c
View file

15
arch/arm/mach-imx/mm-imx35.c
View file

2
arch/arm/mach-mx5/board-cpuimx51.c
View file

2
arch/arm/mach-mx5/board-cpuimx51sd.c
View file

2
arch/arm/mach-mx5/board-mx50_rdp.c
View file

2
arch/arm/mach-mx5/board-mx51_3ds.c
View file

2
arch/arm/mach-mx5/board-mx51_babbage.c
View file

2
arch/arm/mach-mx5/board-mx51_efikamx.c
View file

2
arch/arm/mach-mx5/board-mx51_efikasb.c
View file

2
arch/arm/mach-mx5/board-mx53_evk.c
View file

2
arch/arm/mach-mx5/board-mx53_loco.c
View file

2
arch/arm/mach-mx5/board-mx53_smd.c
View file

64
arch/arm/mach-mx5/devices.c
View file

21
arch/arm/mach-mx5/mm-mx50.c
View file

25
arch/arm/mach-mx5/mm.c
View file

2
arch/arm/mach-mxs/Makefile
View file

11
arch/arm/mach-mxs/devices.c
View file

1
arch/arm/mach-mxs/devices/Makefile
View file

53
arch/arm/mach-mxs/devices/platform-gpio-mxs.c
View file

34
arch/arm/mach-mxs/gpio.h
View file

2
arch/arm/mach-mxs/include/mach/devices-common.h
View file

1
arch/arm/mach-mxs/mach-mx28evk.c
View file

1
arch/arm/mach-mxs/mm-mx23.c
View file

1
arch/arm/mach-mxs/mm-mx28.c
View file

2
arch/arm/plat-mxc/Makefile
View file

11
arch/arm/plat-mxc/devices.c
View file

1
arch/arm/plat-mxc/devices/Makefile
View file

32
arch/arm/plat-mxc/devices/platform-gpio-mxc.c
View file

12
arch/arm/plat-mxc/include/mach/common.h
View file

2
arch/arm/plat-mxc/include/mach/devices-common.h
View file

27
arch/arm/plat-mxc/include/mach/gpio.h
View file

9
drivers/gpio/Kconfig
View file

2
drivers/gpio/Makefile
View file

260
arch/arm/plat-mxc/gpio.c → drivers/gpio/gpio-mxc.c
View file

229
arch/arm/mach-mxs/gpio.c → drivers/gpio/gpio-mxs.c
View file