summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next-s3c64xx-regs' of git://aeryn.fluff.org.uk/bjdooks/linux ↵Russell King2009-03-268-31/+353
|\ | | | | | | into devel
| * [ARM] S3C64XX: add AHB_CON and SPCON register address definitionsBen Dooks2009-03-101-0/+4
| | | | | | | | | | | | | | Add the address definitions for S3C64XX_AHB_CONx and SPCON registers for use in the PM code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C64XX: Add definitions for the GPIO memory port configurationsBen Dooks2009-03-101-0/+25
| | | | | | | | | | | | | | Add defines for the registers that control the GPIO pins that are run the memory interface. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C64XX: SYSCON power and sleep control register definesBen Dooks2009-03-101-0/+116
| | | | | | | | | | | | | | Add the register defines for the sleep and power control functions in the S3C64XX SYSCON register block. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C64XX: Add S3C64XX_SPCON register bit definitionsBen Dooks2009-03-101-0/+81
| | | | | | | | | | | | | | Add the definitions for the SPCON register in the GPIO block. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C64XX: Add GPIO SPCONSLP and SLPEN register definitionsBen Dooks2009-03-101-0/+27
| | | | | | | | | | | | | | Add GPIO register definitions for SPCONSLP and SLPEN for controlling the state of the pins over sleep. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C64XX: Add EINT group regs and move IRQ_EINT to regs-gpio.hBen Dooks2009-03-102-31/+61
| | | | | | | | | | | | | | | | Add definitions for the EINT group registers and move the EINT IRQ register definitions out of arch/arm/plat-s3c64xx/irq-eint.c so that they are available for re-use with PM and the other code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] S3C64XX: Add modem registers and a virtual mapBen Dooks2009-03-103-0/+39
| | | | | | | | | | | | | | | | | | Add the modem registers and a virtual mapping for the modem block. This is is required as there are registers that control the LCD block that need to be saved over suspend as well as interrupt controls. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | Merge branch 'next-s3c-pm' of git://aeryn.fluff.org.uk/bjdooks/linux into develRussell King2009-03-2627-760/+1034
|\ \
| * | [ARM] S3C: Tidy sleep code path to fix call flowBen Dooks2009-03-103-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As noted by Russell King, the sleep code path is not elegant and makes use of leaving items on the stack between calls. Change the code that does the following: if (s3c_cpu_save(regs_save) == 0) { flush_cache_all(); S3C_PMDBG("preparing to sleep\n"); pm_cpu_sleep(); } to simply call s3c_cpu_save, and let that do the necessary calls to quiesce and sleep the system. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Do not kmalloc/kfree during inner suspend code.Ben Dooks2009-03-083-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PM CRC checking code kmallocs an area to save a set of CRC values during suspend. This triggers a warning due to the call of a function that might sleep whilst the system is not in a valid state to do so. Move the allocation and free to points in the suspend and resume process where they can call a function that might-sleep. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Avoid checking the task stackpage in pm-checkBen Dooks2009-03-081-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | When doing the CRC check of the memory, avoid checking the page that our stack is residing in as this changes during the execution of the suspend and resume. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C24XX: Add S3C_GPIO_END definitionBen Dooks2009-03-083-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the definition for S3C_GPIO_END to allow the PM code to build. This means moving the GPIO bank numbers to a separate file to allow the gpio and regs-gpio to include them. Including regs-gpio.h into gpio.h causes too many build problems and adding gpio.h would mean editing a large number of files. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Update UART save over PM suspend/resumeBen Dooks2009-03-083-22/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the way the UART state is saved over suspend to allow the s3c64xx code to modify the settings on resume to avoid any illegal state changes to the UART clocks. This will also allow us to save the UDIVSLOT register on newer SoCs. Move to using a structure for the UART use the extant Kconfig configuration specifying the number of UARTs. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Rename sleep.S functions to be non-cpu specificBen Dooks2009-03-085-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | 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-088-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | 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] S3C24XX: Fix bug in IRQ_EINT_BIT() calculationAndy Green2009-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a bug in calculation of IRQ_EINT_BIT introduced on the test branch for pm changes for s3c by Ben Dooks fixed in this patch. There's also a bit of a mystery about how wake gets to wake EINT set of interrupts, I added a couple of lines that make it work for EINT4+ but not sure what's meant to be there for EINT0-3. Still, this gets GTA02 resume working again. Signed-off-by: Andy Green <andy@openmoko.com> [ben-linux@fluff.org: remove irq-pm.c change] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Make IRQ_EINT sleep control commonBen Dooks2009-03-086-25/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move the IRQ_EINT sleep control to be available to all s3c impelmentations. Since s3c_irqext_wake is not large, place it in arch/arm/plat-s3c/pm.c as adding it to a new file would be a waste of compile time. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C24XX: Remove changelog from arch/arm/plat-s3c24xx/irq.cBen Dooks2009-03-081-33/+1
| | | | | | | | | | | | | | | | | | Remove the changelog, this file is in version control. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C24XX: Split PM code from arch/arm/plat-s3c24xx/irq.cBen Dooks2009-03-084-118/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | Split the PM code out of arch/arm/plat-s3c24xx/irq.c to remove some of the #ifdefs being used. Also fix a couple of places where the absecnce of a function was redefined to the same thing. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Fix warnings in the PM memory CRC codeBen Dooks2009-03-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fix warnings from struct resource being bigger than unsigned long by forcing the type. We are only a 32bit platform so no physical memory addresses will be too big to fit in this. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Move plat-s3c24xx pm.c support into plat-s3cBen Dooks2009-03-084-210/+311
| | | | | | | | | | | | | | | | | | | | | Move parts of the core and debug suspend code into the plat-s3c for use with the new s3c64xx code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Split the resume memory check code from pm.cBen Dooks2009-03-084-203/+240
| | | | | | | | | | | | | | | | | | | | | | | | Split the optional memory check code out of the pm.c file as it is quite a big #ifdef block and as-such can be moved out and simply compiled when the configuration is set. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] S3C: Move PM support functions to common locationBen Dooks2009-03-089-110/+171
| | | | | | | | | | | | | | | | | | | | | | | | 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: Nove <plat/pm.h> from plat-s3c24xx to plat-s3fcBen Dooks2009-03-081-0/+0
| |/ | | | | | | | | | | | | | | Move the <plat/pm.h> header to plat-s3c as preparation for moving parts of the s3c24xx pm support which are common into the plat-s3c support. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | [ARM] OMAP: Fix compile for omap2_init_common_hw()Tony Lindgren2009-03-254-4/+4
| | | | | | | | | | Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'for-next' of ↵Russell King2009-03-25168-4317/+10546
|\ \ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
| * | ARM OMAP3: Initial support for Nokia RX-51, v3Lauri Leukkunen2009-03-235-0/+2342
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds board files and related headers for Nokia RX-51 Internet Tablet. This patch has been updated with some clean-up patches posted earlier to linux-omap list. Signed-off-by: Lauri Leukkunen <lauri.leukkunen@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: Add support for 3430 SDP, v4Syed Mohammed Khasim2009-03-234-1/+2610
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for 3430 SDP. Various updates have been merged into this patch from the linux-omap list. Patch updated to initialize regulators by David Brownell <dbrownell@users.sourceforge.net>. Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: Add ADS7846 touchscreen support to Overo platform, v3Steve Sakoman2009-03-231-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An upcoming Overo expansion board includes an ADS7846 touchscreen controller. This patch adds support via the ads7846 driver when enabled in the kernel config. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: MUSB initialization for omap hw, v2Felipe Balbi2009-03-238-0/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a generic board-file for initializing usb on omap2430 and omap3 boards. Patch modified by Tony to build the module based on CONFIG_USB_MUSB_SOC. Also merged in a patch adding the nop xceiv from Ajay Kumar Gupta <ajay.gupta@ti.com>. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: Add base address definitions and resources for OMAP 3 IS, v2Tony Lindgren2009-03-232-0/+135
| | | | | | | | | | | | | | | | | | | | | | | | This replaces earlier patch from Sergio Aguirre titled "[REVIEW PATCH 03/14] OMAP34XX: CAM: Resources fixes". Signed-off-by: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: mmc-twl4030 allow arbitrary slot names, v3Adrian Hunter2009-03-232-2/+6
| | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: mmc-twl4030 add cover switchAdrian Hunter2009-03-232-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a cover switch to be used to cause a rescan of the MMC slot. Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: mmc-twl4030 fix for vmmc = 0David Brownell2009-03-231-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve longstanding issue noted by Adrian Hunter: confusion between settting VSEL=0 (which is 1.8V on MMC1) and poweroff. Also, leave VSEL alone if we're just powering the regulator off. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: mmc-twl4030 add MMC3 support, v2Grazvydas Ignotas2009-03-232-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Device connected to MMC3 is assumed to be self-powered, so set_power() function is empty. It can't be omited because host driver requires it. Array size for hsmmc[] is specified to allocate to allocate an instance for the third MMC controller. Also fix a leak which happens if invalid controller id is passed. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: mmc-twl4030 init passes device nodes back, v2David Brownell2009-03-234-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | When setting up HSMMC devices, pass the device nodes back so board code can linking them to their power supply regulators. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: mmc-twl4030 voltage cleanupDavid Brownell2009-03-234-48/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct twl4030 MMC power switching: fix voltage ranges reported for each slot, and handle them fully. Lies corrected: - MMC-1 doesn't support the 2.6-2.7 Volt range - MMC-2 can't normally support anything except 1.8V Omissions corrected - MMC-1 *does* handle the 2.8-2.9 Volt range - MMC-2 can handle 2.5-3.2 Volt cards, given a transceiver Add transciever support for MMC-2; enable it for Overo and Pandora. (Depends on something else to have set up pinmuxing for control signals instead of as MMC2_DAT4..7 pins.) Also shrink twl4030_hsmmc_info a smidgeon ... padding is all gone. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: mmc-twl4030 fix name buffer length, v2Adrian Hunter2009-03-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Add 1 to buffer length for null terminator and use snprintf. Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: Add more GPIO mux optionsTony Lindgren2009-03-232-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds several new GPIO pins and updates the pin naming comments. The patch is based on earlier patches on linux-omap list by Manikandan Pillai <mani.pillai@ti.com>, Vaibhav Hiremath <hvaibhav@ti.com> and David Brownell <dbrownell@users.sourceforge.net>. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: Remove unused CONFIG_I2C2_OMAP_BEAGLEJarkko Nikula2009-03-231-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | There is no CONFIG_I2C2_OMAP_BEAGLE in mainline and it is under removal in linux-omap also so remove this dead code now. Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP: get rid of OMAP_TAG_USB, v2Felipe Balbi2009-03-2317-46/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMAP_TAGS should vanish soon since they're not generic arm tags. Most of them can be converted to a platform_data or parsed from a command line like e.g. serial tag. For OMAP_TAG_USB we just let boards call omap_usb_init() passing a pointer to omap_usb_config. Patch updated by Tony for mainline, basically make n770 and h4 compile. Also folded in a fix for OSK by David Brownell <dbrownell@users.sourceforge.net>. Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP: Dispatch only relevant DMA interruptsSantosh Shilimkar2009-03-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the spurious interrupt issue on a DMA channel. In OMAP sDMA, contrast to the SDMA.DMA4_CSRi registers, the SDMA.DMA4_IRQSTATUS_Lj registers are updated regardless of the corresponding bits in the SDMA.DMA4_IRQENABLE_Lj registers. Since there are four sDMA interrupt lines and if more than one line is actively used by two concurrently running sDMA softwares modules,then the spurious interrupt can be observed on the other lines. Fix in this patch will only dispatch the relevant and enabled interrupts on a particular line thus perevting spurious IRQ. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Nishant Kamat <nskamat@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP: Get available DMA channels from cmdlineSantosh Shilimkar2009-03-231-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch set up a cmdline option for omap dma for masking the available channels. It is needed since the OMAP DMA is a system wide resource and can be used by another software apart from the kernel. To reserve the omap SDMA channels for kernel dma usage, use cmdline bootarg "omap_dma_reserve_ch=". The valid range is 1 to 32. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Nishant Kamat <nskamat@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP: Add method to register additional I2C busses on the command line, v2Jarkko Nikula2009-03-231-21/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch extends command line option "i2c_bus=bus_id,clkrate" so that it allow to register additional I2C busses that are not registered with omap_register_i2c_bus from board initialization code. Purpose of this is to register additional board busses which are routed to external connectors only without any on board I2C devices. Cc: linux-i2c@vger.kernel.org Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP: Add command line option for I2C bus speed, v2Jarkko Nikula2009-03-231-10/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a new command line option "i2c_bus=bus_id,clkrate" into I2C bus registration helper. Purpose of the option is to override the default board specific bus speed which is supplied by the omap_register_i2c_bus. The default bus speed is typically set to speed of slowest I2C chip on the bus and overriding allow to use some experimental configurations or updated chip versions without any kernel modifications. Cc: linux-i2c@vger.kernel.org Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP: Add documentation for function omap_register_i2c_busJarkko Nikula2009-03-231-0/+9
| | | | | | | | | | | | | | | Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP: Export dmtimer functionsTimo Kokkonen2009-03-231-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Make the dmtimer function symbols available so modules can take use of them. Signed-off-by: Timo Kokkonen <timo.t.kokkonen@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | [OMAP850] Build system changesZebediah C. McClure2009-03-231-6/+17
| | | | | | | | | | | | | | | | | | | | | Build system changes. Signed-off-by: Zebediah C. McClure <zmc@lurian.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | [OMAP850] IRQ related changesZebediah C. McClure2009-03-232-3/+99
| | | | | | | | | | | | | | | | | | | | | IRQ related changes. Signed-off-by: Zebediah C. McClure <zmc@lurian.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
OpenPOWER on IntegriCloud