summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'omap3-upstream' into for-nextTony Lindgren2009-05-2810-30/+352
|\ | | | | | | | | Conflicts: arch/arm/mach-omap2/serial.c
| * ARM: OMAP3: Initialize more devices for LDPTony Lindgren2009-05-282-1/+207
| | | | | | | | | | | | | | | | | | | | Based on an earlier patches by Stanley.Miao <stanley.miao@windriver.com> and Nishant Kamat <nskamat@ti.com>. Note that at the ads7846 support still needs support for vaux_control for the touchscreen to work. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP3: ZOOM MDK: Add FB support to board fileImre Deak2009-05-281-4/+15
| | | | | | | | | | | | | | | | | | | | Based on an earlier patch by Stanley.Miao <stanley.miao@windriver.com> with board-*.c changes split to avoid conflicts with other device updates. Cc: linux-fbdev-devel@lists.sourceforge.net Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Imre Deak <imre.deak@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP3: SDRC: add timing data for Qimonda HYB18M512160AF-6Paul Walmsley2009-05-282-1/+56
| | | | | | | | | | | | | | | | | | | | | | Add timing data for the Qimonda HYB18M512160AF-6 SDRAM chip, used on the OMAP3430SDP boards. Thanks to Rajendra Nayak <rnayak@ti.com> for his help identifying the chip used on 3430SDP. Signed-off-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP3: SDRC: add timing data for Micron MT46H32M32LF-6, v2Paul Walmsley2009-05-284-3/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add timing data for the Micron MT46H32M32LF-6 SDRAM chip, used on the OMAP3 Beagle and EVM boards. Original timing data is from the Micron datasheet PDF downloaded from: http://download.micron.com/pdf/datasheets/dram/mobile/1gb_ddr_mobile_sdram_t48m.pdf Thanks to Rajendra Nayak <rnayak@ti.com> for his help identifying the chips used on Beagle & OMAP3EVM. Signed-off-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2/3: Serial: Remove arch_initcall dependencyVikram Pandita2009-05-281-13/+9
| | | | | | | | | | | | | | | | | | | | | | Move platform_device_register() for serial device to omap_serial_init() There is no need to have arch_initcall() dependency in serial as already board files call the function omap_serial_init() Signed-off-by: Vikram Pandita <vikram.pandita@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2/3: Remove L4_WK_OMAP_BASE, L4_PER_OMAP_BASE, L4_EMU_BASE, ↵Tony Lindgren2009-05-281-4/+0
| | | | | | | | | | | | | | | | | | L3_OMAP_BASE These are not being used right now, and the processor specific defines should be used instead by any code accessing these registers. Signed-off-by: Tony Lindgren <tony@atomide.com>
* | Merge branch 'omap-upstream' into for-nextTony Lindgren2009-05-2819-298/+837
|\ \ | |/ | | | | | | Conflicts: arch/arm/mach-omap2/Makefile
| * ARM: OMAP1: Make 770 LCD workAndrew de Quincey2009-05-282-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make 770 LCD work by adding clk_add_alias(). Also remove the old unused functions. Note that the clk_add_alias() could probably be moved to arch/arm/clkdev.c later on. Cc: linux-fbdev-devel@lists.sourceforge.net Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Signed-off-by: Imre Deak <imre.deak@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com
| * ARM: OMAP2: 2430SDP: Add FB support to board fileImre Deak2009-05-281-0/+19
| | | | | | | | | | | | | | | | | | | | | | Based on an earlier patch by Hunyue Yau <hyau@mvista.com> with board-*.c changes split to avoid conflicts with other device updates. Cc: linux-fbdev-devel@lists.sourceforge.net Signed-off-by: Hunyue Yau <hyau@mvista.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Imre Deak <imre.deak@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2/3: Add generic smc91x support when connected to GPMCTony Lindgren2009-05-286-254/+313
| | | | | | | | | | | | | | | | | | | | | | | | | | Convert the board-rx51 smc91x code to be generic and make the boards to use it. This allows future recalculation of the timings when the source clock gets scaled. Also correct the rx51 interrupt to be IORESOURCE_IRQ_HIGHLEVEL. Thanks to Paul Walmsley <paul@pwsan.com> for better GPMC timing calculations. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2/3: Add generic onenand support when connected to GPMCJuha Yrjola2009-05-285-3/+412
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add generic onenand support when connected to GPMC and make the boards to use it. The patch has been modified to make it more generic to support all the boards with GPMC. The patch also remove unused prototype for omap2_onenand_rephase(void). Note that board-apollon.c is currently using the MTD_ONENAND_GENERIC and setting the GPMC timings in the bootloader. Setting the GPMC timings in the bootloader will not allow supporting frequency scaling for the onenand source clock. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2/3: sDMA: Correct omap_request_dma_chain(), v2Santosh Shilimkar2009-05-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original OMAP DMA chaining design had chain_id as one of the callback parameters. Patch 538528de0cb256f65716ab2e9613d9e920f97fe2 changed it to use logical channel instead. Correct the naming for callback to also use logical channel number instead of the chain_id. More details are on this email thread: http://marc.info/?l=linux-omap&m=122961071931459&w=2 Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2/3: DMA: implement trans copy and const fillTomi Valkeinen2009-05-282-28/+50
| | | | | | | | | | | | | | Implement transparent copy and constant fill features for OMAP2/3. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP1: Misc clean-upTony Lindgren2009-05-253-1/+5
| | | | | | | | | | | | | | Remove unnecessary Kconfig line and allow compile of MBOX_FWK. Also allow building USB on Nokia 770. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Update contact address of I2C registration helperJarkko Nikula2009-05-251-1/+1
| | | | | | | | | | | | | | This email address is going to expire soon so update it. Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: McBSP: Fix legacy interrupts to clear their statusEero Nurkkala2009-05-251-6/+24
| | | | | | | | | | | | | | | | | | | | If XSYNCERR or RSYNCERR interrupts are enabled, they are never cleared causing the IRQ handler to be continuously called. This patch clears the IRQs in question in the event they are enabled and taken. Signed-off-by: Eero Nurkkala <ext-eero.nurkkala@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Increase VMALLOC_END to allow 256MB RAMMans Rullgard2009-05-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This increases VMALLOC_END to 0x18000000, making room for 256MB RAM with the default 128MB vmalloc region. Note that after this patch there's no longer a hole between vmalloc space and the beginning of IO space on omap2 as the first virtual mapping starts at 0xd8000000. Also fold in a related change from Paul Walmsley <paul@pwsan.com> to change the OMAP2_SRAM addresses accordingly. Signed-off-by: Mans Rullgard <mans@mansr.com> Signed-off-by: Paul Walmsley <paul@pwsan.com> Acked-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Remove unnecessary omap2_globals.Santosh Shilimkar2009-05-251-9/+4
| | | | | | | | | | | | | | | | | | | | This patch removes unnecessary omap2_globals and pass the global structures directly as function argument. The proposed cleanup was suggested by Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Remove useless omap_sram_error function.Santosh Shilimkar2009-05-251-20/+5
| | | | | | | | | | | | | | | | | | | | This patch removes fixes omap_sram_error() function and replace the error paths with BUG_ON. The proposed fix was suggested by Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP: Remove unwanted type casts and fix the compiler warning.Santosh Shilimkar2009-05-251-7/+7
| | | | | | | | | | | | | | | | | | | | | | This patch fixes the compiler warning "assignment from incompatible pointer type" in dmtimer.c and removes the tye casts. These warnings were suppressed by type catsing. The proposed fix was suggested by Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2/3: Reorganize Makefile to add omap4 supportTony Lindgren2009-05-251-3/+8
| | | | | | | | | | | | | | We don't necessarily want to compile in irq.o and sdrc.o for omap4. Also, clock and prcm may not be implemented initially. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2/3: Remove OMAP_CM_REGADDRTony Lindgren2009-05-255-21/+4
| | | | | | | | | | | | Processor specific macros should be used instead. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2/3: Remove OMAP2_PRCM_BASETony Lindgren2009-05-251-2/+0
| | | | | | | | | | | | | | It's currently unused, and processor specific defines should be used instead. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2/3: Move define of OMAP2_VA_IC_BASE to be local to entry-macro.STony Lindgren2009-05-253-6/+6
| | | | | | | | | | | | Move define of OMAP2_VA_IC_BASE to be local to entry-macro.S Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2/3: Remove OMAP_PRM_REGADDR and OMAP2_PRM_BASETony Lindgren2009-05-2510-100/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove OMAP_PRM_REGADDR and use processor specific defines instead. Also fold in a patch from Kevin Hilman to add _OFFSET #defines for the PRCM registers to be used with the prm_[read|write]_* macros. These are used extensively in the forthcoming OMAP PM support. Also remove now unused OMAP2_PRM_BASE. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP2/3: Remove OMAP2_32KSYNCT_BASETony Lindgren2009-05-255-18/+62
| | | | | | | | | | | | | | | | | | | | | | Use processor specific defines instead. As an extra bonus, this patch fixes the problem of CONFIG_DEBUG_SPINLOCK calling sched_clock before we have things initialized: http://patchwork.kernel.org/patch/15810/ Signed-off-by: Tony Lindgren <tony@atomide.com>
* | OMAP1: PM: update and decouple from OMAP2/3 PM coreKevin Hilman2009-05-284-84/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update OMAP1-specific PM infrastructure. This is a sync of what is in linux-omap for OMAP1. This mostly de-couples OMAP1 PM from OMAP2/3 PM and renames things accordingly, and removes omap2/3 specific code from OMAP1 specific headers. Original OMAP1 decoupling patch for OMAP PM branch by Paul Walmsley. Cc: Paul Walmsley <paul@pwsan.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP3: PM: prevent module wakeups from waking IVA2Kevin Hilman2009-05-282-0/+8
| | | | | | | | | | | | | | By default, prevent functional wakeups from inside a module from waking up the IVA2. Let DSP Bridge code handle this when loaded. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP3: PM: Clear pending PRCM reset flags on initKevin Hilman2009-05-281-0/+9
| | | | | | | | Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP3: PM: Ensure PRCM interrupts are cleared at bootKevin Hilman2009-05-281-0/+3
| | | | | | | | Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP3: PM: Ensure MUSB block can idle when driver not loadedPeter 'p2' De Schrijver2009-05-283-8/+20
| | | | | | | | | | | | | | Otherwise, bootloaders may leave MUSB in a state which prevents retention. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP3: PM: D2D clockdomain supports SW supervised transitionsKevin Hilman2009-05-281-1/+1
| | | | | | | | Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP3: PM: Add D2D clocks and auto-idle setup to PRCM initKevin Hilman2009-05-285-4/+75
| | | | | | | | | | | | | | | | | | | | | | | | Add D2D clocks (modem_fck, sad2d_ick, mad2d_ick) to clock framework and ensure that auto-idle bits are set for these clocks during PRCM init. Also add omap3_d2d_idle() function called durint PRCM setup which ensures D2D pins are MUX'd correctly to enable retention for standalone (no-modem) devices. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP: UART: Add sysfs interface for adjusting UART sleep timeoutJouni Hogander2009-05-281-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes it possible to change uart sleep timeout. New sysfs entry is added (/sys/devices/platform/serial8250.<uart>/sleep_timeout) Writing zero will disable the timeout feature and prevent UART clocks from being disabled. Also default timeout is increased to 5 second to make serial console more usable. Original patch was written by Tero Kristo. Cc: Tero Kristo <Tero.Kristo@nokia.com> Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP3: PM: UART: disable clocks when idle and off-mode supportKevin Hilman2009-05-285-27/+405
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows the UART clocks to be disabled when the OMAP UARTs are inactive, thus permitting the chip to hit retention in idle. After the expiration of an activity timer, each UART is allowed to disable its clocks so the system can enter retention. The activity timer is (re)activated on any UART interrupt, UART wake event or any IO pad wakeup. The actual disable of the UART clocks is done in the 'prepare_idle' hook called from the OMAP idle loop. While the activity timer is active, the smart-idle mode of the UART is also disabled. This is due to a "feature" of the UART module that after a UART wakeup, the smart-idle mode may be entered before the UART has communicated the interrupt, or upon TX, an idle mode may be entered before the TX FIFOs are emptied. Upon suspend, the 'prepare_suspend' hook cancels any pending activity timers and allows the clocks to be disabled immediately. In addition, upon disabling clocks the UART state is saved in case of an off-mode transition while clocks are off. Special thanks to Tero Kristo for the initial ideas and first versions of UART idle support, and to Jouni Hogander for extra testing and bugfixes. Tested on OMAP3 (Beagle, RX51, SDP, EVM) and OMAP2 (n810) Cc: Tero Kristo <tero.kristo@nokia.com> Cc: Jouni Hogander <jouni.hogander@nokia.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP3: PM: Add wake-up bit defintiions for CONTROL_PADCONF_XKevin Hilman2009-05-281-0/+4
| | | | | | | | Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP3: PM: Force IVA2 into idle during bootupKevin Hilman2009-05-282-0/+55
| | | | | | | | Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP: Add new function to check wether there is irq pendingJouni Hogander2009-05-283-17/+20
| | | | | | | | | | | | | | | | | | Add common omap2/3 function to check wether there is irq pending. Switch to use it in omap2 pm code instead of its own. Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | OMAP2/3: PM: push core PM code from linux-omapKevin Hilman2009-05-2814-117/+1790
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is to sync the core linux-omap PM code with mainline. This code has evolved and been used for a while the linux-omap tree, but the attempt here is to finally get this into mainline. Following this will be a series of patches from the 'PM branch' of the linux-omap tree to add full PM hardware support from the linux-omap tree. Much of this PM core code was written by Jouni Hogander with significant contributions from Paul Walmsley as well as many others from Nokia, Texas Instruments and linux-omap community. Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com> Cc: Paul Walmsley <paul@pwsan.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | Revert "ARM: OMAP: Mask interrupts when disabling interrupts, v2"Kevin Hilman2009-05-261-1/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 5461af5af5c6a7fee78978aafe720541bf3a2f55. Adding a disable hook to the irq_chip is not the way to fix the problem being addressed by this patch. Instead, we need to fix support for [enable|disable]_irq_wake(). Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | Merge branch 'omap-clock-upstream' of git://git.pwsan.com/linux-2.6 into ↵Tony Lindgren2009-05-2610-86/+128
|\ \ | | | | | | | | | for-next
| * | OMAP2xxx clock: rename clk_init_one() to clk_preinit()Paul Walmsley2009-05-125-6/+6
| | | | | | | | | | | | | | | | | | Rename clk_init_one() to clk_preinit() to distinguish its function from clk_init() and the individual struct clk init functions. Signed-off-by: Paul Walmsley <paul@pwsan.com>
| * | OMAP3 clock: lessen amount of noisy messagesArtem Bityutskiy2009-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On our system we see the following messages: Disabling unused clock "gpt2_ick" Disabling unused clock "gpt3_ick" Disabling unused clock "gpt4_ick" Disabling unused clock "gpt5_ick" ... The messages have KERN_INFO level and if you have serial console, they normally go there. I do not think it is good idea to print that much stuff there. Moreover, messages are not properly prefixed and for mortals it is not immeadietly clear where they come from. Let's give them debugging level instead. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: Paul Walmsley <paul@pwsan.com> [paul@pwsan.com: trimmed debugging output in patch description]
| * | OMAP3 clock: use pr_debug() rather than pr_info() in some clock change codePaul Walmsley2009-05-122-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | The CORE DPLL M2 frequency change code should use pr_debug(), not pr_info(), for its debug messages. Same with omap2_clksel_round_rate_div(). While here, convert a few printk(KERN_ERR .. into pr_err(). Signed-off-by: Paul Walmsley <paul@pwsan.com>
| * | OMAP3 clock: only unlock SDRC DLL if SDRC clk < 83MHzPaul Walmsley2009-05-124-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the 34xx TRM Rev. K section 11.2.4.4.11.1 "Purpose of the DLL/CDL Module," the SDRC delay-locked-loop can be locked at any SDRC clock frequency from 83MHz to 166MHz. CDP code unconditionally unlocked the DLL whenever shifting to a lower SDRC speed, but this seems unnecessary and error-prone, as the DLL is no longer able to compensate for process, voltage, and temperature variations. Instead, only unlock the DLL when the SDRC clock rate would be less than 83MHz. Signed-off-by: Paul Walmsley <paul@pwsan.com>
| * | OMAP3 SRAM: renumber registers to make space for argument passingPaul Walmsley2009-05-121-57/+57
| | | | | | | | | | | | | | | | | | | | | Renumber registers in omap3_sram_configure_core_dpll() assembly code to make space for additional parameters. Signed-off-by: Paul Walmsley <paul@pwsan.com>
| * | OMAP3 SDRC: initialize SDRC_POWER at bootPaul Walmsley2009-05-121-1/+18
| | | | | | | | | | | | | | | | | | | | | Initialize SDRC_POWER to a known-good setting when the kernel boots. Necessary since some bootloaders don't initialize SDRC_POWER properly. Signed-off-by: Paul Walmsley <paul@pwsan.com>
| * | OMAP3 SRAM: clear the SDRC PWRENA bit during SDRC frequency changePaul Walmsley2009-05-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Clear the SDRC_POWER.PWRENA bit before putting the SDRAM into self-refresh mode. This prevents the SDRC from attempting to power off the SDRAM, which can cause the system to hang. Signed-off-by: Paul Walmsley <paul@pwsan.com>
| * | OMAP3 clock: add interconnect barriers to CORE DPLL M2 changePaul Walmsley2009-05-121-3/+6
| | | | | | | | | | | | | | | | | | | | | Where necessary, add interconnect barriers to force posted writes to complete before continuing. Signed-off-by: Paul Walmsley <paul@pwsan.com>
OpenPOWER on IntegriCloud