Merge branch 'imx/devel' into next/dt

Browse source

The board changes in the imx/devel branch conflict with other changes in
the device imx/dt branch.

Conflicts:
	arch/arm/mach-mx5/board-mx53_loco.c
	arch/arm/mach-mx5/board-mx53_smd.c
	arch/arm/plat-mxc/include/mach/common.h
	arch/arm/plat-mxc/include/mach/memory.h

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

...

This commit is contained in:

Arnd Bergmann 2011-11-01 17:12:22 +01:00

parent 7e1efcf5d2 b4cbb8a4e6

commit c72dbae971

140 changed files with 4314 additions and 5563 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

1

arch/arm/Kconfig

View file

4

arch/arm/Makefile

View file

68

arch/arm/configs/mx27_defconfig → arch/arm/configs/imx_v4_v5_defconfig

View file

91

arch/arm/configs/mx1_defconfig

View file

97

arch/arm/configs/mx21_defconfig

View file

60

arch/arm/configs/mx51_defconfig → arch/arm/configs/mx5_defconfig

View file

1

arch/arm/configs/mxs_defconfig

View file

52

arch/arm/mach-imx/Kconfig

View file

15

arch/arm/mach-imx/Makefile

View file

56

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

View file

6

arch/arm/mach-imx/clock-imx25.c

View file

6

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

View file

8

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

View file

7

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

View file

41

arch/arm/mach-imx/cpu-imx25.c

View file

28

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

View file

51

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

View file

32

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

View file

4

arch/arm/mach-imx/devices-imx27.h

View file

4

arch/arm/mach-imx/devices-imx31.h

View file

4

arch/arm/mach-imx/devices-imx35.h

View file

1

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

View file

19

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

View file

1

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

View file

1

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

View file

3

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

View file

1

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

View file

1

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

View file

1

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

View file

1

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

View file

1

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

View file

17

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

View file

1

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

View file

11

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

View file

3

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

View file

1

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

View file

1

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

View file

1

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

View file

1

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

View file

1

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

View file

18

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

View file

1

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

View file

1

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

View file

1

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

View file

1

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

View file

1

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

View file

1

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

View file

2

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

View file

1

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

View file

3

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

29

arch/arm/mach-mx5/Kconfig

View file

3

arch/arm/mach-mx5/Makefile

View file

28

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

View file

26

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

View file

1

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

View file

2

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

View file

27

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

View file

14

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

View file

25

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

View file

6

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

View file

1

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

View file

22

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

View file

17

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

View file

33

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

View file

74

arch/arm/mach-mx5/cpu.c

View file

17

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

View file

6

arch/arm/mach-mx5/devices-imx53.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

20

arch/arm/mach-mx5/mx51_efika.c

View file

3

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

View file

1

arch/arm/mach-mx5/system.c

View file

23

arch/arm/mach-mxs/Kconfig

View file

7

arch/arm/mach-mxs/Makefile

View file

24

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

View file

2

arch/arm/mach-mxs/devices-mx23.h

View file

5

arch/arm/mach-mxs/devices-mx28.h

View file

6

arch/arm/mach-mxs/devices/Kconfig

View file

2

arch/arm/mach-mxs/devices/Makefile

View file

60

arch/arm/mach-mxs/devices/platform-mxs-saif.c

View file

51

arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c

View file

12

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

View file

4

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

View file

3

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

View file

1

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

View file

366

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

View file

2

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

View file

98

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

View file

2

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

View file

1

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

View file

44

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

View file

Some files were not shown because too many files have changed in this diff Show more