summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2412
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'origin' into develRussell King2009-03-281-2/+2
|\ | | | | | | | | Conflicts: sound/soc/pxa/pxa2xx-i2s.c
| * S3C24XX: Move and update IIS headersBen Dooks2009-03-051-2/+2
| | | | | | | | | | | | | | Move the IIS headers to their correct place. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | [ARM] S3C: Rename sleep.S functions to be non-cpu specificBen Dooks2009-03-081-1/+1
| | | | | | | | | | | | | | | | Rename s3c2410_cpu_resume to s3c_cpu_resume and s3c2410_cpu_save to s3c_cpu_save to remove the CPU specific naming of these functions which are now in the generic PM code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] S3C: Rename s3c2410_pm_init to s3c_pm_init.Ben Dooks2009-03-081-1/+1
| | | | | | | | | | | | | | | | Since we have moved a large proportion of the PM code to the common support area, remove the cpu specific name from the initialisation function. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] S3C: Move PM support functions to common locationBen Dooks2009-03-081-2/+2
|/ | | | | | | | Start moving the PM code by moving all the common support functions to a common location in arch/arm/plat-s3c. With the move we rename the functions from s3cxxx_ to s3c_ to fit the new location. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* [ARM] S3C: Remove unnecessary <linux/delay.h> includesBen Dooks2008-12-181-1/+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>
* Merge branch 'next-s3c64xx-device' into next-mergedBen Dooks2008-12-183-6/+11
|\ | | | | | | | | | | Conflicts: arch/arm/mach-s3c2440/mach-at2440evb.c
| * [ARM] S3C: Make i2c device definition common to plat-s3cBen Dooks2008-12-153-6/+11
| | | | | | | | | | | | | | Make the device i2c0 common to plat-s3c and move the definitions from arch/arm/plat-s3c24xx/devs.c Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | Merge branch 'next-s3c64xx' into next-mergedBen Dooks2008-12-181-6/+1
|\ \
| * | [ARM] S3C: Update time initialisation to fix S3C64XX time problemsBen Dooks2008-12-161-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | The S3C64XX timer is running at the wrong rate due to the assumptions made in the timer initialisation about the way the pwm dividers work. This means that time on the S3C64XX runs twice as fast as it should. Fix the problem by moving to using the clk framework to setup the pwm timer clock muxes, as the pwm-clock code has all the necessary knowledge of how the timer clock inputs are routed. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C64XX: Add initial clock frameworkBen Dooks2008-12-151-6/+0
| | | | | | | | | | | | | | | | Add the initial clocks definitions for the s3c6400 and s3c6410. Move the epll and ext clock from the s3c2443 support into the common code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | Merge branch 'next-s3c24xx' into next-mergedBen Dooks2008-12-181-5/+20
|\ \ | |/
| * [ARM] S3C24XX: Update clock data on resumeBen Dooks2008-12-151-3/+18
| | | | | | | | | | | | | | | | | | 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: Split pll code out of regs-clock.hBen Dooks2008-12-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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: Move initialisation code to arch/arm/plat-s3cBen Dooks2008-12-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] 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 branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into develRussell King2008-11-295-8/+8
|\
| * [ARM] S3C: Move plat/regs-spi.h to arch/arm/plat-s3c/include/plat.Ben Dooks2008-10-302-2/+2
| | | | | | | | | | | | | | Move plat/regs-spi.h to arch/arm/plat-s3c/include/plat ready ready to clean out old include directories. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C24XX: Movev udc headers to arch/arm/plat-s3c24xx/include/platBen Dooks2008-10-302-2/+2
| | | | | | | | | | | | | | | | Move the udc headers to the proper home in arch/arm/plat-s3c24xx/include/plat ready to clean out the old include directories. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C: Move regs-ac97.h to arch/arm/plat-s3c/include/plat.Ben Dooks2008-10-301-1/+1
| | | | | | | | | | | | | | Move regs-ac97.h to arch/arm/plat-s3c/include/plat ready to clean out old include directories. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C: Move nand headers to arch/arm/plat-s3c/include/platBen Dooks2008-10-302-2/+2
| | | | | | | | | | | | | | Move nand headers to arch/arm/plat-s3c/include/plat ready to clean out the old include directories. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C: Move i2c headers to arch/arm/plat-s3c/include/plat.Ben Dooks2008-10-301-1/+1
| | | | | | | | | | | | | | Move the i2c headers to arch/arm/plat-s3c/include/plat ready to clean out the old include directories. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] Hide ISA DMA API when ISA_DMA_API is unsetRussell King2008-11-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | When ISA_DMA_API is unset, we're not implementing the ISA DMA API, so there's no point in publishing the prototypes via asm/dma.h, nor including the machine dependent parts of that API. This allows us to remove a lot of mach/dma.h files which don't contain any useful code. Unfortunately though, some platforms put their own private non-ISA definitions into mach/dma.h, so we leave these behind and fix the appropriate #include statments. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [ARM] Arrange for platforms to select appropriate CPU supportRussell King2008-11-271-0/+1
|/ | | | | | | | | | | | | | | | | | Rather than: config CPU_BLAH bool depends on ARCH_FOO || MACH_BAR default y if ARCH_FOO || MACH_BAR arrange for ARCH_FOO and MACH_BAR to select CPU_BLAH directly. Acked-by: Nicolas Pitre <nico@marvell.com> Acked-by: Andrew Victor <linux@maxim.org.za> Acked-by: Brian Swetland <swetland@google.com> Acked-by: Eric Miao <eric.miao@marvell.com> Acked-by: Nicolas Bellido <ml@acolin.be> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge branch 's3c-move' into develRussell King2008-10-148-37/+37
|\ | | | | | | | | | | Conflicts: arch/arm/mach-versatile/core.c
| * [ARM] S3C24XX: Additional include movesBen Dooks2008-10-077-12/+12
| | | | | | | | | | | | Continue moving the include files into arch/arm Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C24XX: Move files out of include/asm-arm/plat-s3c*Ben Dooks2008-10-078-25/+25
| | | | | | | | | | | | | | | | | | | | | | First move of items out of include/asm-arm/plat-s3c* to their new homes under arch/arm/plat-s3c/include/plat and arch/arm/plat-s3c24xx/include/plat directories. Note, we have to create a dummy arch/arm/plat-s3c/Makefile to allow us to add arch/arm/plat-s3c/include/plat to the path. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | Merge branch 'pxa-all' into develRussell King2008-10-091-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | [ARM] 5298/1: Drop desc_handle_irq()Dmitry Baryshkov2008-10-091-2/+2
| |/ | | | | | | | | | | | | | | desc_handle_irq() was declared as obsolete since long ago. Replace it with generic_handle_irq() Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'ptebits' into develRussell King2008-10-091-1/+1
|\ \ | |/ | | | | | | | | Conflicts: arch/arm/Kconfig
| * [ARM] JIVE: Fix the spi bus numberingBen Dooks2008-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | The first spi bus is registered with number 0, but the board data says that the device on it is registered on bus 1. Move the spi bus to bus 1 to keep the compatibility with the original board-support patches. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] Convert asm/io.h to linux/io.hRussell King2008-09-067-8/+7
|/ | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] JIVE: Remove duplicated mtd includesHuang Weiyi2008-08-091-3/+0
| | | | | | | | Removed duplicated include file <linux/mtd/mtd.h> and <linux/mtd/partitions.h> in arch/arm/mach-s3c2412/mach-jive.c. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/machRussell King2008-08-0710-47/+47
| | | | | | This just leaves include/asm-arm/plat-* to deal with. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] Remove asm/hardware.h, use asm/arch/hardware.h insteadRussell King2008-08-078-8/+8
| | | | | | | | | Remove includes of asm/hardware.h in addition to asm/arch/hardware.h. Then, since asm/hardware.h only exists to include asm/arch/hardware.h, update everything to directly include asm/arch/hardware.h and remove asm/hardware.h. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] S3C2412: Correct parents for EREFCLK and UREFCLKMatthieu Castet2008-07-031-2/+11
| | | | | | | | For s3c2412, set parent for clk_erefclk and clk_urefclk. This allow for example to use xtal or extclk for i2s clock. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Matthieu Castet <matthieu.castet@parrot.com>
* [ARM] JIVE: Add power off on shutdown supportBen Dooks2008-07-031-0/+10
| | | | | | | Add pm_power_off hook to allow the Logitech Jive to shutdown when asked to halt. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* [ARM] JIVE: Add i2c device info for LIS302DL sensorBen Dooks2008-07-031-1/+24
| | | | | | | Add i2c bus definition for the LIS302DL sensor driver which is connected on the i2c bus. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* [ARM] JIVE: Add board definitions for audioBen Dooks2008-07-031-2/+33
| | | | | | | Add board definitions for the audio device connected on the Logitech Jive. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* [ARM] JIVE: Add LCD display setup informationBen Dooks2008-07-031-0/+40
| | | | | | | Add the setup information for the LCD display connected to the device. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* [ARM] JIVE: Add SPI bus definitions for LCD controllerBen Dooks2008-07-031-0/+55
| | | | | | | | Add the definitions for the VGG2432A4 intelligent LCD display conneected via an GPIO-based SPI bus on the Logitech Jive. Signed-of-by: Ben Dooks <ben-linux@fluff.org>
* [ARM] JIVE: Add setup information for the S3C2412 LCD controllerBen Dooks2008-07-031-0/+92
| | | | | | Setup the video controller information for the Jive. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* [ARM] JIVE: Initialise the sleep configuration registersBen Dooks2008-07-031-0/+88
| | | | | | | | Ensure that the S3C2412 sleep configuration registers are approriately setup so that the device can safely go to sleep. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* [ARM] JIVE: Initial machine support for Logitech JiveBen Dooks2008-07-033-0/+359
| | | | | | | This is the base machine support for the Logitech Jive machine. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* [ARM] 4985/1: S3C2412: Fix ARMDIVN name in CLKDIVN definition.Ben Dooks2008-04-171-1/+1
| | | | | | | Fix the name of the S3C2412_CLKDIVN_ARMDIVN define. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 4791/1: S3C2412: Make fclk a parent of msysclkBen Dooks2008-01-281-0/+2
| | | | | | | | In the S3C2412 fclk is derived from msysclk, not straight from the MPLL output. Set clk_f.parent appropriately. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 4790/1: S3C2412: Fix parent selection for msysclk.Ben Dooks2008-01-282-1/+3
| | | | | | | | | | | The msysclk clock was checking for the wrong PLL for the parent in s3c2412_setparent_msysclk(), trying the UPLL instead of the MPLL output. Also ensure the mpll and fclks are at the same rate at init time. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 4780/1: S3C2412: Allow for seperate DMA channels for TX and RXBen Dooks2008-01-281-2/+37
| | | | | | | | | | | | The current S3C24XX DMA code does not allow for an peripheral that has one channel for RX and another for TX. This patch adds a per-cpu dma operation to select the transmit or receive channel, and adds support to the S3C2412 for the seperate DMA channels for TX and RX. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 4779/1: S3C2412: Add s3c2412_gpio_set_sleepcfg() callBen Dooks2008-01-282-0/+61
| | | | | | | | Add s3c2412_gpio_set_sleepcfg() to allow the setting of the sleep configuration of the GPIO blocks. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 4778/1: S3C2412: Add armclk and init from DVS stateBen Dooks2008-01-281-0/+50
| | | | | | | | Add armclk to the S3C2412 to indicate the current clock connected to the ARM core. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
OpenPOWER on IntegriCloud