summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next' of ↵Russell King2009-03-252-0/+3882
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
| * ARM OMAP3: Initial support for Nokia RX-51, v3Lauri Leukkunen2009-03-231-0/+1821
| | | | | | | | | | | | | | | | | | | | | | Adds board files and related headers for Nokia RX-51 Internet Tablet. This patch has been updated with some clean-up patches posted earlier to linux-omap list. Signed-off-by: Lauri Leukkunen <lauri.leukkunen@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP3: Add support for 3430 SDP, v4Syed Mohammed Khasim2009-03-231-0/+2061
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for 3430 SDP. Various updates have been merged into this patch from the linux-omap list. Patch updated to initialize regulators by David Brownell <dbrownell@users.sourceforge.net>. Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | Merge git://git.marvell.com/orion into develRussell King2009-03-251-4/+16
|\ \
| * | [ARM] Kirkwood: Add support for QNAP TS-119/TS-219 Turbo NASMartin Michlmayr2009-03-231-4/+16
| | | | | | | | | | | | | | | | | | | | | Add support for the QNAP TS-119 and TS-219 Turbo NAS devices. Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
* | | Merge branch 'devel' of ↵root2009-03-244-169/+3363
|\ \ \ | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
| * | | [ARM] pxa: add defconfig for pxa910-based platformsEric Miao2009-03-231-0/+891
| | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | [ARM] pxa: add defconfig for pxa168-based platformsEric Miao2009-03-231-0/+891
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having various pieces of defconfig files for different platforms, let's group them into a single one. Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | [ARM] pxa: add colibri PXA300 defconfigDaniel Mack2009-03-231-0/+1156
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | [ARM] pxa: rename and update Colibri PXA270 defconfigDaniel Mack2009-03-231-169/+425
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* | | | Merge branch 'master' of git://git.marvell.com/orion into develRussell King2009-03-193-64/+166
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: arch/arm/mach-mx1/devices.c
| * | | [ARM] mv78xx0: Add Marvell RD-78x00-mASA Reference Design supportLennert Buytenhek2009-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Acked-by: Stanislav Samsonov <samsonov@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | | [ARM] Kirkwood: update defconfigNicolas Pitre2009-03-151-62/+163
| | | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | | [ARM] orion5x: ts78xx add NAND support via plat_nandAlexander Clouter2009-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ts78xx add NAND support via plat_nand Signed-off-by: Alexander Clouter <alex@digriz.org.uk> Signed-off-by: Nicolas Pitre <nico@cam.org>
| * | | Merge branch 'for-np' of git://git.wormnet.eu/alex/ts78xx into orion/masterNicolas Pitre2009-02-191-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | [ARM] orion5x: add rtc-m48t86 to orion5x_defconfigAlexander Clouter2009-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The TS-7800 can have a M48T86 RTC onboard Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
* | | | [ARM] 5423/1: SA1100: remove unused H3600_SLEEVE Kconfig optionDmitry Artamonow2009-03-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no actual code for iPAQ sleeves support in kernel that depends on this config option. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into develRussell King2009-03-135-5/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | Conflicts: arch/arm/mach-at91/gpio.c
| * | [ARM] 5390/1: AT91: Watchdog fixesAndrew Victor2009-02-145-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recently merged AT91SAM9 watchdog driver uses the AT91SAM9X_WATCHDOG config variable, whereas the original version of the driver (and the platform support code) used AT91SAM9_WATCHDOG. This causes the watchdog platform_device to never be registered, and therefore the driver not to be initialized. This patch: - updates the platform support code to use AT91SAM9X_WATCHDOG. - includes <linux/io.h> to fix compile error (same fix as was applied to at91rm9200_wdt.c) - fixes comment regarding watchdog clock-rates in at91rm9200. Signed-off-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] pxa/magician: select PXA_SSP for touchscreen and soundPhilipp Zabel2009-03-091-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* | | [ARM] 5408/1: SA1100: update defconfigs after h3800 removalDmitry Artamonow2009-02-2112-12/+0
| | | | | | | | | | | | | | | Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] 5363/1: Shark cleanup and new defconfigAlexander Schulz2009-02-191-335/+593
| | | | | | | | | | | | | | | | | | | | | | | | | | | This includes a new defconfig for the Shark and some changes to the mach-shark directory to avoid namespace pollution and to switch the rtc to the newer driver. Signed-off-by: Alexander Schulz <alex@shark-linux.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] 5372/1: ACS5K: Core board support for the ACS-5000Daniel Silverstone2009-02-102-0/+2174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch provides the core board support for the Brivo Systems LLC ACS-5000 master board for automated door/card-reader etc management. Signed-off-by: Daniel Silverstone <dsilvers@simtec.co.uk> Signed-off-by: Vincent Sanders <vince@simtec.co.uk> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'devel' of ↵Russell King2009-02-073-330/+2576
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel Conflicts: arch/arm/configs/magician_defconfig
| * | [ARM] pxa: add em_x270_defconfig for EM-X270 and eXedaMike Rapoport2009-02-021-0/+1741
| | | | | | | | | | | | | | | | | | | | | machines Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | [ARM] pxa: prepare xm_x2xx_defconfig for splitMike Rapoport2009-02-021-65/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xm_x2xx_defconfig currently supports 3 platforms: CM-X255, CM-X270 and EM-X270. Although EM-X270 is similar to CM-X2XX, it has a lot of unique features. Keeping these features in the same _defconfig increases the kernel size in the way it does not fit into CM-X2XX NOR flash. Rename xm_x2xx_defconfig to cm_x2xx_defconfig and remove EM-X270 specifc parts from it. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | [ARM] pxa/magician: Enable pxa27x_udc and gpio_vbusPhilipp Zabel2009-02-021-9/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch depends on otg_transceiver support in pxa27x_udc (which is queued via linux-usb) to work. It compiles also without it. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | [ARM] pxa/magician: Enable backlightPhilipp Zabel2009-01-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Magician uses the generic PWM backlight driver, so select HAVE_PWM. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | [ARM] pxa/magician: Update defconfigPhilipp Zabel2009-01-211-166/+475
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the touched up result of make magician_defconfig in 2.6.29-rc2. - Enabled USB host and bluetooth: magician has a CSR BlueCore3 connected to the PXA27x OHCI internally. - Made I2C built-in. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | [ARM] pxa: update xm_x2xx_defconfigMike Rapoport2009-01-211-116/+262
| | | | | | | | | | | | | | | | | | | | | Update xm_x2xx_defconfig to allow use of EM-X270 updated features Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* | | eeprom: More consistent symbol namesJean Delvare2009-01-2670-108/+108
|/ / | | | | | | | | | | | | | | | | | | | | | | Now that all EEPROM drivers live in the same place, let's harmonize their symbol names. Also fix eeprom's dependencies, it definitely needs sysfs, and is no longer experimental after many years in the kernel tree. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Cc: David Brownell <dbrownell@users.sourceforge.net>
* | [ARM] remove missed CLPS7500 defconfigRussell King2009-01-081-801/+0
| | | | | | | | | | | | 635f0258e5ae526034486b4ae9020e64bfb7d27e missed removing the defconfig Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im into develRussell King2008-12-251-212/+114
|\ \
| * | [ARM] pxa: Update eseries defconfigIan Molton2008-12-251-212/+114
| | | | | | | | | | | | Signed-off-by: Ian Molton <ian@mnementh.co.uk>
* | | [ARM] 5352/1: add w90p910-plat config filewanzongshun2008-12-231-0/+626
| | | | | | | | | | | | | | | | | | | | | The patch is for w90p910 platform default config. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into develRussell King2008-12-192-6/+6
|\ \ \ | |_|/ |/| |
| * | Fix configure warnings in defconfigs for netX and Picotux 200Uwe Kleine-König2008-12-122-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since May 8 2007 the symbols RTC_INTF_PROC, RTC_INTF_SYSFS and RTC_INTF_DEV are not tristate anymore. This fixes the following warnings: arch/arm/configs/picotux200_defconfig:1072:warning: symbol value 'm' invalid for RTC_INTF_SYSFS arch/arm/configs/picotux200_defconfig:1073:warning: symbol value 'm' invalid for RTC_INTF_PROC arch/arm/configs/picotux200_defconfig:1074:warning: symbol value 'm' invalid for RTC_INTF_DEV Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Robert Schwebel <r.schwebel@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Simon Richter <Simon.Richter@kleinhenz.com> Cc: Andrew Victor <linux@maxim.org.za>
* | | Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into develRussell King2008-12-181-0/+845
|\ \ \
| * | | [ARM] s3c6400_defconfig: Add SDHCI driverBen Dooks2008-12-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add the Samsung SDHCI driver to the build. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | [ARM] s3c6400_defconfig: Add I2C driver and devicesBen Dooks2008-12-151-9/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the new I2C driver and the EEPROM devices to the system, as well as update to the latest kernel. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | [ARM] S3C64XX: Add s3c6400_defconfigBen Dooks2008-12-151-0/+733
| | | | | | | | | | | | | | | | | | | | | | | | Add a basic defconfig for s3c6400 series machines. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | | | [ARM] MX31: defconfig for mx31moboard platformValentin Longchamp2008-12-161-0/+790
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Add default configuration for MX31PDK board.Fabio Estevam2008-12-161-0/+773
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'omap3-upstream' of ↵Russell King2008-12-152-1/+1556
|\ \ \ \ | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
| * | | | ARM: OMAP3: Add basic support for Pandora handheld consoleGrazvydas Ignotas2008-12-101-0/+1409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for basic features: uarts, i2c, and rtc. Also includes defconfig. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | | | ARM: OMAP3: LDP: Add Ethernet device support to make ldp boot succeessStanley.Miao2008-12-101-1/+147
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Ethernet device support in board-ldp.c to make ldp can boot and mount nfs successfully. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
* | | | [ARM] DSM320: Update KS8695 defconfig to include DSM320Daniel Silverstone2008-12-141-282/+425
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Update the KS8695 defconfig to bring it up to modern config standards and include the DSM320 and appropriate drivers for the DSM320 (E.g. prism54). Signed-off-by: Daniel Silverstone <dsilvers@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | | Merge git://git.marvell.com/orion into develRussell King2008-12-132-91/+240
|\ \ \
| * | | [ARM] Kirkwood: update defconfigNicolas Pitre2008-12-111-90/+239
| |/ / | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | [ARM] pxa/corgi: update default config to exclude tosa from being builtEric Miao2008-11-261-1/+1
| |/ | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com>
OpenPOWER on IntegriCloud