summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next-s3c24xx' into next-mergedBen Dooks2008-12-1850-765/+1800
|\
| * [ARM] S3C24XX: ADC driver coreBen Dooks2008-12-185-1/+418
| | | | | | | | | | | | | | | | A common core driver for the S3C24XX ADC block so that the touchscreen, hwmon and any other drivers can share the resource. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C: Add UART FIFO selection during arch decompressionBen Dooks2008-12-162-0/+36
| | | | | | | | | | | | | | | | | | | | Add a configuration option to start the UART FIFOs during the decompressions sequence to improve boot time when the bootloader fails to enable the UART FIFOs. For example, the SMDK6410 UBoot 1.1.6 leaves the FIFOs off. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C: Fix scaler1 clock rate informationBen Dooks2008-12-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | The pwm-scaler0 and pwm-scaler1 clocks have their .id field set to -1 as they are not referenced to any specific device. However, parts of the pwm-clock code used the .id field to identify which scaler clock was being used. Fix the problem by comparing against the pointer to the clock to identify the scalers. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C: Add set_rate/round_rate methods for pwm-scaler clockBen Dooks2008-12-151-4/+47
| | | | | | | | | | | | | | Add the set_rate and round_rate methods for the pwm-scaler clock for use with the time code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C24XX: Reduce code lineage of gpiolib.cBen Dooks2008-12-151-27/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | All the s3c24xx gpiolib chips share the same get/set calls and all but one bank shares the same calls for .direction_input and .direction_output methods. Change the initialisation process to use an new call to register the chips that fills in any blank calls with the default values to avoid having to fill them in the structure initialisers. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C: BUG_ON() if clock has already been registeredBen Dooks2008-12-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | Add a simple check when registering a clock on whether the clock has already been added to the list. Any attempt to re-register a clock will cause the clock list to be come looped and thus produces silent failures when looking up clocks. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C: Move pwm-clock.c to arch/arm/plat-s3cBen Dooks2008-12-153-2/+2
| | | | | | | | | | | | | | Move pwm-clock.c to arch/arm/plat-s3c to be shared with the S3C64XX implementations. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C: Move core clock support to plat-s3cBen Dooks2008-12-153-314/+357
| | | | | | | | | | | | | | | | Move the core clock registration and definitions in arch/arm/plat-s3c24xx/clock.c to arch/arm/plat-s3c to be shared with the S3C64XX implementations. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C: Move time.c to arch/arm/plat-s3cBen Dooks2008-12-153-5/+5
| | | | | | | | | | | | | | Move time.c to arch/arm/plat-s3c to be shared with the S3C64XX implementations. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C: Move S3C2410_EXTINT to common regs-irqtype.h headerBen Dooks2008-12-153-7/+22
| | | | | | | | | | | | | | Add a common include file (regs-irqtype.h) for the IRQ trigger control register values S3C2410_EXTINT*. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C24XX: Move headers from plat-s3c24xx to plat-s3cBen Dooks2008-12-153-4/+3
| | | | | | | | | | | | | | Move clock.h, cpu.h and devs.h to plat-s3c for use with the s3c64xx support. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C24XX: Update clock data on resumeBen Dooks2008-12-157-36/+104
| | | | | | | | | | | | | | | | | | Update the clock settings on resume for suspend/resume support so that if the boot loader changes anything or the system's PLL is reset then we return with the correct settings. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C24XX: Change clock locking to use spinlocks.Ben Dooks2008-12-153-18/+23
| | | | | | | | | | | | | | | | We cannot sleep if we have cpufreq pm enabled during some of the clock operations, so change to use a spinlock to protect the clock system. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] CPUFREQ: S3C24XX serial CPU frequency scaling support.Ben Dooks2008-12-152-0/+102
| | | | | | | | | | | | | | Add support for CPU frequency scalling to the S3C24XX serial driver. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C24XX: Split pll code out of regs-clock.hBen Dooks2008-12-157-41/+49
| | | | | | | | | | | | | | | | | | | | | | | | Move the PLL calculation code into it's own header file for re-use with the other plat-s3c24xx based systems such as the S3C24A0. Note, we change the name of s3c2410_get_pll to the more generically named s3c24xx_get_pll as well as the related defintions. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C24XX: Split DCLK/CLKOUT definitions out of clock.cBen Dooks2008-12-156-171/+204
| | | | | | | | | | | | | | | | | | Only certain boards need these clocks, and they are not available on some CPUs (such as the S3C24A0) so remove them from arch/arm/plat-s3c24xx/clock.c and into their own file with appropriate Kconfig entries. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C24XX: Move initialisation code to arch/arm/plat-s3cBen Dooks2008-12-1513-155/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to add plat-s3c to the build to get the headers that will go in here once moved from include/asm-arm so we may as well put some useful common s3c code in here to stop the errors generated form having nothing built. The cpu setup is now passed the cpu idcode and the table of supported cpus to s3c_init_cpu() to abstract the cpu identification out of the initial io setup. As well as moving the cpu initialisation code, we move the map of the board specific items up to the calling code as none of the map_io() functions actually do anything other than pass this to iotable_init(). This patch does not rename any of the init functions that will be common to s3c24xx and any other s3c architectures as this can be done at a later date as it will touch all the board support files which use functions such as s3c24xx_init_clocks() and s3c24xx_init_uarts(). Note, the header arch/arm/plat-s3c24xx/include/plat/cpu.h still has functions that are used by both the cpu and board initialisation functions. This means that each board has definitions specific to the cpu support included and the vice-versa. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C24XX: Add default <mach/io.h> headerBen Dooks2008-12-151-0/+18
| | | | | | | | | | | | | | | | Add a default header for <mach/io.h> for systems such as the S3C24A0 which do not need any of the complex code that the S3C2410 uses. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C24XX: Move vmalloc.h to plat-s3cBen Dooks2008-12-151-1/+1
| | | | | | | | | | | | | | | | vmalloc.h is common across all the current s3c platforms, so move it to arch/arm/plat-s3c/include/mach to be used for all the targets. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C: Make <mach/timex.h> commonBen Dooks2008-12-151-0/+0
| | | | | | | | | | | | | | Move <mach/timex.h> to arch/arm/plat-s3c/include/mach/timex.h so it can be the default for all S3C based architectures. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C2410: Move base clock code to plat-s3c24xxBen Dooks2008-12-155-6/+9
| | | | | | | | | | | | | | | | Move the S3C2410 base clock list to arch/arm/plat-s3c24xx as this code is common to the S3C2410, S3C2440 and S3C2442 cpus. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C: Add <plat/cpu-freq.h> for initial cpufreq definitionsBen Dooks2008-12-151-0/+94
| | | | | | | | | | | | | | This is the header file that defines the basic cpu frequency scalling support for the Samsung S3C series of SoC. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C24XX: Default SPI pin configuration for SPIBen Dooks2008-12-155-0/+105
| | | | | | | | | | | | | | | | Add a set of default pin configuration routines for setting up the SPI gpio configuration when using the hardware SPI driver. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] AT2440EVB: LCD frame buffer support.Ben Dooks2008-12-181-0/+36
| | | | | | | | | | | | | | Add LCD frame buffer support for AT2440EVB board. Signed-off-by: Ramax Lo <ramaxlo@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] S3C24XX: AT2440EVB MMCBen Dooks2008-12-181-0/+8
| | | | | | | | | | | | | | Add SD/MMC support for AT2440EVB board. Signed-off-by: Ramax Lo <ramaxlo@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] ANUBIS: Add SM501 GPIO and update I2C setupBen Dooks2008-12-181-0/+5
| | | | | | | | | | | | | | | | Add GPIO support to the SM501 on the Simtec Anubis, and then add the necessary updates for allowing the two gpio I2C busses to be used. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] S3C24XX: Add extra GPIOs via KconfigBen Dooks2008-12-183-0/+29
| | | | | | | | | | | | | | Add Kconfig entries to allow more GPIO space to be specified depending on the machine(s) selected. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] JIVE: fix spi gpio implementationBen Dooks2008-12-181-2/+4
|/ | | | | | | Fix the name of the driver, as well as the fact we are not passing the number of chipselects to the driver. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* Merge git://git.marvell.com/orion into develRussell King2008-12-13294-2409/+5979
|\
| * [ARM] Kirkwood: update defconfigNicolas Pitre2008-12-111-90/+239
| | | | | | | | Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * [ARM] Feroceon: pass proper -mtune argument to gccNicolas Pitre2008-12-111-0/+1
| | | | | | | | | | | | | | | | Compilation for the Feroceon core should use -mtune=marvell-f. This is available in Code Sourcery's 2008Q3 release at the moment. Otherwise fall back to -mtune-=xscale. Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * [ARM] Kirkwood: properly handle the WAN port on newer RD88F6281 boardsRonen Shitrit2008-12-111-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | On newer versions of the RD88F6281 board, the WAN port is connected to its own ethernet port on the CPU, via a separate PHY, whereas on older versions of the board, it is connected to one of the PHYs in the ethernet switch. In the RD8F6281 setup code, detect which version of the board we are running on, and instantiate the ethernet ports and switch driver accordingly. Signed-off-by: Ronen Shitrit <rshitrit@marvell.com> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * [ARM] Kirkwood: allow instantiating the second ethernet portRonen Shitrit2008-12-113-0/+60
| | | | | | | | | | | | | | | | | | | | The 88f6192 and 88f6281 Kirkwood SoCs support two ethernet ports. Add the platform glue that will allow board support files to instantiate the second ethernet port. Signed-off-by: Ronen Shitrit <rshitrit@marvell.com> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * [ARM] DNS323: Initialise 88F5182 correctlyMatt Palmer2008-12-111-4/+61
| | | | | | | | | | | | | | | | | | | | The 88F5182 found in the DNS-323 rev B1 (and some other devices, such as the CH3SNAS) require different initialisation of the SATA controller and MPP registers. Tested on a DNS-323 rev B1. Signed-off-by: Matt Palmer <mpalmer@hezmatt.org>
| * [ARM] DNS323: Read MAC address from flashMatt Palmer2008-12-111-16/+95
| | | | | | | | | | | | | | | | | | Based on similar code from the tsx09 series of machines, just rips the MAC address out of flash and stuffs it into the NIC. Tested on a DNS323 rev B1. It's possible (though unlikely) that an A1 will have the MAC in a different location in flash. Signed-off-by: Matt Palmer <mpalmer@hezmatt.org>
| * [ARM] Orion: add the option to support different ehci phy initializationRonen Shitrit2008-12-045-3/+25
| | | | | | | | | | | | | | | | | | The Orion ehci driver serves the Orion, kirkwood and DD Soc families. Since each of those integrate a different USB phy we should have the ability to use few initialization sequences or to leave the boot loader phy settings as is. Signed-off-by: Ronen Shitrit <rshitrit@marvell.com>
| * Linux 2.6.28-rc7v2.6.28-rc7Linus Torvalds2008-12-011-2/+2
| |
| * Merge branch 'for_linus' of ↵Linus Torvalds2008-12-0126-149/+410
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (25 commits) em28xx: remove backward compat macro added on a previous fix V4L/DVB (9748): em28xx: fix compile warning V4L/DVB (9743): em28xx: fix oops audio V4L/DVB (9742): em28xx-alsa: implement another locking schema V4L/DVB (9732): sms1xxx: use new firmware for Hauppauge WinTV MiniStick V4L/DVB (9691): gspca: Move the video device to a separate area. V4L/DVB (9690): gspca: Lock the subdrivers via module_get/put. V4L/DVB (9689): gspca: Memory leak when disconnect while streaming. V4L/DVB (9668): em28xx: fix a race condition with hald V4L/DVB (9664): af9015: don't reconnect device in USB-bus V4L/DVB (9647): em28xx: void having two concurrent control URB's V4L/DVB (9646): em28xx: avoid allocating/dealocating memory on every control urb V4L/DVB (9645): em28xx: Avoid memory leaks if registration fails V4L/DVB (9639): Make dib0700 remote control support work with firmware v1.20 V4L/DVB (9635): v4l: s2255drv fix firmware test on big-endian V4L/DVB (9634): Make sure the i2c gate is open before powering down tuner V4L/DVB (9632): make em28xx aux audio input work V4L/DVB (9631): Make s2api work for ATSC support V4L/DVB (9627): em28xx: Avoid i2c register error for boards without eeprom V4L/DVB (9608): Fix section mismatch warning for dm1105 during make ...
| | * em28xx: remove backward compat macro added on a previous fixMauro Carvalho Chehab2008-12-011-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 50f3beb50abe0cc0228363af804e50e710b3e5b0 fixed em28xx-alsa locking schema. However, a backport macro was kept. This patch removes the macro, since it is not needed for the module compilation against upstream. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| | * V4L/DVB (9748): em28xx: fix compile warningHans Verkuil2008-12-011-2/+0
| | | | | | | | | | | | | | | | | | | | | Label fail_unreg is no longer used. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| | * V4L/DVB (9743): em28xx: fix oops audioDouglas Schilling Landgraf2008-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced usb_kill_usb for usb_unlink_usb (wait until urb to fully stop require USB core to put the calling process to sleep). Oops: http://www.kerneloops.org/raw.php?rawid=71799&msgid= Signed-off-by: Douglas Schilling Landgraf <dougsland@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| | * V4L/DVB (9742): em28xx-alsa: implement another locking schemaMauro Carvalho Chehab2008-11-241-13/+24
| | | | | | | | | | | | | | | | | | | | | Instead of using a spinlock, it is better to call the proper pcm stream locking schema. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| | * V4L/DVB (9732): sms1xxx: use new firmware for Hauppauge WinTV MiniStickMichael Krufky2008-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New firmware image brings enhanced tuning performance. Firmware is available for download at the following location: http://www.steventoth.net/linux/sms1xxx Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| | * V4L/DVB (9691): gspca: Move the video device to a separate area.Jean-Francois Moine2008-11-242-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The video device was part of the gspca device. On device disconnection while streaming, the device structure is freed at close time. In this case, the remaining close job on the video device run out of allocated memory. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| | * V4L/DVB (9690): gspca: Lock the subdrivers via module_get/put.Jean-Francois Moine2008-11-242-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous subdriver protection against rmmod was done via the file operations table in the device descriptor. On device disconnection while streaming, the device structure was freed at close time, and the module_put still used the module name in the freed area. Now, explicit module get/put are done on open and close. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| | * V4L/DVB (9689): gspca: Memory leak when disconnect while streaming.Jean-Francois Moine2008-11-2410-10/+39
| | | | | | | | | | | | | | | | | | | | | | | | As a side effect, the sd routine stop0 is called on disconnect. This permits the subdriver to free its resources. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| | * V4L/DVB (9668): em28xx: fix a race condition with haldMauro Carvalho Chehab2008-11-201-53/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newer versions of hald tries to open it to call QUERYCAP. Due to the lack of a proper locking, it is possible to open the device before it finishes initialization. This patch adds a lock to avoid this risk, and to protect the list of em28xx devices. While here, remove the uneeded BKL lock. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| | * V4L/DVB (9664): af9015: don't reconnect device in USB-busJose Alberto Reguero2008-11-201-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't reconnect device in the USB-bus. Reconnect command was not executed every time by device firmware and that causes harm. Reconnection is not needed so remove it. Signed-off-by: Jose Alberto Reguero <jareguero@telefonica.net> Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| | * V4L/DVB (9647): em28xx: void having two concurrent control URB'sMauro Carvalho Chehab2008-11-203-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have a polling task for IR, there's a race condition, since IR can be polling while other operations are being doing. Also, we are now sharing the same urb_buf for both read and write control urb operations. So, we need a mutex. Thanks to Davin Heitmueller <devin.heitmueller@gmail.com> for warning me. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>