summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xxTony Lindgren2009-03-281-1/+1
| | | | | | | OMAP34XX_MAILBOX_BASE must be defined both for 24xx and 34xx. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into develRussell King2009-03-289-71/+96
|\
| * imxfb: Fix TFT modeSascha Hauer2009-03-271-1/+1
| | | | | | | | | | | | | | | | We read from the PCR reg to determine whether to use TFT mode or not. This is not possible because it may not have been initialized with the correct value yet. Select it using fbi->pcr instead. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX21/27: remove ifdef CONFIG_FB_IMXSascha Hauer2009-03-271-2/+0
| | | | | | | | | | | | | | Compile in the framebuffer device unconditionally to fix pcm038 compilation without framebuffer support. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * imxfb: add clock supportSascha Hauer2009-03-271-1/+39
| | | | | | | | | | | | | | v2: Added change from Martin Fuzzey: pixclock should be in pico seconds instead of MHz. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mxc: add arch_reset() functionIlya Yanok2009-03-274-29/+30
| | | | | | | | | | | | | | | | | | | | | | This patch adds arch_reset() function for all mxc platforms. It also removes (unsused) arch/arm/mach-mx2/system.c file. This patch has been tested on i.MX1/27/31/35 Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * clkdev: add possibility to get a clock based on the device nameSascha Hauer2009-03-272-2/+26
| | | | | | | | | | | | | | This adds clk_get_sys to get a clock without the associated struct device. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX1: remove fb support from mach-imxSascha Hauer2009-03-271-36/+0
| | | | | | | | | | | | | | | | | | The lack of an include file currently breaks compilation of mx1ads_defconfig. As framebuffer support is not actively used for mach-imx and the whole architecture will be replaced by mach-mx1 soon, just remove fb support. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'devel' of ↵Russell King2009-03-285-7/+9
|\ \ | |/ |/| | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
| * [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0Marek Vasut2009-03-282-4/+4
| | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pinsDaniel Mack2009-03-282-2/+2
| | | | | | | | | | | | Reported-by: Matthias Meier <matthias.j.meier@gmx.net> Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP definedEric Miao2009-03-261-1/+3
| | | | | | | | | | | | | | | | | | arch/arm/plat-pxa/mfp.c is not intended to be use by PXA25x/PXA27x, make it explicit here only for use by PXA3xx or ARCH_MMP. Reported-by: Guennadi Liakhovestski <g.liakhovestski@gmx.de> Reported-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* | Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into develRussell King2009-03-2637-15/+2162
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mm/Kconfig Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | Gemini: Add support for Teltonika RUT100Paulius Zaleckas2009-03-263-0/+105
| | | | | | | | | | | | Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
| * | Gemini: gpiolib based GPIO support v2Paulius Zaleckas2009-03-266-2/+265
| | | | | | | | | | | | | | | | | | | | | v2: - update copyrights Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
| * | MAINTAINERS: add myself as Gemini architecture maintainerPaulius Zaleckas2009-03-261-0/+7
| | | | | | | | | | | | Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
| * | ARM: Add Gemini architecture v3Paulius Zaleckas2009-03-2621-0/+1033
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for Cortina Systems Gemini family CPUs: http://www.cortina-systems.com/products/category/18 v3: - fixed __io(a) to be defined as __typesafe_io(a) v2: - #include <asm/io.h> -> <linux/io.h> - remove asm/system.h include - revorked mm.c to use named initializers - removed "empty" dma.h - updated copyrights Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
| * | MAINTAINERS: Add myself as Faraday ARM core variant maintainerPaulius Zaleckas2009-03-251-0/+6
| | | | | | | | | | | | Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
| * | ARM: Add support for FA526 v2Paulius Zaleckas2009-03-2513-2/+742
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for Faraday FA526 core. This core is used at least by: Cortina Systems Gemini and Centroid family Cavium Networks ECONA family Grain Media GM8120 Pixelplus ImageARM Prolific PL-1029 Faraday IP evaluation boards v2: - move TLB_BTB to separate patch - update copyrights Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
| * | ARM: tlbflush.h: introduce TLB_BTB flagPaulius Zaleckas2009-03-251-13/+6
| | | | | | | | | | | | Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
* | | 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-2628-764/+1038
|\ \ \ \
| * | | | [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-089-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-25461-22139/+27838
|\ \ \ \ | | | | | | | | | | | | | | | 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>
OpenPOWER on IntegriCloud