linux-toradex.git/arch/arm/plat-pxa, branch v3.4.67

Disintegrate asm/system.h for ARM

2012-03-28T17:30:01+00:00

Disintegrate asm/system.h for ARM.

Signed-off-by: David Howells 
cc: Russell King 
cc: linux-arm-kernel@lists.infradead.org

Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers

2011-11-23T20:47:41+00:00

ARM: pxa: change gpio to platform device

2011-11-15T11:08:27+00:00

Remove most gpio macros and change gpio driver to platform driver.

Signed-off-by: Haojian Zhuang

ARM: pxa: rename NR_BUILTIN_GPIO

2011-11-14T13:07:59+00:00

NR_BUILTIN_GPIO is both defined in arch-pxa and arch-mmp. Now replace it
with PXA_NR_BUILTIN_GPIO and MMP_NR_BUILTIN_GPIO.

Signed-off-by: Haojian Zhuang

ARM: pxa: rename gpio_to_irq and irq_to_gpio

2011-11-14T13:07:59+00:00

Avoid to define gpio_to_irq() and irq_to_gpio() for potential name
confliction since multiple architecture will be built together.

Signed-off-by: Haojian Zhuang

Merge git://git.infradead.org/mtd-2.6

2011-11-07T17:11:16+00:00

* git://git.infradead.org/mtd-2.6: (226 commits)
  mtd: tests: annotate as DANGEROUS in Kconfig
  mtd: tests: don't use mtd0 as a default
  mtd: clean up usage of MTD_DOCPROBE_ADDRESS
  jffs2: add compr=lzo and compr=zlib options
  jffs2: implement mount option parsing and compression overriding
  mtd: nand: initialize ops.mode
  mtd: provide an alias for the redboot module name
  mtd: m25p80: don't probe device which has status of 'disabled'
  mtd: nand_h1900 never worked
  mtd: Add DiskOnChip G3 support
  mtd: m25p80: add EON flash EN25Q32B into spi flash id table
  mtd: mark block device queue as non-rotational
  mtd: r852: make r852_pm_ops static
  mtd: m25p80: add support for at25df321a spi data flash
  mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
  mtd: nand: switch `check_pattern()' to standard `memcmp()'
  mtd: nand: invalidate cache on unaligned reads
  mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
  mtd: nand: wait to set BBT version
  mtd: nand: scrub BBT on ECC errors
  ...

Fix up trivial conflicts:
 - arch/arm/mach-at91/board-usb-a9260.c
	Merged into board-usb-a926x.c
 - drivers/mtd/maps/lantiq-flash.c
	add_mtd_partitions -> mtd_device_register vs changed to use
	mtd_device_parse_register.

Merge branch 'depends/rmk/gpio' into next/fixes

2011-10-31T21:44:18+00:00

This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: Arnd Bergmann

ARM: pxa: use correct __iomem annotations

2011-10-08T13:03:07+00:00

This tries to clear up the confusion between integers and iomem pointers
in the marvell pxa platform. MMIO addresses are supposed to be __iomem*
values, in order to let the Linux type checking work correctly. This
patch moves the cast to __iomem as far back as possible, to the place
where the MMIO virtual address windows are defined.

Signed-off-by: Arnd Bergmann 
Signed-off-by: Eric Miao

ARM: 7104/1: plat-pxa: break out GPIO driver specifics

2011-10-01T22:45:34+00:00

The  file is included from upper directories
and deal with generic GPIO and gpiolib stuff. Break out the
platform and driver specific defines and functions into its own
header file.

Cc: Eric Miao 
Signed-off-by: Linus Walleij 
Signed-off-by: Russell King

ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem

2011-10-01T22:41:41+00:00

As per example from the other ARM boards, push the PXA
GPIO driver down to the GPIO subsystem so it can be consolidated.

Acked-by: Eric Miao 
Signed-off-by: Linus Walleij 
Signed-off-by: Russell King