summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* [ARM] s3c: S3C options should depend on PLAT_S3CRussell King2008-12-211-15/+8
| | | | | | | This avoids non-Samsung builds being asked about Samsung specific configuration options. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge git://git.marvell.com/orion into develRussell King2008-12-2020-443/+642
|\
| * [ARM] mv78xx0: implement GPIO and GPIO interrupt supportLennert Buytenhek2008-12-205-6/+71
| | | | | | | | | | Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * [ARM] Kirkwood: implement GPIO and GPIO interrupt supportLennert Buytenhek2008-12-205-6/+75
| | | | | | | | | | Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * [ARM] Orion: share GPIO IRQ handling codeLennert Buytenhek2008-12-205-172/+200
| | | | | | | | | | | | | | Split off Orion GPIO IRQ handling code into plat-orion/. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * [ARM] Orion: share GPIO handling codeLennert Buytenhek2008-12-2011-271/+308
| | | | | | | | | | | | | | | | Split off Orion GPIO handling code into plat-orion/, and add support for multiple sets of (32) GPIO pins. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
* | Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into develRussell King2008-12-198-25/+127
|\ \ | |/ |/|
| * Merge branch 'for-rmk-misc' into for-rmkUwe Kleine-Koenig2008-12-1217-35/+73
| |\
| | * at91: warn if irqs are enabled in set_next_eventUwe Kleine-König2008-12-121-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thomas claims that irqs are disabled when set_next_event is called. But David and Remy claim they saw irqs being enabled here. As both sides don't seem to have time to investigate here, start with a warning that might trigger if the problem still exists. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-By: David Brownell <dbrownell@users.sourceforge.net> Cc: Bill Gatliff <bgat@billgatliff.com> Acked-By: Remy Bohmer <linux@bohmer.net> Cc: Thomas Gleixner <tglx@linutronix.de>
| | * remove a superfluous kconfig type definitionUwe Kleine-König2008-12-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's either bool default y or def_bool y but not a mixture of both. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * 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>
| | * small doc fix: ftrace_dyn_arch_init is called by ftrace_initUwe Kleine-König2008-12-121-1/+1
| | | | | | | | | | | | | | | | | | ... not kstop_machine. Add a note that irqs are disabled. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | netx: define register MEMCRUwe Kleine-König2008-12-091-0/+22
| | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | netx/xc: add a few "const"s to fix compiler warningsUwe Kleine-König2008-12-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the fixed warnings are: arch/arm/mach-netx/xc.c: In function ‘xc_request_firmware’: arch/arm/mach-netx/xc.c:152: warning: assignment discards qualifiers from pointer target type arch/arm/mach-netx/xc.c:162: warning: assignment discards qualifiers from pointer target type Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | netx: add support for clockeventsUwe Kleine-König2008-12-092-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | This is based on a patch by Luotao Fu <lfu@pengutronix.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Luotao Fu <lfu@pengutronix.de> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | netx: enable GENERIC_TIMEUwe Kleine-König2008-12-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | the needed infrastructure is already in place, only selecting GENERIC_TIME was missing. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | netx: Use a cpp symbol for the clocksource timer numberUwe Kleine-König2008-12-091-5/+7
| | | | | | | | | | | | | | | | | | | | | instead of hardcoding the same value each time. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | mach-netx/time.c: codingstyle cleanupUwe Kleine-König2008-12-091-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent cluttering the next patches with noop noise, do the cleanup in this separate patch: - use tab to indent - break comments before column 80 Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | [ARM] s3c: define __io using the typesafe versionRussell King2008-12-181-1/+1
| | | | | | | | | | | | | | | | | | as per 0560cf5aa51216b06874333a2fa26ca034d97bdb 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 King2008-12-1821-80/+77
|\ \ \
| * | | [ARM] MXC: do not include mach/hardware.h from mach/memory.hSascha Hauer2008-12-188-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | Instead of including other header files, define PHYS_OFFSET directly Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | [ARM] MXC: do not include mach/hardware.h from mach/timex.hSascha Hauer2008-12-184-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | Instead of including other header files, define CLOCK_TICK_RATE directly Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | [ARM] MXC: remove dependency to other include files from irqs.hSascha Hauer2008-12-1813-52/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the inclusion of mach/hardware.h from mach/irqs.h and switches to more meaningful names for the irq related macros. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | [ARM] MX1/MX2 DMA: add missing local_irq_restore()Sascha Hauer2008-12-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a missing call to local_irq_restore() and fixes some compiler warnings about unused variables for MX1. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | [ARM] MX27ads: fix function nameSascha Hauer2008-12-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | [ARM] MX1: Add missing selection of ARM920TSascha Hauer2008-12-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The MX1 only has one possible CPU type, ARM920T. Select it in Kconfig. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into develRussell King2008-12-18170-1151/+10308
|\ \ \ \
| * | | | [ARM] S3C64XX: Ensure CPU_V6 is selectedBen Dooks2008-12-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Select CPU_V6 with the S3C64XX series. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | [ARM] S3C: Remove unnecessary <linux/delay.h> includesBen Dooks2008-12-1810-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per Russell King's last review comment, find and remove all unnecessary includes of <linux/delay.h> in the files that do not need them. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | [ARM] S3C24A0: Remove duplicate <mach/io.h> fileBen Dooks2008-12-181-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit 39263db7986bf15c753f6847699107bdf5a2e318 added a default <mach/io.h> implementation which is shared if needed between all the s3c implementations. Remove the s3c24a0 version which is the same as this. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | [ARM] S3C64XX: Remove __virt_to_bus/__bus_to_virt macrosBen Dooks2008-12-181-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes for ARM highmem support have removed the need for the __virt_to_bus and __bus_to_virt macros, so remove them from this build. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | [ARM] S3C24XX: Add fourth UART definition for S3C2443Ben Dooks2008-12-183-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the fourth UART definition for the S3C2443, and at the same time fixup the problems caused by the enlarging of the UART array in the previous commits. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | [ARM] S3C: Update CONFIG_SERIAL_SAMSUNG_UARTS handlingBen Dooks2008-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the usage of CONFIG_SERIAL_SAMSUNG_UARTS in several places in the kernel where it had been missed. This finishes fixing a long standing issue where S3C2443 and S3C64XX could not use the 4th UART Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | | | Merge branch 'next-s3c64xx-device' into next-mergedBen Dooks2008-12-1881-218/+4027
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-s3c2440/mach-at2440evb.c
| | * | | | [ARM] SMDK6410: Add LCD (LCD48WVGA) definitionsBen Dooks2008-12-152-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the LCD 48WVGA module attached to the SMDK6410. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | | | [ARM] S3C64XX: Add standard S3C64XX 24BPP LCD GPIO setupBen Dooks2008-12-153-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a standard helper to configure the LCD output pins for a 24BPP display with VSYNC/HSYNC/VDEN. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | | | [ARM] S3C: Add new FB device definitionBen Dooks2008-12-155-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a device definition for the new S3C framebuffer driver. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | | | [ARM] S3C: Add i2c1 device definitionBen Dooks2008-12-158-2/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add device definition and support functions for the second i2c device (i2c1). If this is selected, the first i2c bus will become index 0 instead of index -1. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | | | [ARM] S3C: Add register defines for new style framebufferBen Dooks2008-12-153-0/+698
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide the initial register definitions for the newer style of framebuffer cores found in the Samsung SoCs such as S3C2450, S3C64XX. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | | | [ARM] S3C: Fix SDHCI setup compilationBen Dooks2008-12-151-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the compilation of the SDHCI configuration/setup functions to depend on their respective configuration variables. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | | | [ARM] S3C6410: Fix gpio configuration for channel 1.Ben Dooks2008-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Select the correct GPIO configuration function for channel 1 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | | | [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] SMDK6410: Add availability of second hsmmc channelBen Dooks2008-12-152-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SDHCI channel 1. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | | | [ARM] S3C: Add header for initial i2c device core setup.Ben Dooks2008-12-152-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a header to define setup functions for the i2c devices. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | | | [ARM] SMDK6410: Add I2C device board informationBen Dooks2008-12-151-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the I2C devices on the SMDK6410. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | | | [ARM] SMDK6410: Add second I2C channel.Ben Dooks2008-12-152-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the second I2C channel on the SMDK6410. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | | | [ARM] S3C64XX: Setup functions for i2c bus 1.Ben Dooks2008-12-153-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add common gpio setup for i2c bus 1 on all current S3C64XX architectures. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | | | [ARM] SMDK6410: Add i2c deviceBen Dooks2008-12-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add i2c bus 0 to the configuration Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | | | [ARM] S3C64XX: Add i2c device setup for I2C device 0Ben Dooks2008-12-153-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the necessary device initialisation information for I2C device 0. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
OpenPOWER on IntegriCloud