aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
Commit message (Collapse)AuthorAge
* Merge branch 'for-rmk' of git://git.android.com/kernel into develRussell King2008-10-22
|\
| * [ARM] msm: rename ARCH_MSM7X00A to ARCH_MSMBrian Swetland2008-10-22
| | | | | | | | | | | | | | | | | | | | | | 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-22
|\ \ | | | | | | | | | 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-21
| |/ | | | | | | | | | | | | | | | | 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-17
|/ | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge branch 'omap-all' into develRussell King2008-10-14
|\ | | | | | | | | | | | | Conflicts: arch/arm/mach-omap2/gpmc.c arch/arm/mach-omap2/irq.c
| * ARM: OMAP3: Add default kernel config for OMAP LDPNishant Kamat2008-10-10
| | | | | | | | | | | | | | | | | | | | 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-10
| | | | | | | | | | | | | | | | | | | | | | | | 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-09
| | | | | | | | | | | | | | | | | | | | | | | | 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-09
|\ \ | | | | | | | | | Merge branch 'orion-devel' into devel
| * | [ARM] Orion: Add Buffalo Linkstation Mini supportAlexey Kopytko2008-09-25
| | | | | | | | | | | | | | | | | | | | | 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-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-25
| | | | | | | | | | | | | | | | | | | | | | | | 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-09
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-07
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-09
| | |/ / | | | | | | | | | | | | Signed-off-by: Marc Zyngier <marc.zyngier@altran.com>
| * | | Merge branch 'pxa-palm' into pxa-machinesRussell King2008-10-07
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/mfd/Kconfig drivers/pcmcia/Makefile
| | * | | [ARM] 5238/2: Very basic Palm Zire 72 supportSergey Lapin2008-09-26
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-07
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | | | | | | | | | | | | | | | '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-07
| | | | | | | | | | | | | | | | | | | | | | | | 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-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | [ARM] 5216/1: Add CM-X300 defconfigMike Rapoport2008-08-26
| |/ / | | | | | | | | | | | | | | | 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>
* | | Merge branch 'at91' into develRussell King2008-10-09
|\ \ \
| * | | [ARM] 5260/1: [AT91] Touchscreen on AT91SAM9RLAndrew Victor2008-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds initialization of the Touchscreen controller for the AT91SAM9RL processor. Signed-off-by: Justin Waters <justin.waters@timesys.com> Signed-off-by: Dan Liang <dan.liang@atmel.com> Signed-off-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 5219/2: MACB ethernet support for AFEB9260Sergey Lapin2008-09-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MACB ethernet support for AFEB9260 Depends on 5210/2 Acked-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Sergey Lapin <slapin@ossfans.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 5210/2: AFEB9260: board supportSergey Lapin2008-09-18
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for AT91SAM9260-based board AFEB9260 which is a product from both Open Source design which runs Open Source software. Some commertial projects are made with this design. A board is basically AT91SAM9260-EK with some modifications and different peripherals and different parts used. Main purpose of this project is to gain experience in hardware design. More info: http://groups.google.com/group/arm9fpga-evolution-board (In Russian only, sorry). Subversion repository: svn://194.85.238.22/home/users/george/svn/arm9eb By this patch only basic functionality is provided. Signed-off-by: Sergey Lapin <slapin@ossfans.org> Acked-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'ptebits' into develRussell King2008-10-09
|\| | | | | | | | | | | | | | | | | Conflicts: arch/arm/Kconfig
| * | Merge branch 'omap-rmk'Russell King2008-08-27
| |\ \
| | * | [ARM] OMAP: Add and update OMAP default configuration filesRussell King2008-08-27
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | [ARM] orion5x: update defconfig to v2.6.27-rc4Nicolas Pitre2008-08-22
| | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | [ARM] Orion: activate lm75 driver on DNS-323Martin Michlmayr2008-08-21
| |/ | | | | | | | | | | | | | | | | | | 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>
* / [ARM] 5256/1: Update jornada default configKristoffer Ericson2008-10-01
|/ | | | | | | | | | | | | This patch updates the jornada default config (which was made for 2.6.12). Plenty of development has happend since then, most importantly the SSP driver and kbd/touchscr. This config has been tested to compile and bootup properly. Signed-off-by: Kristoffer Ericson <Kristoffer.Ericson@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] Orion: enable CONFIG_RTC_DRV_S35390A in the defconfg for QNAP devicesMartin Michlmayr2008-08-09
| | | | | | | 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>
* [ARM] Orion: enable RTC_DRV_PCF8563 in the defconfig for HP mv2120Martin Michlmayr2008-08-09
| | | | | | | | 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>
* [ARM] Orion: enable KEYBOARD_GPIO in the defconfgMartin Michlmayr2008-08-09
| | | | | | | | 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>
* Fix rename of at91_nand -> atmel_nandPieter du Preez2008-08-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* [ARM] update defconfig for eseries.Ian Molton2008-07-26
| | | | Signed-off-by: Ian Molton <spyro@f2s.com>
* Merge branch 'pxa' into develRussell King2008-07-13
|\ | | | | | | | | | | | | Conflicts: arch/arm/configs/em_x270_defconfig arch/arm/configs/xm_x270_defconfig
| * [ARM] 5169/1: Defconfig for the EZX machinesStefan Schmidt2008-07-10
| | | | | | | | | | | | | | | | | | 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>
| * [ARM] 5036/2: Combine cm_x270_defconfig and em_x270_defconfig into ↵Mike Rapoport2008-06-02
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'imx' into develRussell King2008-07-10
|\ \ | | | | | | | | | | | | | | | Conflicts: arch/arm/mm/Kconfig
| * | i.MX27: Adding PCM038 platform supportJuergen Beisert2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | i.MX27: Add ADS platform supportJuergen Beisert2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | MX3: Add basic support for LogicPD i.MX31 LiteKitDaniel Mack2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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(+)
| * | MX31: add basic pcm037 board supportSascha Hauer2008-07-05
| | | | | | | | | | | | | | | | | | | | | This patch adds basic board support for phytecs pmc037 board. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | i.MX3: Add a basic default config for the imx31ads (reference only)Juergen Beisert2008-07-05
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| |
| \
| \
| \
| \
| \
| \
| \
*-------. \ Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', ↵Russell King2008-07-10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | 'omap-reviewed', 'rpc', 'rtc' and 's3c' into devel
| | | | | * [ARM] s3c2410_defconfig: update for current buildBen Dooks2008-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the s3c2410_defconfig for the current set of added patches. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | | | * [ARM] S3C24XX: Split serial driver into core and per-cpu driversBen Dooks2008-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | | | * [ARM] S3C24XX: s3c2410_defconfig: enable USB subset of driversBen Dooks2008-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable a subset of USB drivers which are useful for using on these devices. Signed-off-by: Ben Dooks <ben-linux@fluff.org>