kernel-fxtec-pro1x/arch/arm
Linus Torvalds f6a26ae769 arm-soc: board specific changes
While we generally attempt to get rid of board specific files and replace
 them with device tree based descriptions, a lot of platforms have not
 come that far:
 
 In shmobile, we add two new board files because their recently started
 effort to add DT support has not proceeded enough to use it for all of
 the important hardware.
 
 In Kirkwood, we are adding support for new boards with a combination of
 DT and board file contents in multiple cases.
 
 pxa/mmp and imx are extending support for existing board files but not
 adding new ones.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPueuIAAoJEIwa5zzehBx3VvAP/32RkCrrLCQoibsczjwDPQir
 ryyT/lom005tlkXFOz9SFirlyNAn0kpDuj0xZ/HL2KgZ0FPlG0OUSRBJJvLZF2vT
 qlhf3PqnM1d2Ui6+/QdU/EJyzNkMAtajgTSvp4zDZayoNomO/VTZhW0feRYChUIl
 bJx7hnFA9VXnkhORzh9+HhKwVcdhU2R1/LMDUlYxKNnFdF0/kFgw4Gkj4MnmFlyy
 NpeLP4H95SeFhKPvmXB/2lZroaRn6wCxhPhUCHShxsH3YFy0J7zaEnmHMFSOX24n
 ++6fyb0mqiJtZPwJVbF+snb/5hP4epbmkrU5+mqtDdK8HHowAsV0ScKki0wGGmka
 Im5ryCMB+NZOD57XGajkpeQGZT+m0S8NilsZ5dy75o7el7WxnMLuUMyjlIbtnfet
 3KRF22XnsyPuvldoej/RM1Eiz86qUFl3LPO63cYT+/c9aSw0+luMp+JZp+iOcAr3
 xqyiciwOTu6CIP+DnYV72CuFa2IvLA06Eb3pgtpRUwATzS9weQ33X4Q80RaUVKxX
 VfXxCcDFl7dfGwqO6HujbxI6oHmEmvBEF9eGmFW2ocVrKnWUmjlC6y9tQxfReQDV
 SZkXKEkWPo/MLFl/AM+hTjGyu88ofOG4Vos0t3YmVyTuXekpPFb2DbPCvwnFdv8N
 kX/bfsxWPBDl3EdCQU8y
 =wkmj
 -----END PGP SIGNATURE-----

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

Pull arm-soc board specific changes from Olof Johansson:
 "While we generally attempt to get rid of board specific files and
  replace them with device tree based descriptions, a lot of platforms
  have not come that far:

  In shmobile, we add two new board files because their recently started
  effort to add DT support has not proceeded enough to use it for all of
  the important hardware.

  In Kirkwood, we are adding support for new boards with a combination
  of DT and board file contents in multiple cases.

  pxa/mmp and imx are extending support for existing board files but not
  adding new ones."

Fix up trivial conflicts in arch/arm/mach-{mmp/ttc_dkb.c,shmobile/{Kconfig,Makefile}}

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
  ARM: shmobile: fix smp build
  ARM: kirkwood: Add support for RaidSonic IB-NAS6210/6220 using devicetree
  kirkwood: Add iconnect support
  orion/kirkwood: create a generic function for gpio led blinking
  kirkwood/orion: fix orion_gpio_set_blink
  ARM: kirkwood: Define DNS-320/DNS-325 NAND in fdt
  kirkwood: Allow nand to be configured via. devicetree
  mtd: Add orion_nand devicetree bindings
  ARM: kirkwood: Basic support for DNS-320 and DNS-325
  ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva
  ARM: mach-shmobile: Use DT_MACHINE for KZM9G
  ARM: pxa: hx4700: Add Synaptics NavPoint touchpad
  ARM: pxa: Use REGULATOR_SUPPLY macro
  ARM: mach-shmobile: kzm9g: enable SMP boot
  ARM: mach-shmobile: kzm9g: defconfig update
  ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key
  ARM: mach-shmobile: kzm9g: add SDHI support
  ARM: mach-shmobile: kzm9g: add MMCIF support
  ARM: mach-shmobile: kzm9g: correct screen direction
  ARM: mach-shmobile: sh73a0.h: add GPIO_NR
  ...
2012-05-22 13:32:53 -07:00
..
boot arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
common arm-soc: First batch of cleanups 2012-05-22 09:23:24 -07:00
configs arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
include/asm arm-soc: First batch of cleanups 2012-05-22 09:23:24 -07:00
kernel Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-05-21 19:43:57 -07:00
lib
mach-at91 arm-soc: support for new SoCs 2012-05-22 09:32:42 -07:00
mach-bcmring
mach-clps711x ARM: clps711x: Cleanup IRQ handling 2012-05-15 21:20:59 +02:00
mach-cns3xxx ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
mach-davinci arm: davinci: use for_each_set_bit_from 2012-05-09 17:22:07 +05:30
mach-dove arm-soc: First batch of cleanups 2012-05-22 09:23:24 -07:00
mach-ebsa110
mach-ep93xx
mach-exynos arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
mach-footbridge ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
mach-gemini
mach-h720x
mach-highbank
mach-imx arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
mach-integrator Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus 2012-05-21 15:15:10 +01:00
mach-iop13xx ARM: PCI: get rid of pci_std_swizzle() 2012-05-13 17:12:16 +01:00
mach-iop32x ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
mach-iop33x ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
mach-ixp4xx Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-05-21 16:01:50 -07:00
mach-kirkwood arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
mach-ks8695 ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
mach-l7200/include/mach
mach-lpc32xx
mach-mmp arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
mach-msm Merge branch 'msm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup 2012-05-11 22:31:02 -07:00
mach-mv78xx0 ARM: PCI: dove/kirkwood/mv78xx0: use sys->private_data 2012-05-16 15:24:11 +01:00
mach-mxs arm-soc: soc-specific pinctrl changes 2012-05-22 09:39:42 -07:00
mach-netx
mach-nomadik ARM: nomadik: enable PINCTRL_NOMADIK where needed 2012-05-15 14:42:57 +02:00
mach-omap1 arm-soc: non-critical bug fixes 2012-05-22 09:27:39 -07:00
mach-omap2 arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
mach-orion5x arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
mach-picoxcell
mach-pnx4008
mach-prima2 ARM: PRIMA2: fix irq domain size and IRQ mask of internal interrupt controller 2012-05-16 21:52:13 -07:00
mach-pxa arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
mach-realview
mach-rpc
mach-s3c24xx ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c 2012-05-13 06:47:18 +09:00
mach-s3c64xx arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
mach-s3c2410
mach-s3c2412
mach-s3c2440
mach-s5p64x0 ARM: S5P64X0: Use common macro to define resources on dev-audio.c 2012-05-12 16:12:30 +09:00
mach-s5pc100 ARM: S5PC100: Use common macro to define resources on dev-audio.c 2012-05-12 16:12:30 +09:00
mach-s5pv210 ARM: S5PV210: Use common macro to define resources on mach-smdkv210.c 2012-05-12 16:12:31 +09:00
mach-sa1100 Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus 2012-05-21 15:15:10 +01:00
mach-shark ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
mach-shmobile arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
mach-spear3xx arm-soc: soc-specific pinctrl changes 2012-05-22 09:39:42 -07:00
mach-spear6xx arm-soc: device tree conversions, part 1 2012-05-22 09:30:52 -07:00
mach-tegra arm-soc: soc-specific pinctrl changes 2012-05-22 09:39:42 -07:00
mach-u300
mach-ux500 arm-soc: power management changes 2012-05-22 09:41:01 -07:00
mach-versatile Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus 2012-05-21 15:15:10 +01:00
mach-vexpress
mach-vt8500
mach-w90x900
mach-zynq
mm arm-soc: power management changes 2012-05-22 09:41:01 -07:00
net
nwfpe
oprofile
plat-iop ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
plat-mxc
plat-nomadik ARM: nomadik: enable PINCTRL_NOMADIK where needed 2012-05-15 14:42:57 +02:00
plat-omap arm-soc: power management changes 2012-05-22 09:41:01 -07:00
plat-orion orion/kirkwood: create a generic function for gpio led blinking 2012-05-15 03:12:14 +00:00
plat-pxa
plat-s3c24xx
plat-s5p
plat-samsung Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung 2012-05-13 06:48:21 +09:00
plat-spear arm-soc: soc-specific pinctrl changes 2012-05-22 09:39:42 -07:00
plat-versatile
tools
vfp Merge branch 'misc' into for-linus 2012-05-21 15:15:24 +01:00
Kconfig arm-soc: power management changes 2012-05-22 09:41:01 -07:00
Kconfig-nommu
Kconfig.debug
Makefile arm-soc: First batch of cleanups 2012-05-22 09:23:24 -07:00