Merge branch 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

Browse source

From Shawn Guo:
"Here is the imx multi-platform support [1] that missed 3.7 merge window.
 Please pull it for 3.8 and exposing on linux-next.  As it touches a lot
 of files, I send it early, so that people can base their works off it
 to avoid conflicts."

* 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6: (31 commits)
  ARM: imx: enable multi-platform build
  ARM: imx: call mxc_device_init() in soc specific function
  ARM: imx: remove header file mach/irqs.h
  ARM: imx: include hardware.h rather than mach/hardware.h
  ARM: imx: move debug macros to include/debug
  video: imxfb: remove cpu_is_xxx by using platform_device_id
  mmc: mxcmmc: remove cpu_is_xxx by using platform_device_id
  media: mx2_camera: remove cpu_is_xxx by using platform_device_id
  dma: imx-dma: remove cpu_is_xxx by using platform_device_id
  dma: imx-dma: retrieve MEM and IRQ from resources
  dma: imx-dma: use devm_kzalloc and devm_request_irq
  rtc: mxc_rtc: remove cpu_is_xxx by using platform_device_id
  mtd: mxc_nand: remove cpu_is_xxx by using platform_device_id
  i2c: imx: remove cpu_is_xxx by using platform_device_id
  watchdog: imx2_wdt: remove unneeded mach/hardware.h inclusion
  video: mx3fb: remove unneeded mach/hardware.h inclusion
  usb: ehci-mxc: remove unneeded mach/hardware.h inclusion
  ASoC: imx-ssi: remove unneeded mach/hardware.h inclusion
  dma: imx-sdma: remove unneeded mach/hardware.h inclusion
  dma: ipu: rename mach/ipu.h to include/linux/dma/ipu-dma.h
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

...

This commit is contained in:

Olof Johansson 2012-10-16 11:03:40 -07:00

parent ddffeb8c4d c5a0d4977f

commit 4afe30dfc6

306 changed files with 14855 additions and 14784 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

4

Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt

View file

1

MAINTAINERS

View file

15

arch/arm/Kconfig

View file

8

arch/arm/Kconfig.debug

View file

1

arch/arm/Makefile

View file

4

arch/arm/boot/dts/imx27.dtsi

View file

4

arch/arm/boot/dts/imx51.dtsi

View file

6

arch/arm/boot/dts/imx53.dtsi

View file

6

arch/arm/boot/dts/imx6q.dtsi

View file

5

arch/arm/configs/imx_v4_v5_defconfig

View file

3

arch/arm/configs/imx_v6_v7_defconfig

View file

33

arch/arm/plat-mxc/include/mach/debug-macro.S → arch/arm/include/debug/imx.S

View file

2

arch/arm/plat-mxc/3ds_debugboard.c → arch/arm/mach-imx/3ds_debugboard.c

View file

0

arch/arm/plat-mxc/include/mach/3ds_debugboard.h → arch/arm/mach-imx/3ds_debugboard.h

View file

89

arch/arm/mach-imx/Kconfig

View file

22

arch/arm/mach-imx/Makefile

View file

5

arch/arm/plat-mxc/avic.c → arch/arm/mach-imx/avic.c

View file

0

arch/arm/plat-mxc/include/mach/board-mx31lilly.h → arch/arm/mach-imx/board-mx31lilly.h

View file

0

arch/arm/plat-mxc/include/mach/board-mx31lite.h → arch/arm/mach-imx/board-mx31lite.h

View file

0

arch/arm/plat-mxc/include/mach/board-mx31moboard.h → arch/arm/mach-imx/board-mx31moboard.h

View file

0

arch/arm/plat-mxc/include/mach/board-pcm038.h → arch/arm/mach-imx/board-pcm038.h

View file

17

arch/arm/mach-imx/clk-imx1.c

View file

18

arch/arm/mach-imx/clk-imx21.c

View file

26

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

View file

40

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

View file

21

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

View file

13

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

View file

15

arch/arm/mach-imx/clk-imx51-imx53.c

View file

3

arch/arm/mach-imx/clk-imx6q.c

View file

4

arch/arm/mach-imx/clk-pllv1.c

View file

1

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

View file

5

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

View file

2

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

View file

7

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

View file

5

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

View file

3

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

View file

3

arch/arm/plat-mxc/cpu.c → arch/arm/mach-imx/cpu.c

View file

3

arch/arm/mach-imx/cpu_op-mx51.c

View file

3

arch/arm/plat-mxc/cpufreq.c → arch/arm/mach-imx/cpufreq.c

View file

0

arch/arm/plat-mxc/cpuidle.c → arch/arm/mach-imx/cpuidle.c

View file

0

arch/arm/plat-mxc/include/mach/cpuidle.h → arch/arm/mach-imx/cpuidle.h

View file

3

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

View file

3

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

View file

3

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

View file

3

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

View file

3

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

View file

3

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

View file

3

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

View file

3

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

View file

0

arch/arm/plat-mxc/devices/Kconfig → arch/arm/mach-imx/devices/Kconfig

View file

2

arch/arm/plat-mxc/devices/Makefile → arch/arm/mach-imx/devices/Makefile

View file

9

arch/arm/plat-mxc/include/mach/devices-common.h → arch/arm/mach-imx/devices/devices-common.h

View file

4

arch/arm/plat-mxc/devices.c → arch/arm/mach-imx/devices/devices.c

View file

5

arch/arm/plat-mxc/devices/platform-ahci-imx.c → arch/arm/mach-imx/devices/platform-ahci-imx.c

View file

5

arch/arm/plat-mxc/devices/platform-fec.c → arch/arm/mach-imx/devices/platform-fec.c

View file

4

arch/arm/plat-mxc/devices/platform-flexcan.c → arch/arm/mach-imx/devices/platform-flexcan.c

View file

5

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

View file

2

arch/arm/plat-mxc/devices/platform-gpio-mxc.c → arch/arm/mach-imx/devices/platform-gpio-mxc.c

View file

5

arch/arm/plat-mxc/devices/platform-gpio_keys.c → arch/arm/mach-imx/devices/platform-gpio_keys.c

View file

23

arch/arm/plat-mxc/devices/platform-imx-dma.c → arch/arm/mach-imx/devices/platform-imx-dma.c

View file

16

arch/arm/plat-mxc/devices/platform-imx-fb.c → arch/arm/mach-imx/devices/platform-imx-fb.c

View file

32

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

View file

4

arch/arm/plat-mxc/devices/platform-imx-keypad.c → arch/arm/mach-imx/devices/platform-imx-keypad.c

View file

4

arch/arm/plat-mxc/devices/platform-imx-ssi.c → arch/arm/mach-imx/devices/platform-imx-ssi.c

View file

4

arch/arm/plat-mxc/devices/platform-imx-uart.c → arch/arm/mach-imx/devices/platform-imx-uart.c

View file

5

arch/arm/plat-mxc/devices/platform-imx2-wdt.c → arch/arm/mach-imx/devices/platform-imx2-wdt.c

View file

4

arch/arm/plat-mxc/devices/platform-imx21-hcd.c → arch/arm/mach-imx/devices/platform-imx21-hcd.c

View file

4

arch/arm/plat-mxc/devices/platform-imx27-coda.c → arch/arm/mach-imx/devices/platform-imx27-coda.c

View file

4

arch/arm/plat-mxc/devices/platform-imx_udc.c → arch/arm/mach-imx/devices/platform-imx_udc.c

View file

5

arch/arm/plat-mxc/devices/platform-imxdi_rtc.c → arch/arm/mach-imx/devices/platform-imxdi_rtc.c

View file

5

arch/arm/plat-mxc/devices/platform-ipu-core.c → arch/arm/mach-imx/devices/platform-ipu-core.c

View file

4

arch/arm/plat-mxc/devices/platform-mx1-camera.c → arch/arm/mach-imx/devices/platform-mx1-camera.c

View file

16

arch/arm/plat-mxc/devices/platform-mx2-camera.c → arch/arm/mach-imx/devices/platform-mx2-camera.c

View file

5

arch/arm/plat-mxc/devices/platform-mxc-ehci.c → arch/arm/mach-imx/devices/platform-mxc-ehci.c

View file

20

arch/arm/plat-mxc/devices/platform-mxc-mmc.c → arch/arm/mach-imx/devices/platform-mxc-mmc.c

View file

25

arch/arm/plat-mxc/devices/platform-mxc_nand.c → arch/arm/mach-imx/devices/platform-mxc_nand.c

View file

4

arch/arm/plat-mxc/devices/platform-mxc_pwm.c → arch/arm/mach-imx/devices/platform-mxc_pwm.c

View file

4

arch/arm/plat-mxc/devices/platform-mxc_rnga.c → arch/arm/mach-imx/devices/platform-mxc_rnga.c

View file

13

arch/arm/plat-mxc/devices/platform-mxc_rtc.c → arch/arm/mach-imx/devices/platform-mxc_rtc.c

View file

4

arch/arm/plat-mxc/devices/platform-mxc_w1.c → arch/arm/mach-imx/devices/platform-mxc_w1.c

View file

4

arch/arm/plat-mxc/devices/platform-pata_imx.c → arch/arm/mach-imx/devices/platform-pata_imx.c

View file

5

arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c → arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c

View file

4

arch/arm/plat-mxc/devices/platform-spi_imx.c → arch/arm/mach-imx/devices/platform-spi_imx.c

View file

4

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

View file

4

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

View file

4

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

View file

4

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

View file

4

arch/arm/mach-imx/ehci-imx5.c

View file

6

arch/arm/plat-mxc/epit.c → arch/arm/mach-imx/epit.c

View file

0

arch/arm/plat-mxc/include/mach/eukrea-baseboards.h → arch/arm/mach-imx/eukrea-baseboards.h

View file

7

arch/arm/mach-imx/eukrea_mbimx27-baseboard.c

View file

8

arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c

View file

7

arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c

View file

7

arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c

View file

26

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

View file

3

arch/arm/mach-imx/hotplug.c

View file

0

arch/arm/plat-mxc/include/mach/iim.h → arch/arm/mach-imx/iim.h

View file

11

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

View file

5

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

View file

9

arch/arm/mach-imx/imx51-dt.c

View file

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