linux-toradex.git/arch/arm/mach-pxa/zylonite.c, branch v3.4.46 Linux kernel for Apalis and Colibri modules Merge branch 'samsung/driver' into next/drivers 2012-01-09T16:16:29+00:00 Arnd Bergmann arnd@arndb.de 2012-01-09T16:16:29+00:00 dcf7ec5ee62a78123057a1e286c88ca739717409 Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de> 
Conflicts:
	arch/arm/mach-mxs/include/mach/common.h

Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
ARM: restart: pxa: use new restart hook 2012-01-05T12:57:17+00:00 Russell King rmk+kernel@arm.linux.org.uk 2011-11-04T14:15:53+00:00 271a74fc875210d3dfcc03d557fb5d86d3990a0f Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
Hook these platforms restart code into the new restart hook rather
than using arch_reset().

Acked-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers 2011-11-23T20:47:41+00:00 Arnd Bergmann arnd@arndb.de 2011-11-23T20:47:41+00:00 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 






ARM: pxa: rename gpio_to_irq and irq_to_gpio
2011-11-14T13:07:59+00:00

Haojian Zhuang
haojian.zhuang@marvell.com

2011-10-10T08:03:51+00:00

4929f5a8a99f64378659c5658621e45c90c2aaa9

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 <haojian.zhuang@marvell.com>





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 <haojian.zhuang@marvell.com>







Merge git://git.infradead.org/mtd-2.6
2011-11-07T17:11:16+00:00

Linus Torvalds
torvalds@linux-foundation.org

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

e0d65113a70f1dc514e625cc4e7a7485a4bf72df

* 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.





* 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.







mtd: pxa3xx_nand: enable multiple chip select support
2011-09-11T12:02:15+00:00

Lei Wen
leiwen@marvell.com

2011-07-15T03:44:33+00:00

f3c8cfc237927cc095e8bcb1e3794cfa76390bab

Current pxa3xx_nand controller has two chip select which
both be workable. This patch enable this feature.

Update platform driver to support this feature.

Another notice should be taken that:
When you want to use this feature, you should not enable the
keep configuration feature, for two chip select could be
attached with different nand chip. The different page size
and timing requirement make the keep configuration impossible.

Signed-off-by: Lei Wen <leiwen@marvell.com>





Current pxa3xx_nand controller has two chip select which
both be workable. This patch enable this feature.

Update platform driver to support this feature.

Another notice should be taken that:
When you want to use this feature, you should not enable the
keep configuration feature, for two chip select could be
attached with different nand chip. The different page size
and timing requirement make the keep configuration impossible.

Signed-off-by: Lei Wen <leiwen@marvell.com>







ARM: mach-pxa: convert boot_params to atag_offset
2011-08-21T21:15:07+00:00

Nicolas Pitre
nicolas.pitre@linaro.org

2011-07-06T02:38:15+00:00

7375aba6737419db5a17b4a8540ffe7b4452ff40

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>





Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>







ARM: pxa: enable MULTI_IRQ_HANDLER for all boards
2011-07-12T11:50:33+00:00

Eric Miao
eric.y.miao@gmail.com

2011-05-18T13:30:04+00:00

8a97ae2f554d762a4bc67b5d13b52ef39c8d6baa

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>





Signed-off-by: Eric Miao <eric.y.miao@gmail.com>







ARM: pxa: move declarations from generic.h to <soc>.h
2011-07-12T11:50:32+00:00

Eric Miao
eric.y.miao@gmail.com

2011-05-18T13:19:04+00:00

ca0e687c8ea5a7ae4b1c7a735f797f95ed953f9a

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>





Signed-off-by: Eric Miao <eric.y.miao@gmail.com>







ARM: pxa: clean up set_pxa_fb_info
2011-03-16T08:32:47+00:00

Russell King - ARM Linux
linux@arm.linux.org.uk

2011-02-15T07:37:30+00:00

4321e1a12b811c02441240aa6183156791204f3f

set_pxa_fb_info() has been a long-standing wart in the naming scheme
of the pxa_set_xxx_info() functions.  This renames the function, and
combines set_pxa_fb_parent() with set_pxa_fb_info().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>





set_pxa_fb_info() has been a long-standing wart in the naming scheme
of the pxa_set_xxx_info() functions.  This renames the function, and
combines set_pxa_fb_parent() with set_pxa_fb_info().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>