1
linux/arch/arm/configs
Linus Torvalds 1a32c58bb9 arm-soc: mvebu platform changes
This series contains changes for the Marvell EBU platforms (mvebu,
 orion, kirkwood, dove) that were not part of the first set of pull
 requests because of dependencies on the MMC tree, and being submitted
 a little late.
 
 Notable changes are:
 
 * More devices get moved out of board files into device tree
   descriptions. The remaining devices listed in there have patches
   that will get sent for 3.10, after which we can remove a lot of the
   board files entirely. We are doing the pinctrl and mmc drivers here,
   ethernet and PCI still remain.
 
 * SMP support for mvebu is improved with support for the
   local interrupt controller.
 
 * The Guruplug board file gets replaced with a DT description.
 
 Unfortunately, the dependency on the MMC tree turned out to be a much
 larger problem than expected, when the MMC maintainer rebased the patches
 in his tree that all of the patches in this branch are based on, which
 caused merge conflicts between the new and old versions of those patches.
 
 To work around the merge conflicts, this branch rebases all patches
 on top of the respective MMC patches that did get merged into 3.9.
 The patches are all identical to the versions that were part of
 linux-next, but have a new commit date.
 
 Merge conflicts:
 
 * in board-nsa310.c, the gpio.h inclusion was removed prematurely and
   put back as a bug fix earlier. With this series it is really not needed
   any more.
 
 * The patch to add rtc support was already applied by Andrew Morton,
   and conflicts with a second copy that was in this series, which adds
   a lot of other devices to arch/arm/boot/dts/armada-370-xp.dtsi.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAUS+/hWCrR//JCVInAQK/eBAA0RskNuX3dL4Tn0FUBQfA11hMXyNLSLdY
 mwNE91jJO0Q6NIjSlZCMV0pqEhoVlWlKnHcD76ID68qxNHiU4XMyxT/NkwTQAdOC
 lKry+X8B5yt4kYiQp5adpME0rTHqtCQ9pNswU7j40ENNiOfwNk34O+PfNvh+FDkn
 s2mmLjyAbJgO1n5SGVETaVCGAW1/1dcCSxOV2BqUzn2AecTHmZb1lS8W+y761+Yi
 1V+Y3Xp4EJngN/OGtCNNfJ3H627MERfUF80xeijE2elhrdmynkBN1oOb4H+1AX6w
 Tsi4BUYd5BkeETgsskOeZevkbRq4LZGHueaofh9i11enjgVE09Z/P3eL2K6/UbBA
 mVA7+i1UujTcrEOUNO+EJ/AKvz7BU9trI4gR/RDHEkg2vzIHtsqMnDf44cQESxTn
 7AgLo+G5nG10hucgcTNse3Ev2k4wQpdev5QX3uGKVNW7PPoxY/abSYKtWek6TjGd
 nMGMI0+Re17Ej83SCXEJOvHmaA5IQDJJQOVLz/IxNuHE8HjEwJmguQy/YFzyZ0dQ
 Rha3iaLXrWBLt5jIYOIdI0K6S4KUp5mZCax2MK/c6D18Tiuk4iIA9yD1doL4a3g8
 AWoRL23ajabVa+Pg+EHqOsSUCfNI4+teMuio8vsJifudxZ6R8vYgJqdzIklwCkl3
 0l2Xvnf55Ks=
 =7l0+
 -----END PGP SIGNATURE-----

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

Pull ARM SoC mvebu platform changes from Olof Johansson:
 "This series contains changes for the Marvell EBU platforms (mvebu,
  orion, kirkwood, dove) that were not part of the first set of pull
  requests because of dependencies on the MMC tree, and being submitted
  a little late.

  Notable changes are:

   - More devices get moved out of board files into device tree
     descriptions.  The remaining devices listed in there have patches
     that will get sent for 3.10, after which we can remove a lot of the
     board files entirely.  We are doing the pinctrl and mmc drivers
     here, ethernet and PCI still remain.

   - SMP support for mvebu is improved with support for the local
     interrupt controller.

   - The Guruplug board file gets replaced with a DT description.

  Unfortunately, the dependency on the MMC tree turned out to be a much
  larger problem than expected, when the MMC maintainer rebased the
  patches in his tree that all of the patches in this branch are based
  on, which caused merge conflicts between the new and old versions of
  those patches.

  To work around the merge conflicts, this branch rebases all patches on
  top of the respective MMC patches that did get merged into 3.9.  The
  patches are all identical to the versions that were part of
  linux-next, but have a new commit date."

* tag 'late-mvebu-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (90 commits)
  arm: mvebu: enable the SD card slot on Armada 370 Reference Design board
  ARM: kirkwood: topkick: init mvsdio via DT
  ARM: kirkwood: nsa310: convert to pinctrl
  ARM: Kirkwood: topkick: Enable i2c bus.
  ARM: kirkwood: topkick: convert to pinctrl
  ARM: dove: convert serial DT nodes to clocks property
  arm: mvebu: Add SPI flash on Armada 370 DB board
  arm: mvebu: Add SPI flash on Armada XP-DB board
  arm: mvebu: Add SPI flash on Armada XP-GP board
  arm: mvebu: Add support for SPI controller in Armada 370/XP
  clocksource: update and move armada-370-xp-timer documentation to timer directory
  arm: mvebu: update DT to support local timers
  ARM: Dove: convert usb host controller to DT
  arm: mvebu: Enable USB controllers on Armada 370/XP boards
  arm: mvebu: Add support for USB host controllers in Armada 370/XP
  arm: mvebu: add button for OpenBlocks AX3-4
  ARM: Kirkwood: Convert NS2 to gpio-poweroff.
  ARM: Kirkwood: Convert NSA310 I2C to device tree
  ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driver
  ARM: Kirkwood: Convert NSA310 to DT based regulators.
  ...
2013-02-28 20:09:24 -08:00
..
acs5k_defconfig
acs5k_tiny_defconfig
ag5evm_defconfig
am200epdkit_defconfig
ap4evb_defconfig ARM: shmobile: leave CONFIG_INOTIFY_USER enabled by default 2012-11-01 08:51:34 +08:00
armadillo800eva_defconfig ARM: mach-shmobile: armadillo: defconfig: Enable CEU 2013-01-23 14:49:15 +09:00
assabet_defconfig
at91_dt_defconfig ARM: at91/at91_dt_defconfig: add at91sam9n12 SoC to DT defconfig 2013-01-23 10:39:58 +01:00
at91rm9200_defconfig ARM: at91/defconfig: change the MCI driver to use in defconfigs 2012-07-02 17:37:41 +02:00
at91sam9g20_defconfig arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00
at91sam9g45_defconfig
at91sam9rl_defconfig ARM: at91/defconfig: change the MCI driver to use in defconfigs 2012-07-02 17:37:41 +02:00
at91sam9260_defconfig arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00
at91sam9261_defconfig arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00
at91sam9263_defconfig ARM: at91: remove NEOCORE 926 board 2013-02-08 16:25:20 +01:00
at91x40_defconfig
badge4_defconfig
bcm2835_defconfig ARM: bcm2835: defconfig updates 2013-01-14 21:47:17 -07:00
bcm_defconfig Add support for generic BCM SoC chipsets 2012-11-19 22:39:07 -08:00
bonito_defconfig
cerfcube_defconfig
clps711x_defconfig ARM: clps711x: Update defconfig due latest changes and new kernel symbols 2012-11-21 09:57:46 -08:00
cm_x2xx_defconfig
cm_x300_defconfig
cns3420vb_defconfig
colibri_pxa270_defconfig
colibri_pxa300_defconfig
collie_defconfig
corgi_defconfig arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00
da8xx_omapl_defconfig arm-soc: device tree conversions 2013-02-21 15:38:49 -08:00
davinci_all_defconfig ARM: davinci: defconfig: enable pm_runtime 2013-01-04 12:21:25 +05:30
dove_defconfig ARM: dove: update dove_defconfig with a few useful options 2013-02-28 18:57:06 +01:00
ebsa110_defconfig
em_x270_defconfig
ep93xx_defconfig defconfigs: remove CONFIG_MTD_NAND_VERIFY_WRITE 2012-09-29 15:00:49 +01:00
eseries_pxa_defconfig
exynos4_defconfig
exynos_defconfig ARM: exynos_defconfig: enable more platforms in defconfig 2012-07-21 23:21:51 +02:00
ezx_defconfig
footbridge_defconfig
h3600_defconfig
h5000_defconfig
h7201_defconfig
h7202_defconfig arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00
hackkit_defconfig
imote2_defconfig
imx_v4_v5_defconfig ARM: imx_v4_v5_defconfig: Add VPU support 2013-02-12 09:08:56 +01:00
imx_v6_v7_defconfig arm-soc: board specific changes 2013-02-21 15:33:45 -08:00
integrator_defconfig
iop13xx_defconfig
iop32x_defconfig
iop33x_defconfig
ixp4xx_defconfig
jornada720_defconfig
kirkwood_defconfig cpuidle: kirkwood: Move out of mach directory 2013-01-31 17:01:37 +00:00
kota2_defconfig ARM: mach-shmobile: fix memory size for kota2_defconfig 2013-01-15 08:56:59 +09:00
ks8695_defconfig
kzm9d_defconfig ARM: mach-shmobile: kzm9d: update defconfig 2013-01-15 08:57:09 +09:00
kzm9g_defconfig ARM: mach-shmobile: kzm9g: defconfig update 2013-01-15 08:57:08 +09:00
lart_defconfig
lpc32xx_defconfig ARM: LPC32xx: Defconfig update 2012-09-06 11:38:15 +02:00
lpd270_defconfig
lubbock_defconfig
mackerel_defconfig ARM: mach-shmobile: mackerel: enable VFP in defconfig 2013-01-23 14:59:37 +09:00
magician_defconfig arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00
mainstone_defconfig
marzen_defconfig ARM: shmobile: fix defconfig warning on CONFIG_USB 2013-02-14 15:04:35 +01:00
mini2440_defconfig arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00
mmp2_defconfig ARM: mmp: enable debug uart port in defconfig 2012-08-16 17:49:08 +08:00
msm_defconfig
multi_v7_defconfig ARM: multi_v7_defconfig: add ARCH_ZYNQ 2013-01-28 14:02:19 -08:00
mv78xx0_defconfig defconfigs: remove CONFIG_MTD_NAND_VERIFY_WRITE 2012-09-29 15:00:49 +01:00
mvebu_defconfig arm: mvebu: update defconfig with ATAG support when using DT 2013-02-28 18:57:09 +01:00
mxs_defconfig ARM: mxs_defconfig: Select CONFIG_DEVTMPFS_MOUNT 2013-02-05 11:28:28 +08:00
neponset_defconfig
netwinder_defconfig
netx_defconfig
nhk8815_defconfig ARM: nomadik: switch over to using the FSMC driver 2012-11-15 15:37:47 +02:00
nuc910_defconfig
nuc950_defconfig
nuc960_defconfig
omap1_defconfig arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00
omap2plus_defconfig arm-soc: board specific changes 2013-02-21 15:33:45 -08:00
orion5x_defconfig arm: orion5x: add DT related options in defconfig 2012-11-21 21:00:58 +00:00
palmz72_defconfig
pcm027_defconfig
pleb_defconfig
prima2_defconfig ARM: PRIMA2: add new SiRFmarco SMP SoC infrastructures 2013-01-22 19:53:27 +08:00
pxa3xx_defconfig defconfigs: remove CONFIG_MTD_NAND_VERIFY_WRITE 2012-09-29 15:00:49 +01:00
pxa168_defconfig
pxa255-idp_defconfig
pxa910_defconfig ARM: mmp: add display and fb support in pxa910 defconfig 2013-02-21 17:22:17 -08:00
raumfeld_defconfig
realview_defconfig
realview-smp_defconfig
rpc_defconfig
s3c2410_defconfig
s3c6400_defconfig ARM: s3c6400_defconfig: enable more boards in defconfig 2012-08-11 13:31:49 +09:00
s5p64x0_defconfig
s5pc100_defconfig
s5pv210_defconfig
shannon_defconfig
shark_defconfig ARM: disable virt_to_bus/virt_to_bus almost everywhere 2013-02-14 15:04:33 +01:00
simpad_defconfig
socfpga_defconfig ARM: socfpga: Enable SMP for socfpga 2012-10-26 14:59:39 +02:00
spear3xx_defconfig SPEAr: Update defconfigs 2012-05-12 21:55:43 +02:00
spear6xx_defconfig SPEAr: Update defconfigs 2012-05-12 21:55:43 +02:00
spear13xx_defconfig SPEAr13xx: Add defconfig 2012-05-14 17:34:10 +02:00
spitz_defconfig arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00
tct_hammer_defconfig ARM: s3c24xx: enable CONFIG_BUG for tct_hammer 2012-08-10 13:02:06 +02:00
tegra_defconfig ARM: tegra: defconfig updates 2013-01-28 10:51:07 -07:00
trizeps4_defconfig
u300_defconfig
u8500_defconfig ARM: ux500: Disable Power Supply and Battery Management by default 2013-01-23 10:43:36 +01:00
versatile_defconfig ARM: versatile: fix versatile_defconfig 2012-10-27 17:46:56 +02:00
vexpress_defconfig
viper_defconfig arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00
xcep_defconfig
zeus_defconfig arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00