summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'devel-stable' into develRussell King2010-05-175500-17953/+78713
|\ | | | | | | | | | | | | Conflicts: arch/arm/Kconfig arch/arm/include/asm/system.h arch/arm/mm/Kconfig
| * Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into ↵Russell King2010-05-1768-817/+2016
| |\ | | | | | | | | | devel-stable
| | * ARM: SAMSUNG: Update S3C2416 entry with S3C2450Ben Dooks2010-05-103-2/+9
| | | | | | | | | | | | | | | | | | | | | These devices are so similar that they share the same SoC ID code, so note this. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C2413: Update GPIO pull-up supportBen Dooks2010-05-102-0/+8
| | | | | | | | | | | | | | | | | | | | | Ensure the right get/set pull code is selected and assigned to the GPIO core. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C2416: Use s3c2440 style i2c controllerBen Dooks2010-05-101-0/+6
| | | | | | | | | | | | | | | | | | | | | The s3c2416 i2c controllers are compatible with the s3c2440 style i2c block, so change the device name appropriately. Signed-off-by: Ben Dooks <ben-linux@fluff.org>y
| | * ARM: S3C2416: Add support for OHCI on SMDK2416Ben Dooks2010-05-101-0/+5
| | | | | | | | | | | | | | | | | | | | | Add device definition and ensure that the host port is powered up at start time. Full power control can be added at a later date. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C2416: Add support for second HSMMC channelBen Dooks2010-05-104-2/+8
| | | | | | | | | | | | | | | | | | Add support for the second HSMMC channel on the S3C2416. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C2416: Add basic clock supportBen Dooks2010-05-105-1/+165
| | | | | | | | | | | | | | | | | | | | | | | | Add basic clock support for the PLLs, HSMMC channels and PWM clocks. This is enough to get a basic system up and running. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C2443: Move parts of the clock code to common clock fileBen Dooks2010-05-106-446/+505
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To share code with some of the newer parts such as the S3C2416, move parts of arch/arm/mach-s3c2443/clock.c to a common file called arch/arm/plat-s3c24xx/s3c2443-clock.c. Update the build configuration to deal with this new file. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C24XX: Identify S3C2416 if S3C2412/S3C2413 built inBen Dooks2010-05-101-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Extend the ARMv5 ID code to deal with S3C2416 being built with S3C2412/S3C2413 enabled, as these have their ID registers in a different place. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C2416: Add initial support of SMDK2416Yauhen Kharuzhy2010-05-103-0/+151
| | | | | | | | | | | | | | | | | | | | | Add support of SMDK2416 development board. Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C2416: Add arch supportYauhen Kharuzhy2010-05-1010-3/+462
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add arch/arm/mach-s3c2416 for support of the Samsung S3C2416 SoC. This patch adds support of the S3C2416 SoC, clocks, timers, and initial IRQ support (without support of secondary set of registers). Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com> [ben-linux@fluff.org: removed files to be reworked, fixed conflicts] [ben-linux@fluff.org: use s3c2443 reset instead of specific reset code] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: SAMSUNG: Add s3c_disable_clocks() and tidy init+disable usageBen Dooks2010-05-104-35/+23
| | | | | | | | | | | | | | | | | | | | | | | | Add s3c_disable_clocks() and change the clock registration code to use the s3c_register_clocks() followed by s3c_disable_clocks() instead of the loops it was using. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: SAMSUNG: Move S3C6400 PLL code to <plat/pll.h> for re-useBen Dooks2010-05-102-32/+54
| | | | | | | | | | | | | | | | | | | | | The S3C6400 EPLL code matches the S3C2416 and compatible SoCs, so move it from mach-s3c64xx into <plat/pll.h> for easy reuse. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C2416: Add S3C2416-specific registers definitionsYauhen Kharuzhy2010-05-107-2/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add macros for S3C2416 SoC support. Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com> [ben-linux@fluff.org: removed files that need changing] [ben-linux@fluff.org: Fix S3C2416_GPH0_TXD0 definition] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * serial: Use s3c2440 driver for S3C2416 SoCYauhen Kharuzhy2010-05-061-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | UARTs in the S3C2416 are almost same as in S3C2443 and can be handled by s3c2440 serial driver. Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C: Add S3C2416 detection to uncompress codeYauhen Kharuzhy2010-05-061-1/+3
| | | | | | | | | | | | | | | | | | | | | Add S3C2416 serial port setup to uncompress code. Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C24XX: Remove _INP macros in <mach/regs-gpioj.h>Ben Dooks2010-05-061-13/+0
| | | | | | | | | | | | | | | | | | Remove the _INP definitions, they are all zero and also unused Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C24XX: Remove S3C2410_GPJ numberingBen Dooks2010-05-061-19/+0
| | | | | | | | | | | | | | | | | | | | | Remove the old S3C2410_GPJ as we will be moving to the new gpiolib based driver code and these numbers will become invalid. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C24XX: Wrapper s3c2410_gpio_setpin and s3c2410_gpio_pullup()Ben Dooks2010-05-061-28/+19
| | | | | | | | | | | | | | | | | | | | | | | | Change s3c2410_gpio_setpin() and s3c2410_gpio_pullup() to use the new s3c_ gpio configuration calls until all their users are converted. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C2410: Remove the users of s3c2410_gpio_pullup()Ben Dooks2010-05-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the last s3c2410_gpio_pullup() users in arch/arm/mach-s3c2410 Note, since mach-h1940.c is setting output and a pull-up, the call has vbeen chanerd to S3C_GPIO_PULL_NONE instead of S3C_GPIO_PULL_UP. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: mini2440: Move to using gpiolib API and s3c_gpio functionsBen Dooks2010-05-061-9/+9
| | | | | | | | | | | | | | | | | | | | | Move the mach-mini2440 to using the gpiolib API for GPIOS it directly uses, and s3c_gpio calls for configuration. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C24XX: Remove s3c2410_gpio_getcfg(), implement s3c_gpio_getcfg()Ben Dooks2010-05-065-21/+39
| | | | | | | | | | | | | | | | | | | | | Add s3c_gpio_getcfg() and change anything using s3c2410_gpio_getcfg() to use this instead. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: SAMSUNG: Add GPIO configuration read callsBen Dooks2010-05-065-1/+100
| | | | | | | | | | | | | | | | | | | | | Add the necessary 1,2 and 4 bit configuration read calls for the new gpio code to allow removal of the old s3c24xx gpio code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C24XX: Remove s3c2410_gpio_getirq()Ben Dooks2010-05-062-20/+1
| | | | | | | | | | | | | | | | | | | | | Remove s3c2410_gpio_getirq() as the only users is the pm code, and it can be replicated by using gpio_to_irq(). Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C24XX: Remove s3c2410_gpio_getpull()Ben Dooks2010-05-062-25/+0
| | | | | | | | | | | | | | | | | | Remove the unused s3c2410_gpio_getpull() Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C24XX: Remove s3c2410_gpio_setcfg()Ben Dooks2010-05-062-59/+24
| | | | | | | | | | | | | | | | | | | | | | | | Remove the implementation of s3c2410_gpio_setcfg() as it should now be functionally equivalent to s3c_gpio_cfgpin(), and add a wrapper for those drivers that are still using this call. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C24XX: Drop s3c2410 specific s3c2410_gpio_cfgpin()Ben Dooks2010-05-0615-44/+55
| | | | | | | | | | | | | | | | | | | | | | | | The s3c_gpio_cfgpin() call should be functionally equivalent, so replace the s3c2410_gpio_cfgpin() calls in the s3c24xx code with s3c_gpio_cfgpin to allow moving away from a fixed GPIO number to register address mapping Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C24XX: Change s3c2410_gpio_pullupl(x, 1) to use s3c_gpio_cfgpull()Ben Dooks2010-05-063-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start moving code that is using the old s3c2410_gpio API to using the newer s3c_gpio variants by finding all the usages of s3c2410_gpio_pullup() which disable the pin's pull up and replacing them. sed 's/s3c2410_gpio_pullup\(.*\), 1/s3c_gpio_cfgpull\1, S3C_GPIO_PULL_NONE/g' Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C2410: Change s3c2410_gpio_pullupl(x, 1) to use s3c_gpio_cfgpull()Ben Dooks2010-05-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start moving code that is using the old s3c2410_gpio API to using the newer s3c_gpio variants by finding all the usages of s3c2410_gpio_pullup() which disable the pin's pull up and replacing them. sed 's/s3c2410_gpio_pullup\(.*\), 1/s3c_gpio_cfgpull\1, S3C_GPIO_PULL_NONE/g' Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: VR1000: Update mach-vr1000.c to use gpiolib APIBen Dooks2010-05-061-2/+3
| | | | | | | | | | | | | | | | | | Change mach-vr1000.c to use gpiolib for gpio control. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: BAST: Update mach-bast to use gpiolib APIBen Dooks2010-05-061-3/+3
| | | | | | | | | | | | | | | | | | | | | Change mach-bast .c to use gpiolib for the GPIO lines that are directly manipulated by it. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: n30: Update mach-n30 to use gpiolib APIBen Dooks2010-05-061-2/+5
| | | | | | | | | | | | | | | | | | | | | Change mach-n30.c to use gpiolib for the GPIO lines that are directly manipulated by it. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: QT2410: Update mach-qt2410 to use gpiolib APIBen Dooks2010-05-061-3/+4
| | | | | | | | | | | | | | | | | | | | | Change mach-qt2410.c to use gpiolib for the GPIO lines that are directly manipulated by it. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: H1940: Change mach-h1940 to use gpiolib APIBen Dooks2010-05-062-11/+12
| | | | | | | | | | | | | | | | | | | | | Change mach-h1940 to use the gpiolib calls instead of s3c2410_gpio directly. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: JIVE: Update mach-jive to use gpiolib APIBen Dooks2010-05-061-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change mach-jive to use gpiolib for the GPIO lines that are directly manipulated by it. Note, we ignore any errors from gpio_request(), unlikely to see any. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: H1940: Change h1940-bluetooth to use gpiolib APIBen Dooks2010-05-061-4/+12
| | | | | | | | | | | | | | | | | | | | | Change the h1940-bluetooth driver to use gpiolib to set the output state of GPH1. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C24XX: Add extended GPIO used on S3C2443 and beyondBen Dooks2010-05-064-5/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the GPIO banks that are used on the S3C2443 and above to the list of available GPIOS. Currently we do not have any limit on the SoC GPIO, so these are being registered whether the SoC has them or not. It is currently up to the user not to try and use them. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C24XX: Add the gpio pull configuration for pull-upBen Dooks2010-05-066-0/+61
| | | | | | | | | | | | | | | | | | | | | Add the necessary gpio configuration helper for the devices which have a single-bit pull-up resistor disabled. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: S3C24XX: Add initial s3c_gpio configuration codeBen Dooks2010-05-064-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for s3c_gpio_setcfg() and s3c_gpio_setpull() implementations to get ready for removal of the specific code being used by s3c24xx. Also rename the s3c_gpio_setcfg_s3c24xx_banka to s3c_gpio_setcfg_s3c24xx_a as seen in the header file to correct a build warning. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | Merge branch 'master' of ↵Russell King2010-05-146-6/+574
| |\ \ | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
| | * | [ARM] Kirkwood: merge net2big_v2 and net5big_v2 board setupsSimon Guinot2010-05-033-394/+120
| | | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
| | * | [ARM] Kirkwood: add LaCie 5Big Network v2 supportSimon Guinot2010-05-033-0/+362
| | | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
| | * | [ARM] Kirkwood: add LaCie 2Big Network v2 supportSimon Guinot2010-05-033-0/+341
| | | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
| | * | update MAINTAINERS fileNicolas Pitre2010-05-031-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm no longer at Marvell. Ditto for Lennert. I don't hack on SMC91x much either these days. Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
| | * | [ARM] dns323-setup.c: fix WARN() when bootingArnaud Patard2010-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit b2a731aa5cbca7e0252da75e16de7ae5feb1313a, dns323_init() is setting the power led gpio direction with gpio_direction_output() but doesn't request the gpio before (which is not permitted by the gpio layer afaik). This behaviour is triggering a WARN() at boot time. Tested-by: Christian Samsel <csamsel@gmxpro.de> Cc: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Nicolas Pitre <nico@marvell.com> [ Part 2: "Attached Text" ]
| | * | [ARM] Kirkwood: Marvell GuruPlug supportSiddarth Gore2010-05-033-0/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0 GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot References: http://www.globalscaletechnologies.com/t-guruplugdetails.aspx http://plugcomputer.org This patch is for GuruPlug Plus, but it supports Standard version as well. Signed-off-by: Siddarth Gore <gores@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | | Merge branch 'devel' of ↵Russell King2010-05-13297-5113/+4981
| |\ \ \ | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
| | * | | [ARM] pxa: add namespace on sspHaojian Zhuang2010-05-114-87/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to prevent code ambiguous, add namespace on functions in ssp driver. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| | * | | [ARM] mmp: append device support in jasperHaojian Zhuang2010-05-111-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support regulator MAX8649, PMIC MAX8925 into the Jasper. Backlight & power supply components of MAX8925 are enabled in Jasper. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>