kernel-fxtec-pro1x/arch/arm/mach-pxa
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
..
include/mach Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-05-18 23:46:36 -07:00
am200epd.c ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 2011-11-14 21:07:58 +08:00
am300epd.c ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 2011-11-14 21:07:58 +08:00
balloon3.c ARM: pxa: Use REGULATOR_SUPPLY macro 2012-05-14 09:30:04 +08:00
capc7117.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
clock-pxa2xx.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
clock-pxa3xx.c
clock.c
clock.h
cm-x2xx-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
cm-x2xx-pci.h
cm-x2xx.c Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
cm-x255.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
cm-x270.c ARM: pxa: rename gpio_to_irq and irq_to_gpio 2011-11-14 21:07:59 +08:00
cm-x300.c ARM: pxa: Use REGULATOR_SUPPLY macro 2012-05-14 09:30:04 +08:00
colibri-evalboard.c
colibri-pxa3xx.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
colibri-pxa270-income.c ARM: pxa: Fix typo 'CONFIG_BACKLIGHT_PWM__MODULE' 2011-10-31 10:55:26 +01:00
colibri-pxa270.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
colibri-pxa300.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
colibri-pxa320.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
corgi.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
corgi_pm.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
cpufreq-pxa2xx.c
cpufreq-pxa3xx.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
csb701.c
csb726.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
devices.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
devices.h ARM: pxa: change gpio to platform device 2011-11-15 19:08:27 +08:00
em-x270.c ARM: pxa: Use REGULATOR_SUPPLY macro 2012-05-14 09:30:04 +08:00
eseries.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 2012-01-12 08:00:30 -08:00
eseries.h ARM: PXA: eseries: fix eseries_register_clks section mismatch warning 2011-11-05 19:09:42 +00:00
ezx.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
generic.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
generic.h ARM: pxa: remove duplicated registeration on pxa-gpio 2012-03-06 14:40:59 +08:00
gumstix.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
h5000.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
himalaya.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
hx4700.c Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-05-18 23:46:36 -07:00
icontrol.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
idp.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
irq.c ARM: pxa: change gpio to platform device 2011-11-15 19:08:27 +08:00
Kconfig ARM: fix __io macro for PCMCIA 2012-04-05 11:29:55 -07:00
leds-idp.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds-lubbock.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds-mainstone.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds.c
leds.h
littleton.c Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
lpd270.c Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
lubbock.c ARM: sa1111: provide a generic way to prevent devices from registering 2012-03-24 11:29:52 +00:00
magician.c ARM: pxa: Use REGULATOR_SUPPLY macro 2012-05-14 09:30:04 +08:00
mainstone.c Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
Makefile ARM: pxa: pxa95x/saarb depends on pxa3xx code 2011-10-08 21:03:00 +08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mfp-pxa2xx.c ARM: PXA2xx: MFP: fix potential direction bug 2012-04-27 11:14:06 +08:00
mfp-pxa3xx.c
mioa701.c Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-05-18 23:46:36 -07:00
mioa701_bootresume.S
mp900.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
mxm8x10.c Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers 2011-11-23 20:47:41 +00:00
palm27x.c ARM: pxa: Use REGULATOR_SUPPLY macro 2012-05-14 09:30:04 +08:00
palmld.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
palmt5.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
palmtc.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
palmte2.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
palmtreo.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
palmtx.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
palmz72.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
pcm027.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
pcm990-baseboard.c ARM: pxa: use ioremap to access CPLD 2012-04-27 13:05:36 +08:00
pm.c
poodle.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
pxa2xx.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
pxa3xx-ulpi.c usb: otg: Convert all users to pass struct usb_otg for OTG functions 2012-02-27 15:41:52 +02:00
pxa3xx.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
pxa25x.c Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards 2012-03-10 09:15:30 -08:00
pxa27x.c ARM: pxa: fix gpio wakeup setting 2012-04-27 10:46:45 +08:00
pxa95x.c Merge branch 'next/fixes-non-critical' into next/drivers 2012-03-20 22:42:24 +00:00
pxa300.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
pxa320.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
pxa930.c
raumfeld.c ARM: A few more platform fixes for include file fallout 2012-03-30 17:00:34 -07:00
reset.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
saar.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
saarb.c arch/arm/mach-pxa/: included linux/gpio.h twice 2012-02-16 23:26:19 +08:00
sharpsl_pm.c ARM: cleanups of io includes 2012-03-29 18:02:10 -07:00
sleep.S
smemc.c
spitz.c ARM: pxa: Use REGULATOR_SUPPLY macro 2012-05-14 09:30:04 +08:00
spitz_pm.c ARM: pxa: fix wrong parsing gpio event on spitz 2012-02-16 10:28:53 +08:00
standby.S
stargate2.c ARM: pxa: Use REGULATOR_SUPPLY macro 2012-05-14 09:30:04 +08:00
tavorevb.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
tavorevb3.c Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
time.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
tosa-bt.c
tosa.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 2012-01-12 08:00:30 -08:00
trizeps4.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
viper.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
vpac270.c ARM: pxa: Use REGULATOR_SUPPLY macro 2012-05-14 09:30:04 +08:00
xcep.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
z2.c ARM: pxa: Use REGULATOR_SUPPLY macro 2012-05-14 09:30:04 +08:00
zeus.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
zylonite.c Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
zylonite_pxa300.c ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 2011-11-14 21:07:58 +08:00
zylonite_pxa320.c