summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-np' of git://git.wormnet.eu/alex/ts78xx into orion/masterNicolas Pitre2009-02-201-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] 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>
* | 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-161-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-161-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-161-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-111-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-111-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>
* | Merge branch 'for-rmk' of ↵Russell King2008-12-021-0/+996
|\ \ | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel Conflicts: arch/arm/mach-pxa/pxa25x.c
| * | [ARM] pxa: add basic support for HP iPAQ h5000Anton Vorontsov2008-12-021-0/+996
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds HP iPAQ h5000's (h5400, h5500) basic definitions. Kernel will able to boot, work via serial console, mount filesystems placed on flashes and run USB gadgets (g_ether by default). Other device drivers (frame buffer, LCD, touchscreen, backlight, bluetooth, w1/battery, ...) are depend on SAMCOP and MediaQ SoCs/MFDs, drivers to which will be submitted too, after massive cleanups. This machine will be used as "real user" for these new drivers. This is an updated version of the patch, which contains fixes proposed on linux-arm-kernel mailing list. Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com> Signed-off-by: Milan Plzik <milan.plzik@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* | Merge branch 'for-rmk-realview' of git://linux-arm.org/linux-2.6 into develRussell King2008-12-012-556/+925
|\ \
| * | RealView: Update the realview-smp_defconfig file to a newer kernelCatalin Marinas2008-12-011-317/+401
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original file was based on 2.6.19-rc3. Apart from the new symbols, the explicitly enabled eatures are AEABI, REALVIEW_HIGH_PHYS_OFFSET and MACH_REALVIEW_PB11MP. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
| * | RealView: Update the realview_defconfig file to a newer kernelCatalin Marinas2008-12-011-239/+524
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | The original file was based on 2.6.14-rc2. Apart from the new symbols, the explicitly enabled features are AACI, MMC, AEABI, MACH_REALVIEW_PB1176 and MACH_REALVIEW_PB11MP. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* / [ARM] 5290/1: [AT91] Add support for the Adeneo NeoCore 926 boardAndrew Victor2008-12-011-0/+1302
|/ | | | | | | | Add support for the Adeneo NeoCore 926 board. Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Signed-off-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge branch 'for-rmk' of git://git.android.com/kernel into develRussell King2008-10-221-1/+1
|\
| * [ARM] msm: rename ARCH_MSM7X00A to ARCH_MSMBrian Swetland2008-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | The MSM architecture covers a wider family of chips than just the MSM7X00A. Move to a more generic name, in perparation for supporting the specific SoC variants as sub-architectures (ARCH_MSM7X01A, ARCH_MSM722X, etc). This gives us ARCH_MSM for the (many) common peripherals. This also removes the unused/obsolete config item MSM7X00A_IDLE. Signed-off-by: Brian Swetland <swetland@google.com>
* | Merge branch 'for-rmk' of ↵Russell King2008-10-222-1000/+1690
|\ \ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
| * | [ARM] pxa: update {corgi,spitz}_defconfig to favor SPI-based driversEric Miao2008-10-212-1000/+1690
| |/ | | | | | | | | | | | | | | | | Recent changes have been made to use the generic SPI-based ads7846 touch screen driver and a generic SPI-based corgi-type LCD/backlight driver. Update the {corgi,spitz}_defconfig to favor the use of these drivers instead of the legacy ones. Signed-off-by: Eric Miao <eric.miao@marvell.com>
* / [ARM] pxa: fix trizeps defconfigRussell King2008-10-171-0/+1
|/ | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge branch 'omap-all' into develRussell King2008-10-143-0/+4250
|\ | | | | | | | | | | | | Conflicts: arch/arm/mach-omap2/gpmc.c arch/arm/mach-omap2/irq.c
| * ARM: OMAP3: Add default kernel config for OMAP LDPNishant Kamat2008-10-101-0/+1044
| | | | | | | | | | | | | | | | | | | | This patch adds a default config for the OMAP LDP platform. Signed-off-by: Nishant Kamat <nskamat@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP3: Defconfig for the Gumstix Overo board (rev 3)Steve Sakoman2008-10-101-0/+1885
| | | | | | | | | | | | | | | | | | | | | | | | Add defconfig for the Gumstix Overo board Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP3: Add Beagle defconfigSyed Mohammed, Khasim2008-10-091-0/+1321
| | | | | | | | | | | | | | | | | | | | | | | | Add Beagle defconfig Signed-off-by: Syed Mohammed, Khasim <khasim@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | Merge branch 'for-rmk' of git://git.marvell.com/orionRussell King2008-10-091-0/+3
|\ \ | | | | | | | | | Merge branch 'orion-devel' into devel
| * | [ARM] Orion: Add Buffalo Linkstation Mini supportAlexey Kopytko2008-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | | This patch adds support for Buffalo Linkstation Mini board. Signed-off-by: Alexey Kopytko <alexey@kopytko.ru> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | [ARM] Orion: add RD88F6183AP-GE supportLennert Buytenhek2008-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The RD88F6183AP-GE is an access point reference design for the 88F6183 SoC, with a 88E6161 six-port gigabit ethernet switch with five PHYs (providing 1 WAN and 4 LAN ports and an interface to the CPU), and a mini-PCIe slot for a wireless card. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
| * | [ARM] Orion: add LaCie Ethernet Disk mini V2 supportChristopher Moore2008-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the LaCie Ethernet Disk mini V2. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr> Signed-off-by: Christopher Moore <moore@free.fr> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
* | | Merge branch 'pxa-all' into develRussell King2008-10-094-86/+4246
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/include/mach/hardware.h arch/arm/mach-pxa/spitz.c
| * \ \ Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-armRussell King2008-10-071-0/+1678
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pxa-viper' into pxa-machines Conflicts: arch/arm/mach-pxa/Makefile drivers/pcmcia/Kconfig drivers/pcmcia/Makefile
| | * | | Add default configuration for Arcom/Eurotech Viper SBCMarc Zyngier2008-09-091-0/+1678
| | |/ / | | | | | | | | | | | | Signed-off-by: Marc Zyngier <marc.zyngier@altran.com>
| * | | Merge branch 'pxa-palm' into pxa-machinesRussell King2008-10-071-0/+951
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/mfd/Kconfig drivers/pcmcia/Makefile
| | * | | [ARM] 5238/2: Very basic Palm Zire 72 supportSergey Lapin2008-09-261-0/+951
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | |
| | \ \
| *-. \ \ Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', ↵Russell King2008-10-0721-337/+19038
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | | | | | | | | | | | | | | | 'pxa-mitac', 'pxa-mp900', 'pxa-zylonite' and 'pxa-zaurus' into pxa-machines Conflicts: arch/arm/mach-pxa/poodle.c
| | * | [ARM] 5285/1: pxa: update xm_x2xx_defconfigMike Rapoport2008-10-071-86/+151
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | [ARM] 5286/2: pxa: rename cm-x270* to cm-x2xx* to allow addition of cm-x255 ↵Mike Rapoport2008-10-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>