linux/arch/arm/mach-imx
Linus Torvalds 9cd11c0c47 ARM: soc: multiplatform enablement
This is a pretty significant branch. It's the introduction of the
 first multiplatform support on ARM, and with this (and the later
 branch) merged, it is now possible to build one kernel that contains
 support for highbank, vexpress, mvebu, socfpga, and picoxcell. More
 platforms will be convered over in the next few releases.
 
 Two critical last things had to be done for this to be practical and
 possible:
 * Today each platform has its own include directory under
   mach-<mach>/include/mach/*, and traditionally that is where a lot of
   driver/platform shared definitions have gone, such as platform data
   structures. They now need to move out to a common location instead,
   and this branch moves a large number of those out to
   include/linux/platform_data.
 * Each platform used to list the device trees to compile for its
   boards in mach-<mach>/Makefile.boot.
 
 Both of the above changes will mean that there are some merge
 conflicts to come (and some to resolve here). It's a one-time move and
 once it settles in, we should be good for quite a while. Sorry for the
 overhead.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJQaO7aAAoJEIwa5zzehBx3bUIP/02U8PhkHJJrrowyIsWRBOql
 7LPJ53PRRgrpBdmEGzFD3TO3zaNyrjQRbYgNDvzHMO6NAMNvdRFouuWYjO11/tuB
 i32zssXCC+eUOEgbAo/U/lYq+UOvqw9gv6mU+3+i3OcGEhdKOaoT/DSLPQC4hoDm
 222TeLfFB3HJXu5n720dEQ9V3fO6TS1+bbh8TU3cjHqzceXsOrffZqOA5CQxUcRr
 KWwOjA0nALDwWcqgv45GJNwY3GTyAQ/hPMQavnuWK0voJ+qUYk5HftKocAK7C+py
 0T0OFOAHTwtyhvzJBxLC84M6Ox465BYXyeNjIB+2nG/Um9+mDoP0dnWpGy4c7DMU
 P5hyqbeLGeqjUXQuYtRmgMMc3UeHKoUGAfXW9eMsjLa6/M4NLGv//7E7LbZPpgMZ
 obkjwuesmcaYn/FRyj/yFmC35YlF4oCLziVzEtURZw3eKHHSUlhkTDSMNnkcZ0kZ
 Vv7kFxnD2Y46ixiwSJv30ErQnVkgI3MdqDlDxkE8r5+phYuK4gCrNaJtiwRh/oNw
 cFhpPxKuA0sJ9b6YRTzjC45eT/XZomEEr/uifCFeRNaCquyjYP00Mm8F0flSqwx9
 zi+emzPAwNmk1bvxMUM/idGnaj0V4p+BAYUAvkbSoqU1p1flzyhU88fGTSIyKOt6
 K5TCDS2v5hrVykK9TDwl
 =Tc6y
 -----END PGP SIGNATURE-----

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM soc multiplatform enablement from Olof Johansson:
 "This is a pretty significant branch.  It's the introduction of the
  first multiplatform support on ARM, and with this (and the later
  branch) merged, it is now possible to build one kernel that contains
  support for highbank, vexpress, mvebu, socfpga, and picoxcell.  More
  platforms will be convered over in the next few releases.

  Two critical last things had to be done for this to be practical and
  possible:
   * Today each platform has its own include directory under
     mach-<mach>/include/mach/*, and traditionally that is where a lot
     of driver/platform shared definitions have gone, such as platform
     data structures.  They now need to move out to a common location
     instead, and this branch moves a large number of those out to
     include/linux/platform_data.
   * Each platform used to list the device trees to compile for its
     boards in mach-<mach>/Makefile.boot.

  Both of the above changes will mean that there are some merge
  conflicts to come (and some to resolve here).  It's a one-time move
  and once it settles in, we should be good for quite a while.  Sorry
  for the overhead."

Fix conflicts as per Olof.

* tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)
  ARM: add v7 multi-platform defconfig
  ARM: msm: Move core.h contents into common.h
  ARM: highbank: call highbank_pm_init from .init_machine
  ARM: dtb: move all dtb targets to common Makefile
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: vexpress: convert to multi-platform
  ARM: initial multiplatform support
  ARM: mvebu: move armada-370-xp.h in mach dir
  ARM: vexpress: remove dependency on mach/* headers
  ARM: picoxcell: remove dependency on mach/* headers
  ARM: move all dtb targets out of Makefile.boot
  ARM: picoxcell: move debug macros to include/debug
  ARM: socfpga: move debug macros to include/debug
  ARM: mvebu: move debug macros to include/debug
  ARM: vexpress: move debug macros to include/debug
  ARM: highbank: move debug macros to include/debug
  ARM: move debug macros to common location
  ARM: make mach/gpio.h headers optional
  ...
2012-10-01 19:11:38 -07:00
..
include/mach dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c 2012-03-26 11:31:29 +05:30
clk-busy.c ARM: imx: add common clock support for clk busy 2012-05-02 12:08:26 +02:00
clk-gate2.c ARM i.MX: Add common clock support for 2bit gate 2012-05-02 12:08:13 +02:00
clk-imx1.c ARM i.MX: remove now unnecessary argument from mxc_timer_init 2012-05-16 12:46:09 +02:00
clk-imx6q.c This is the second round of imx-dt patches for 3.7. It's based on 2012-09-20 20:16:27 -07:00
clk-imx21.c ARM i.MX: remove duplicated include from clk-imx21.c 2012-08-28 08:43:32 +02:00
clk-imx25.c ARM i.MX25: Make timer irq work again 2012-09-18 16:46:50 +02:00
clk-imx27.c i.MX27: Fix emma-prp and csi clocks. 2012-08-07 09:14:30 +02:00
clk-imx31.c ARM: clk-imx31: Fix the keypad clock name 2012-08-03 16:28:47 +02:00
clk-imx35.c Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-09-21 23:00:41 -07:00
clk-imx51-imx53.c ARM: soc: soc-specific updates 2012-10-01 18:24:44 -07:00
clk-pfd.c ARM: imx: add common clock support for pfd 2012-05-02 12:08:20 +02:00
clk-pllv1.c ARM: i.MX remove last leftovers from legacy clock support 2012-09-12 11:46:51 +02:00
clk-pllv2.c ARM i.MX pllv2: make round_rate accurate 2012-06-04 15:23:47 +02:00
clk-pllv3.c ARM: imx: add common clock support for pllv3 2012-05-02 12:08:06 +02:00
clk.c ARM: i.MX remove last leftovers from legacy clock support 2012-09-12 11:46:51 +02:00
clk.h ARM: i.MX remove last leftovers from legacy clock support 2012-09-12 11:46:51 +02:00
cpu_op-mx51.c bug.h: add include of it to various implicit C users 2012-02-29 17:15:08 -05:00
cpu_op-mx51.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
cpu-imx5.c ARM: imx: use machine specific hook for late init 2012-05-08 20:36:16 +08:00
cpu-imx25.c
cpu-imx27.c
cpu-imx31.c
cpu-imx35.c
crm-regs-imx5.h ARM i.MX53: Fix PLL4 base address 2012-06-04 15:23:57 +02:00
crmregs-imx3.h ARM i.MX3: Make ccm base address a variable 2012-04-25 17:03:45 +02:00
devices-imx1.h
devices-imx21.h ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
devices-imx25.h ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
devices-imx27.h ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
devices-imx31.h arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
devices-imx35.h arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
devices-imx50.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
devices-imx51.h ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
ehci-imx5.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
ehci-imx25.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
ehci-imx27.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
ehci-imx31.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
ehci-imx35.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
eukrea_mbimx27-baseboard.c ARM: imx: eliminate macro IRQ_GPIOx() 2012-07-01 21:57:16 +08:00
eukrea_mbimxsd25-baseboard.c ARM: imx: eukrea_mbimxsd25: use IMX_GPIO_NR 2012-05-08 17:31:25 +02:00
eukrea_mbimxsd35-baseboard.c dma: ipu: remove the use of ipu_platform_data 2012-07-01 21:57:43 +08:00
eukrea_mbimxsd51-baseboard.c ARM: imx: eukrea_mbimxsd rename to eukrea_mbimxsd51 2012-05-08 17:31:25 +02:00
gpc.c
headsmp.S ARM: imx: build i.MX6 functions only when needed 2012-08-23 17:26:53 +02:00
hotplug.c ARM: SoC: convert imx6q to SMP operations 2012-09-14 11:15:00 +02:00
imx27-dt.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
imx31-dt.c ARM i.MX31: Add devicetree support 2012-07-10 19:23:03 +02:00
imx51-dt.c ARM: imx51: decouple device tree boot from board files 2012-09-11 16:26:59 +08:00
iomux-imx31.c
Kconfig ARM: soc: board specific updates 2012-10-01 18:48:30 -07:00
lluart.c ARM: imx6: Add UART2 for low-level debug 2012-05-11 15:17:57 +08:00
mach-apf9328.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mach-armadillo5x0.c ARM: imx: armadillo5x0: Fix illegal register access 2012-09-18 16:46:24 +02:00
mach-bug.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-cpuimx27.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-cpuimx35.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-cpuimx51sd.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-eukrea_cpuimx25.c ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
mach-imx6q.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
mach-imx27_visstrim_m10.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-imx27ipcam.c ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
mach-imx27lite.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-imx53.c ARM: imx53: support device tree boot only 2012-09-11 16:26:55 +08:00
mach-kzm_arm11_01.c Merge branch 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
mach-mx1ads.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mach-mx21ads.c Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq 2012-07-02 23:18:19 +02:00
mach-mx25_3ds.c ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
mach-mx27_3ds.c ARM: mx27pdk: Add audio support 2012-08-03 15:59:29 +02:00
mach-mx27ads.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-mx31_3ds.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-mx31ads.c ARM: imx: use __iomem pointers for MMIO 2012-09-19 15:11:53 +02:00
mach-mx31lilly.c ARM: imx: eliminate macro IOMUX_TO_IRQ() 2012-07-01 21:57:06 +08:00
mach-mx31lite.c ARM: imx: use __iomem pointers for MMIO 2012-09-19 15:11:53 +02:00
mach-mx31moboard.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
mach-mx35_3ds.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-mx50_rdp.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mach-mx51_3ds.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-mx51_babbage.c ARM: imx: remove unused pdata from device macros 2012-07-06 08:25:20 +02:00
mach-mxt_td60.c ARM: imx: eliminate macro IRQ_GPIOx() 2012-07-01 21:57:16 +08:00
mach-pca100.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-pcm037_eet.c ARM: imx: use machine specific hook for late init 2012-05-08 20:36:16 +08:00
mach-pcm037.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-pcm038.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-pcm043.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-qong.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mach-scb9328.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mach-vpr200.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
Makefile ARM: soc: device tree updates 2012-10-01 18:28:06 -07:00
Makefile.boot ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
mm-imx1.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mm-imx3.c GPIO changes for v3.6: 2012-07-26 13:56:38 -07:00
mm-imx5.c ARM: imx53: remove unneeded files and functions 2012-09-11 16:26:57 +08:00
mm-imx21.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mm-imx25.c GPIO changes for v3.6: 2012-07-26 13:56:38 -07:00
mm-imx27.c ARM: imx: remove unneeded mach/irq.h inclusion 2012-07-01 21:58:41 +08:00
mmdc.c
mx1-camera-fiq-ksym.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
mx1-camera-fiq.S
mx31lilly-db.c dma: ipu: remove the use of ipu_platform_data 2012-07-01 21:57:43 +08:00
mx31lite-db.c arm-soc: sparse IRQ conversion 2012-07-23 17:36:02 -07:00
mx31moboard-devboard.c arm: imx: Start using struct usb_otg 2012-02-13 13:36:03 +02:00
mx31moboard-marxbot.c arm: imx: Start using struct usb_otg 2012-02-13 13:36:03 +02:00
mx31moboard-smartbot.c
pcm037.h ARM: imx: use machine specific hook for late init 2012-05-08 20:36:16 +08:00
pcm970-baseboard.c ARM: imx: eliminate macro IRQ_GPIOx() 2012-07-01 21:57:16 +08:00
platsmp.c ARM: SoC: convert imx6q to SMP operations 2012-09-14 11:15:00 +02:00
pm-imx3.c ARM i.MX3: Make ccm base address a variable 2012-04-25 17:03:45 +02:00
pm-imx5.c ARM: imx: Add imx5 cpuidle 2012-06-05 08:51:47 +02:00
pm-imx6q.c ARM: imx6q: resume PL310 only when CACHE_L2X0 defined 2011-12-26 10:18:59 +08:00
pm-imx27.c ARM: plat-mxc: hook special idle handlers to arm_pm_idle 2012-01-20 18:55:14 -05:00
src.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00