Commit Graph

226 Commits

Author SHA1 Message Date
Russell King cc513ac0f2 Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm
Merge branch 'pxa-viper' into pxa-machines

Conflicts:

	arch/arm/mach-pxa/Makefile
	drivers/pcmcia/Kconfig
	drivers/pcmcia/Makefile
2008-10-07 19:08:32 +01:00
Russell King 1543966a07 Merge branch 'pxa-palm' into pxa-machines
Conflicts:

	drivers/mfd/Kconfig
	drivers/pcmcia/Makefile
2008-10-07 19:07:22 +01:00
Russell King 35437b6192 Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac', 'pxa-mp900', 'pxa-zylonite' and 'pxa-zaurus' into pxa-machines
Conflicts:

	arch/arm/mach-pxa/poodle.c
2008-10-07 19:06:22 +01:00
Mike Rapoport f3ec5cc92a [ARM] 5285/1: pxa: update xm_x2xx_defconfig
Signed-off-by: Russ Dill <russ.dill@gmail.com>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-10-07 12:08:15 +01:00
Mike Rapoport 7d76e3f171 [ARM] 5286/2: pxa: rename cm-x270* to cm-x2xx* to allow addition of cm-x255 support
Signed-off-by: Russ Dill <russ.dill@gmail.com>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-10-07 12:05:04 +01:00
Sergey Lapin c49e1e63a9 [ARM] 5238/2: Very basic Palm Zire 72 support
This patch contains very basic support of Palm Zire 72.

Signed-off-by: Sergey Lapin <slapin@ossfans.org>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-09-26 21:17:47 +01:00
Marc Zyngier 19ec95df2c Add default configuration for Arcom/Eurotech Viper SBC
Signed-off-by: Marc Zyngier <marc.zyngier@altran.com>
2008-09-09 17:41:56 +02:00
Russell King c8791088cf Merge branch 'omap-rmk' 2008-08-27 23:07:46 +01:00
Russell King 9c2d015712 [ARM] OMAP: Add and update OMAP default configuration files
Update omap_h2_1610 and omap_osk_5912 default configurations.

Add ams delta, n770, omap 2430sdp, apollon_2420, generic 1510, 1610,
1710, 2420, h4 2420, innovator 1510 and 1610, perseus2 730, palte,
palmtt, palmz71 and sx1 default configurations.

Pulled out of the omap zoom tree.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-08-27 16:12:38 +01:00
Mike Rapoport fb6ff9a6f9 [ARM] 5216/1: Add CM-X300 defconfig
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-08-26 17:08:04 +01:00
Nicolas Pitre 8e05de88cf [ARM] orion5x: update defconfig to v2.6.27-rc4
Signed-off-by: Nicolas Pitre <nico@marvell.com>
2008-08-22 13:21:15 -04:00
Martin Michlmayr c0fe819baf [ARM] Orion: activate lm75 driver on DNS-323
The lm75 driver was recently converted to the new-style binding,
so now it can be loaded from the DNS-323 support code.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Tested-by: Tobias Poschwatta <tp@fonz.de>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
2008-08-21 22:15:17 -04:00
Martin Michlmayr 3af6b0440f [ARM] Orion: enable CONFIG_RTC_DRV_S35390A in the defconfg for QNAP devices
The QNAP TS-109/TS-209 and TS-409 devices need RTC_DRV_S35390A.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
2008-08-09 15:17:28 +02:00
Martin Michlmayr 627ca2fe93 [ARM] Orion: enable RTC_DRV_PCF8563 in the defconfig for HP mv2120
Enable RTC_DRV_PCF8563 in the Orion defconfig since this driver is
needed by the HP mv2120.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
2008-08-09 15:17:28 +02:00
Martin Michlmayr 94434ba09a [ARM] Orion: enable KEYBOARD_GPIO in the defconfg
Enable KEYBOARD_GPIO in the Orion defconfig because a number of Orion
devices, such as the HP mv2120, define gpio-keys buttons.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
2008-08-09 15:17:28 +02:00
Pieter du Preez f6ed6f78d4 Fix rename of at91_nand -> atmel_nand
Structs called at91_nand_data where renamed to atmel_nand_data
and configs called *MTD_NAND_AT91* where renamed to
*MTD_NAND_ATMEL*. This was unfortunately not done consistently,
causing NAND chips not being initialised on several ARM boards.

I am aware that the author of the original change did not rename
MTD_NAND_AT91_BUSWIDTH to MTD_NAND_ATMEL_BUSWIDTH, for example.
All *MTD_NAND_AT91* where renamed to *MTD_NAND_ATMEL* in order
to keep naming consistency.

This patch was only tested on a MACH_SAM9_L9260, as this is the
only ARM board I have to my disposal.

Before this patch:

$ git-ls-files |xargs grep atmel_nand |wc -l
105
$ git-ls-files |xargs grep at91_nand |wc -l
4
$ git-ls-files |xargs grep MTD_NAND_ATMEL |wc -l
8
$ git-ls-files |xargs grep MTD_NAND_AT91 |wc -l
47

After this patch:

$ git-ls-files |xargs grep atmel_nand |wc -l
109
$ git-ls-files |xargs grep at91_nand |wc -l
0
$ git-ls-files |xargs grep MTD_NAND_ATMEL |wc -l
55
$ git-ls-files |xargs grep MTD_NAND_AT91 |wc -l
0

Signed-off-by: Pieter du Preez <pdupreez@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2008-08-01 10:06:40 +01:00
Ian Molton 1d1f8b377c [ARM] update defconfig for eseries.
Signed-off-by: Ian Molton <spyro@f2s.com>
2008-07-26 22:39:58 +01:00
Russell King 044e5f45e4 Merge branch 'pxa' into devel
Conflicts:

	arch/arm/configs/em_x270_defconfig
	arch/arm/configs/xm_x270_defconfig
2008-07-13 12:05:49 +01:00
Russell King f0006314d3 Merge branch 'imx' into devel
Conflicts:

	arch/arm/mm/Kconfig
2008-07-10 16:41:50 +01:00
Russell King a177ba3b7a Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap-reviewed', 'rpc', 'rtc' and 's3c' into devel 2008-07-10 16:38:50 +01:00
Stefan Schmidt 79c410db66 [ARM] 5169/1: Defconfig for the EZX machines
This defconfig enables all currently available features. It also builds one
zImage which runs on all machines.

Signed-off-by: Antonio Ospite <ao2@openezx.org>
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10 14:38:40 +01:00
sedji gaouaou 3ef8191f43 [ARM] 5133/2: at91sam9g20 defconfig file
at91sam9g20 defconfig file

Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: Justin Waters <justin.waters@timesys.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10 12:13:48 +01:00
Martin Michlmayr 2e1117d307 [ARM] Orion: LED support for HP mv2120
The HP mv2120 has several LEDs that are controlled through gpio.
Export the health LED, the red SATA LEDs as well as two gpios
that control the brightness of _all_ LEDs to userland.  The
Ethernet and power LEDs can't be controlled through gpio and the
blue SATA LEDs are handled via the SATA driver.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
2008-07-07 18:38:24 -04:00
Ben Dooks 7ba06b17a1 [ARM] s3c2410_defconfig: update for current build
Update the s3c2410_defconfig for the current set of
added patches.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2008-07-07 18:13:05 +01:00
Juergen Beisert 7e5e9f5457 i.MX27: Adding PCM038 platform support
This patch adds support for the phyCORE-i.MX27 cpu module (aka pcm038).
It is as generic as possible in order to support any kind of baseboard.

Note: This CPU module implementation can't work without a baseboard
support. Baseboard support can be added by the PCM-970 (included in
this patch stack) or any custom variant.

Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
2008-07-05 10:03:00 +02:00
Juergen Beisert 80eedae6f0 i.MX27: Add ADS platform support
This patch adds basic support for the Freescale MX27ADS reference board.
Currently only a serial console can be used.

Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
2008-07-05 10:03:00 +02:00
Daniel Mack 9a4cd7a5c8 MX3: Add basic support for LogicPD i.MX31 LiteKit
This patch adds basic support for i.MX31 LiteKit by LogicPD.
With printascii() in kernel/printk.c, it boots right into the
rootfs-panic.

Note: This is a modified version of Daniel's patch to fit into this patch
stack.

> On 09.06.2008, at 17:26, Russell King - ARM Linux wrote:
>
> > I would much prefer it if board specific includes were included by the
> > code which needs them rather than in asm/arch/hardware.h.  With the
> > device model, drivers shouldn't need to include any board specific
> > includes - only the board specific C file should need it.
>
> The new version of this patch (#5102) has been uploaded to the patch
> tracker this morning.

Signed-off-by: Daniel Mack <daniel@caiaq.de>

-- 
 arch/arm/configs/mx31litekit_defconfig    | 1100 ++++++++++++++++++++++++++++++
 arch/arm/mach-mx3/Kconfig                 |    7 
 arch/arm/mach-mx3/Makefile                |    1 
 arch/arm/mach-mx3/mx31lite.c              |   96 ++
 include/asm-arm/arch-mxc/board-mx31lite.h |   38 +
 include/asm-arm/arch-mxc/debug-macro.S    |    3 
 6 files changed, 1245 insertions(+)
2008-07-05 10:02:53 +02:00
Sascha Hauer ce8ffef0bf MX31: add basic pcm037 board support
This patch adds basic board support for phytecs pmc037 board.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-07-05 10:02:52 +02:00
Juergen Beisert 1b53218bfa i.MX3: Add a basic default config for the imx31ads (reference only)
Currently there is a mx31ads BSP file in the kernel, but no default
config file.

This patch adds a basic default config for the imx31ads but it is for test
purposes only to ensure the i.MX2 patch stack doesn't break the i.MX3.

Note: For reference only. This configuration is untested as I have
no access to an mx31ads.

Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
2008-07-05 10:02:51 +02:00
Ben Dooks b497549a03 [ARM] S3C24XX: Split serial driver into core and per-cpu drivers
The S3C2410 serial driver in drivers/serial/s3c2410.c has been
growing bigger with the addition of more variants of this hardware
with the growing Samsung SoCs range. As such, it would be
easier to split this code up into a core and per-cpu drivers to
make driver addition easier, and the core smaller.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2008-07-03 16:51:31 +01:00
Ben Dooks ed9137f103 [ARM] S3C24XX: s3c2410_defconfig: enable USB subset of drivers
Enable a subset of USB drivers which are useful for
using on these devices.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2008-07-03 16:51:22 +01:00
Ben Dooks 328dce1fa0 [ARM] S3C24XX: s3c2410_defconfig: add SCSI support
Enable SCSI support, mainly to help with adding
USB storage support later and for the imminent
changes for libata.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2008-07-03 16:51:22 +01:00
Ben Dooks 186eb08b8b [ARM] S3C24XX: s3c2410_defconfig: update networking options
Add the following to the networking confgiuration:

1) Packet socket support (useful for userland dhcp)
2) Add bluetooth and USB bluetooth drivers as modules
3) Add basic IPv6 support as modules.
4) Add the wireless core as modules.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2008-07-03 16:51:21 +01:00
Ben Dooks d947ae5721 [ARM] S3C24XX: s3c2410_defconfig: update miscellaneous options
Add some basic config filesystem, ensure errors are verbose
by default.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2008-07-03 16:51:21 +01:00
Ben Dooks fa941dc986 [ARM] S3C24XX: s3c2410_defconfig: update filesystem options
Enable new filesystem options, such as:

- JFFS2 summary nodes
- Ext2/3 externed options
- Standard CDROM filesystems

Also add NTFS as a module.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2008-07-03 16:51:20 +01:00
Ben Dooks a373473a90 [ARM] S3C24XX: s3c2410_defconfig: enable useful NLS options
Enable some useful NLS codepages to be built into
the kernel, and build the rest as modules.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2008-07-03 16:51:20 +01:00
Ben Dooks d951f55d6a [ARM] S3C24XX: s3c2410_defconfig: update list of used drivers
Update the drivers built, such as the SM501 and
parallel port.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2008-07-03 16:51:20 +01:00
Ben Dooks 0acaff300f [ARM] S3C24XX: s3c2410_defconfig: update to rc8
Update the s3c2410_defconfig to rc8

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2008-07-03 16:51:19 +01:00
Imre Kaloz 395aed6de6 [ARM] Orion: enable all currently supported boards in defconfig
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
2008-06-30 16:04:45 -04:00
Lennert Buytenhek 009b47dfc7 [ARM] mv78xx0: add defconfig
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
2008-06-22 22:45:10 +02:00
Saeed Bishara 9307f05c77 [ARM] Kirkwood: add defconfig
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
2008-06-22 22:45:07 +02:00
Lennert Buytenhek 7ea217a85e [ARM] Loki: add defconfig
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
2008-06-22 22:45:02 +02:00
Nicolas Pitre b0bfcce930 [ARM] Orion: update defconfig to 2.6.26-rc4
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
2008-06-22 22:44:35 +02:00
Mike Rapoport 7c5926d4e8 [ARM] 5036/2: Combine cm_x270_defconfig and em_x270_defconfig into xm_x270_defconfig
Combine cm_x270_defconfig and em_x270_defconfig to allow running the
same kernel on both machines

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-06-02 19:33:31 +01:00
Stelian Pop 6b71dbf65e [ARM] 4935/1: AT91CAP9: enable RTC-on-RTT in defconfig.
Update the help text for RTC_DRV_AT91SAM9 to mention that the
option apply to AT91CAP9 processors too, and enable it in the
defconfig.

Signed-off-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-06-02 15:08:11 +01:00
Stelian Pop 7c8cf66529 [ARM] 4934/1: AT91CAP9 UDPHS driver: board and cpu integration.
This is patch 2 of 2 adding support for the USB High Speed Device Port
on the AT91CAP9 system on chip. The AT91CAP9 uses the same UDPHS IP
as the AVR32 and the AT91SAM9RL.

This patch declares the UDPHS ressources in the at91cap9 (cpu and
adk board) files, wires up the atmel_usba_udc driver to them,
and activates the driver in the defconfig.

Signed-off-by: Stelian Pop <stelian@popies.net>
Acked-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-06-02 15:08:09 +01:00
Andrew Victor 7b2253418c [ARM] 5058/1: [AT91] Calao Systems - default configs
Default config files for the three AT91-based boards available from
Calao Systems: USB_A9260, USB_A9263 and QIL_A9260.

Signed-off-by: Grégory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-06-02 13:53:11 +01:00
Russell King 205bee6ad8 [ARM] dyntick: Remove obsolete and unused ARM dyntick support
dyntick is superseded by the clocksource/clockevent infrastructure,
using the NO_HZ configuration option.  No one implements dyntick on
ARM anymore, so it's pointless keeping it around.  Remove dyntick
support.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-05-12 17:39:14 +01:00
Russell King 92794a5d63 Merge branches 'pxa' and 'orion-fixes1' 2008-04-29 21:31:06 +01:00
Jaya Kumar a393c46b49 [ARM] 5006/1: Gumstix GPIO header fixup and defconfig fixup
This patch adds the include of the GPIO header needed to make gumstix
build. The defconfig is updated to 2.6.25 and disables PCMCIA since
that has not yet been implemented for gumstix.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-04-21 12:47:46 +01:00