linux/drivers/pcmcia
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
..
at91_cf.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia 2012-03-29 16:00:48 -07:00
bcm63xx_pcmcia.c pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE 2012-03-03 14:43:37 +01:00
bcm63xx_pcmcia.h
bfin_cf_pcmcia.c pcmcia: convert drivers/pcmcia/* to use module_platform_driver() 2012-03-03 14:43:37 +01:00
cardbus.c pcmcia: Use common pci_stop_and_remove_bus_device() 2012-08-22 11:31:20 -06:00
cirrus.h
cistpl.c
cs_internal.h
cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
db1xxx_ss.c pcmcia: convert drivers/pcmcia/* to use module_platform_driver() 2012-03-03 14:43:37 +01:00
ds.c Merge 3.3-rc6 into driver-core-next 2012-03-09 12:35:53 -08:00
electra_cf.c pcmcia: convert drivers/pcmcia/* to use module_platform_driver() 2012-03-03 14:43:37 +01:00
i82092.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia 2012-03-29 16:00:48 -07:00
i82092aa.h
i82365.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
i82365.h
Kconfig pcmcia: add driver for hx4700 2012-05-07 09:56:39 +08:00
m8xx_pcmcia.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia 2012-03-29 16:00:48 -07:00
m32r_cfc.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
m32r_cfc.h
m32r_pcc.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
m32r_pcc.h
Makefile pcmcia: add driver for hx4700 2012-05-07 09:56:39 +08:00
o2micro.h
omap_cf.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
pcmcia_cis.c
pcmcia_resource.c
pd6729.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia 2012-03-29 16:00:48 -07:00
pd6729.h
pxa2xx_balloon3.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_base.c ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe() 2012-09-21 15:33:58 +08:00
pxa2xx_base.h
pxa2xx_cm_x2xx.c
pxa2xx_cm_x255.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_cm_x270.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_colibri.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_e740.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_hx4700.c pcmcia: add driver for hx4700 2012-05-07 09:56:39 +08:00
pxa2xx_mainstone.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_palmld.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_palmtc.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_palmtx.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_sharpsl.c
pxa2xx_stargate2.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_trizeps4.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
pxa2xx_viper.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pxa2xx_vpac270.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
ricoh.h
rsrc_iodyn.c
rsrc_mgr.c
rsrc_nonstatic.c
sa11xx_base.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
sa11xx_base.h
sa1100_assabet.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
sa1100_cerf.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
sa1100_generic.c
sa1100_generic.h
sa1100_h3600.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
sa1100_nanoengine.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
sa1100_shannon.c ARM: sa11x0/pxa: convert OS timer registers to IOMEM 2012-07-09 17:37:35 +01:00
sa1100_simpad.c PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers 2012-02-21 14:27:04 +00:00
sa1111_badge4.c PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix. 2012-02-21 14:27:18 +00:00
sa1111_generic.c Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm 2012-03-27 18:17:02 -07:00
sa1111_generic.h
sa1111_jornada720.c PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix. 2012-02-21 14:27:18 +00:00
sa1111_lubbock.c PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix. 2012-02-21 14:27:18 +00:00
sa1111_neponset.c Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm 2012-03-27 18:17:02 -07:00
soc_common.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
soc_common.h PCMCIA: soc_common: remove soc_pcmcia_*_irqs functions 2012-02-21 14:27:03 +00:00
socket_sysfs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
tcic.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
tcic.h
ti113x.h
topic.h
vg468.h
vrc4171_card.c
vrc4173_cardu.c pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE 2012-03-03 14:43:37 +01:00
vrc4173_cardu.h
xxs1500_ss.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia 2012-03-29 16:00:48 -07:00
yenta_socket.c PCI: replace struct pci_bus secondary/subordinate with busn_res 2012-06-13 15:42:22 -06:00
yenta_socket.h