Merge branch 'imx/cleanup' into imx/devel

Browse source

This helps resolve the conflicts between the imx cleanups and the
new code that has gone into the imx tree.
Conflict resolution was originally done by Sascha Hauer.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

...

This commit is contained in:

Arnd Bergmann 2011-10-07 21:57:31 +02:00

parent 4c4cbce68f 05d900c9d8

commit 526b264163

61 changed files with 2600 additions and 4764 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

15

arch/arm/mach-imx/Makefile

View file

56

arch/arm/mach-imx/cache-l2x0.c

View file

18

arch/arm/mach-imx/mach-armadillo5x0.c

View file

2

arch/arm/mach-imx/mach-cpuimx35.c

View file

15

arch/arm/mach-imx/mach-mx1ads.c

View file

2

arch/arm/mach-imx/mach-mx27_3ds.c

View file

2

arch/arm/mach-imx/mach-vpr200.c

View file

256

arch/arm/mach-imx/mm-imx3.c

View file

91

arch/arm/mach-imx/mm-imx31.c

View file

109

arch/arm/mach-imx/mm-imx35.c

View file

2

arch/arm/mach-imx/pm-imx27.c

View file

10

arch/arm/mach-mx5/Kconfig

View file

3

arch/arm/mach-mx5/Makefile

View file

27

arch/arm/mach-mx5/board-cpuimx51.c

View file

25

arch/arm/mach-mx5/board-cpuimx51sd.c

View file

1

arch/arm/mach-mx5/board-mx51_3ds.c

View file

26

arch/arm/mach-mx5/board-mx51_babbage.c

View file

2

arch/arm/mach-mx5/board-mx51_efikamx.c

View file

6

arch/arm/mach-mx5/board-mx51_efikasb.c

View file

4

arch/arm/mach-mx5/board-mx53_ard.c

View file

2

arch/arm/mach-mx5/clock-mx51-mx53.c

View file

13

arch/arm/mach-mx5/devices-imx51.h

View file

120

arch/arm/mach-mx5/devices.c

View file

5

arch/arm/mach-mx5/devices.h

View file

2

arch/arm/mach-mx5/ehci.c

View file

3

arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c

View file

6

arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c

View file

72

arch/arm/mach-mx5/mm-mx50.c

View file

90

arch/arm/mach-mx5/mm.c

View file

17

arch/arm/mach-mx5/mx51_efika.c

View file

18

arch/arm/mach-mx5/pm-imx5.c

View file

1

arch/arm/mach-mx5/system.c

View file

6

arch/arm/mach-mxs/Makefile

View file

4

arch/arm/mach-mxs/include/mach/gpio.h

View file

2

arch/arm/mach-mxs/include/mach/mxs.h

View file

1

arch/arm/mach-mxs/mach-mx23evk.c

View file

24

arch/arm/mach-mxs/mach-mx28evk.c

View file

1

arch/arm/mach-mxs/mach-stmp378x_devb.c

View file

44

arch/arm/mach-mxs/mm-mx28.c

View file

19

arch/arm/mach-mxs/mm-mx23.c → arch/arm/mach-mxs/mm.c

View file

18

arch/arm/plat-mxc/audmux-v2.c

View file

14

arch/arm/plat-mxc/devices.c

View file

2

arch/arm/plat-mxc/devices/Kconfig

View file

5

arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c

View file

6

arch/arm/plat-mxc/devices/platform-imx-i2c.c

View file

9

arch/arm/plat-mxc/devices/platform-mxc-ehci.c

View file

12

arch/arm/plat-mxc/include/mach/common.h

View file

9

arch/arm/plat-mxc/include/mach/gpio.h

View file

13

arch/arm/plat-mxc/include/mach/hardware.h

View file

22

arch/arm/plat-mxc/include/mach/io.h

View file

2270

arch/arm/plat-mxc/include/mach/iomux-mx51.h

View file

3530

arch/arm/plat-mxc/include/mach/iomux-mx53.h

View file

File diff suppressed because it is too large Load diff

1

arch/arm/plat-mxc/include/mach/iomux-v3.h

View file

183

arch/arm/plat-mxc/include/mach/mx51.h

View file

1

arch/arm/plat-mxc/include/mach/mx53.h

View file

7

arch/arm/plat-mxc/include/mach/mxc.h

View file

35

arch/arm/plat-mxc/include/mach/system.h

View file

3

arch/arm/plat-mxc/system.c

View file

12

drivers/gpio/gpio-mxc.c

View file

2

drivers/gpio/gpio-mxs.c

View file