summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/include/mach/collie.h
Commit message (Collapse)AuthorAgeFilesLines
*-. Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and ↵Russell King2014-04-041-1/+3
|\ \ | | | | | | | | | 'unstable/sa11x0' into for-next
| | * ARM: 7936/1: sa1100: collie: add support for IrDA transceiverDmitry Eremin-Solenikov2014-02-121-1/+1
| |/ |/| | | | | | | | | | | | | Collie has onboard IrDA transceiver controlled via active-low gpio. Add corresponding platform data. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7991/1: sa1100: fix compile problem on CollieLinus Walleij2014-03-071-0/+2
|/ | | | | | | | | | | | | | | | | | | | | | Due to a problem in the MFD Kconfig it was not possible to compile the UCB battery driver for the Collie SA1100 system, in turn making it impossible to compile in the battery driver. (See patch "mfd: include all drivers in subsystem menu".) After fixing the MFD Kconfig (separate patch) a compile error appears in the Collie battery driver due to the <mach/collie.h> implicitly requiring <mach/hardware.h> through <linux/gpio.h> via <mach/gpio.h> prior to commit 40ca061b "ARM: 7841/1: sa1100: remove complex GPIO interface". Fix this up by including the required header into <mach/collie.h>. Cc: stable@vger.kernel.org Cc: Andrea Adami <andrea.adami@gmail.com> Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: fix lcd power build failure in collie_defconfigPaul Gortmaker2012-04-021-1/+2
| | | | | | | | | | | | | | | | | Commit 086ada54abaa4316e8603f02410fe8ebc9ba2de1 "FB: sa1100: remove global sa1100fb_.*_power function pointers" got rid of all instances but one in locomolcd.c -- which was conditional on CONFIG_SA1100_COLLIE. The associated .power field which replaces the global is populated in mach-sa1100/collie.c so move the assignment there, but make it conditional on the locomolcd support, so use CONFIG_BACKLIGHT_LOCOMO in that file. Cc: arm@kernel.org Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Olof Johansson <olof@lixom.net>
* [ARM] sa1100: remove unreferenced IRQ definitionsEric Miao2010-03-021-7/+0
| | | | | | | These IRQ definitions related to LOCOMO are never referenced anywhere, thus could be safely removed. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* collie: convert to gpiolib for ucb1x00Thomas Kunze2009-11-271-17/+18
| | | | | Only the parts used for collie_battery are converted. The rest will be cleaned up later.
* collie: prepare for gpiolib useThomas Kunze2009-11-271-16/+26
| | | | | prefix gpio definitions for direct register access with '_' so we can use the other names for gpio_request & co
* [ARM] 5430/1: collie_pm: use new GPIO API to control chargerDmitry Baryshkov2009-03-251-4/+3
| | | | | Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 5429/1: collie: start scoop converton to new apiDmitry Baryshkov2009-03-251-3/+4
| | | | | | | | Start converting scoop gpio access to new API instead of old deprecated one. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/machRussell King2008-08-071-0/+88
This just leaves include/asm-arm/plat-* to deal with. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
OpenPOWER on IntegriCloud