aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-10-175-11/+26
|\
| * OMAP4: PM: update ROM return address for OSWR and OFFCarlos Leija2011-10-171-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At wakeup from OFF/OSWR CPU1 will call secure HAL service through a local secure dispatcher with MMU off, thus ROM will save a PA return address. Later in the wakeup, when SMC driver calls and RPC through omap4_secure_dispatcher (MMU is on now), ROM code won't log the new return address as RPCs are handled different. Thus ROM will attempt to return to a PA address when the MMU is on and the system will hang. We need to do this for OSWR state and OFF state of mpu power domain, not just for device off(mpu pd OFF). Change-Id: Ief0c402639b89e0e4b799742288fdf03f7a77cd1 Signed-off-by: Carlos Leija <cileija@ti.com> Signed-off-by: Praneeth Bajjuri <praneeth@ti.com> Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
| * OMAP4: PM: restore iva/l3inst for GP devices as wellNishanth Menon2011-10-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | On OMAP4430 GP devices, we were not capable of hitting OFF mode due to various reasons, however for 4460, we are able to do the same on GP devices, so we should restore the IVA and l3instr regs on GP as well, so split it out. Change-Id: Ib206e10e74e745128f11389bd6c10684ab322308 Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
| * OMAP4: SMC: Replace HAL service values with macros to improve readabilityBryan Buckley2011-10-174-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently when calling omap4_secure_dispatcher the HAL service IDs are just numbers and not very descriptive. This patch defines PPA_SERVICE_0 (0x21) which is a service in PPA that does nothing. Previously, 0x21 was being hardcoded in each case. It also plugs in FLAG_START_CRITICAL (0x4) macro where missing. Change-Id: I17df767a01b563722ab55173f007e9d3639f393b Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
| * mfd: twl: Add debug info to twl_i2c_read/write errorsMisael Lopez Cruz2011-10-171-4/+6
| | | | | | | | | | | | | | | | | | | | twl_i2c_read and twl_i2c_write error messages don't give enough information about the error context. Add address, register and message length to the error message in order to provide more debug data. Change-Id: I732e052a690dc2befa388e74b0706aac42f24fd9 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
* | Merge branch 'linux-omap-3.0' into android-omap-3.0Iliyan Malchev2011-10-1710-189/+155
|\ \ | |/
| * rpmsg: suppress rpmsg name service hex dumpsSuman Anna2011-10-171-0/+2
| | | | | | | | | | Change-Id: I2e9a31f54490dc511f146cbeb3307a1eba34637e Signed-off-by: Suman Anna <s-anna@ti.com>
| * remoteproc: add mutex protection for secure requestsFernando Guzman Lugo2011-10-172-2/+12
| | | | | | | | | | | | | | | | secure_* flags cannot change during the secure request, so that we need to protect them until the secure request has finished. Change-Id: I69a9dd26e762c8c38571963f72b48b5f12bfec79 Signed-off-by: Fernando Guzman Lugo <fernando.lugo@ti.com>
| * remoteproc: add protection for crash functionFernando Guzman Lugo2011-10-172-34/+28
| | | | | | | | | | | | | | | | | | | | Crash function access to buffer which can be mapped in rproc_put function. In order to avoid a possible race condition this part need to be protected and check for valid buffer before dereference them. Change-Id: I9f68c05c61c7959b272402b32e7557245d7e4428 Signed-off-by: Fernando Guzman Lugo <fernando.lugo@ti.com>
| * omap: rpmsg: adapt to the rproc_event_register changesFernando Guzman Lugo2011-10-171-56/+29
| | | | | | | | | | | | | | | | Adapting omap rpmsg to the changes on the rproc_event_* api changes. Change-Id: I52abd83a4a15e2865774e40603ab694c261c9c1d Signed-off-by: Fernando Guzman Lugo <fernando.lugo@ti.com>
| * remoteproc: combine all the block notify head structures into oneFernando Guzman Lugo2011-10-172-73/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously there was 1 block notify head per each type of event that remoteproc could generate. That also causes that the users need one block notify per each event they register for. Now, everything is combined into one notify block head, with this change users will register a callback function which will receive all type of remoteproc events, so it is responsibility of the users to check for the events they really want. Change-Id: I206b85536429310a593f5aac6175c110022fb1ff Signed-off-by: Fernando Guzman Lugo <fernando.lugo@ti.com>
| * omap: rpmsg: serialize reset of devices per rproc instead of channelFernando Guzman Lugo2011-10-171-8/+26
| | | | | | | | | | | | | | | | | | | | Reset was previously being done per channel, now there is a master channel which will reset all the channels. That allows a complete serialization of the reset process. Also, if a new reset request is done when a previous reset is still in process, wait until previous reset is done. Change-Id: Id5329ce409b5437d6d51b35acfd18d6f2c2efb15 Signed-off-by: Fernando Guzman Lugo <fernando.lugo@ti.com>
| * tty: serial: omap: don't lock console in suspend.Colin Cross2011-10-172-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | serial_omap_suspend locks the console in suspend, even if it is not being used as the console, or another console is present. This causes console messages to be lost if the device hangs in suspend. The only reason to lock the console is to prevent new console writes from turning the serial port hardware back on, which would prevent the low power state in suspend. To allow the console to continue functioning without leaving the uart on in suspend, add a suspended flag to the port. If the uart is disabled while the suspend flag is set, use pm_runtime_put_sync_suspend instead of pm_runtime_put_autosuspend to force the uart to immediately go to a low power state. This will cause the uart to transition in and out of its low power state for every console write after it suspends, but will allow all console messages to immediately go to the serial console as well as other active consoles. Change-Id: Id8a380ceda56071efc8958acb27b5e7f76fe4b29 Signed-off-by: Colin Cross <ccross@android.com>
| * OMAP2+: DMA: Workaround for invalid source positionPeter Ujfalusi2011-10-171-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the DMA source position has been asked before the first actual data transfer has been done, the CSAC register does not contain valid information. We can identify this situation by checking the CDAC register: CDAC != 0 indicates that the DMA transfer on the channel has been started already. If CDAC == 0, we can not trust the CSAC value since it has not been updated, and can contain random number. Return the start address in case the DMA has not yet started. This is valid since in fact the DMA has not yet progressed. Note: The CDAC register has been initialized to 0 at dma_start time. Change-Id: Iebbf4660945d5ee204f06916e023da958de45be6 Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
| * ASoC: OMAP ABE: Secure aess_pointer function for potential delay of startSebastien Guiriec2011-10-171-3/+8
| | | | | | | | | | | | | | | | | | When ABE ping pong buffer is used. ABE is generating ping/pong interrupt on the start of the port. Until first interrupt is generated ensure that pointer function is returning 0. Change-Id: I523684bfd4e403d8190048885010a1d7124e8e8d Signed-off-by: Sebastien Guiriec <s-guiriec@ti.com>
| * omap: mailbox: call request_irq after mbox queues are allocatedFernando Guzman Lugo2011-10-171-10/+10
| | | | | | | | | | | | | | | | | | Calling request_irq first could provoke that ISR function is executed before the mbox queues are allocated causing a kernel panic when they are dereference inside the ISR. Change-Id: I5af9b1fc7bb17170e43e177109dd06e0dc950387 Signed-off-by: Fernando Guzman Lugo <fernando.lugo@ti.com>
* | Merge branch 'android-3.0' into android-omap-3.0Iliyan Malchev2011-10-171-2/+2
|\ \
| * | cpufreq: interactive governor: default timer 10ms, maxspeed load 95%Todd Poynor2011-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify default timer from 30ms to 10ms, sampling 2 jiffies after idle exit on ARM as in Honeycomb. Modify default go_maxspeed_load from 85% loaded to 95% loaded, for use in phones where power savings is more important (tablets may be best served overriding this). Change-Id: I3361a6279979bfae1df5262666a2e30ea7a44328 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | Merge branch 'android-3.0' into android-omap-3.0Colin Cross2011-10-162-5/+19
|\ \ \ | |/ /
| * | net: wireless: bcmdhd: Add proper cleaning for ap_info structureDmitry Shmidt2011-10-162-3/+13
| | | | | | | | | | | | Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| * | net: wireless: bcmdhd: Send cfg80211_disconnected() if fails to get rssiDmitry Shmidt2011-10-161-2/+6
| | | | | | | | | | | | Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-10-152-4/+5
|\ \ \ | | |/ | |/|
| * | OMAP4+: EMIF: fix ddr self refresh cycles computationColin Cross2011-10-152-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ns_2_cycles uses the global variables T_num and T_den to convert nanoseconds to cycles, but T_num and T_den are not kept up to date on every memory bus frequency change. Instead, they are updated only when a memory frequency is used for the first time. If ns_2_cycles is called in setup_registers, which runs on every memory bus frequency change, it will use the memory bus frequency that was most recently used for the first time. Move the call to ns_2_cycles into emif_calculate_regs, which is only called the first time a memory bus frequency is used, and cache the result for use in setup_registers. Change-Id: I1db501acee73bcbd738d9fefc65563896ec76585 Signed-off-by: Colin Cross <ccross@android.com>
* | | Merge branch 'linux-omap-3.0' into android-omap-3.0Iliyan Malchev2011-10-153-18/+12
|\ \ \ | |/ /
| * | omap: rpmsg: unmap vring buffers after release mailboxFernando Guzman Lugo2011-10-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the buffer is unmapped first there could be a message send from the remoteproc and a kick (mailbox message) in that case the host will access to the vring region in order to read the message but that region is already unmaped. Now, the order is: omap_mbox_put rproc_put iounmap Which is the right order to do it. Change-Id: Ifad91199fbdfdcd9228698ca2e32a005380e4802 Signed-off-by: Fernando Guzman Lugo <fernando.lugo@ti.com>
| * | OMAP4: temp_sensor: remove save_ctx use-countingNishanth Menon2011-10-141-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Runtime PM maintains the use-counting and call of runtime suspend/resume in pairs as needed. Currently, we maintain a faulty secondary check which unfortunately prevents resume from restoring registers properly. We can delete the redundant state maintenance instead. Change-Id: Ic8f0e2ab6311118c93caf398ac28b7a391874870 Reported-by: Carlos Leija <cileija@ti.com> Signed-off-by: Nishanth Menon <nm@ti.com>
| * | GPIO: OMAP: Remove IS_ERR_VALUE callsTodd Poynor2011-10-141-10/+10
| | | | | | | | | | | | | | | Change-Id: If12733e5bb468e6ba67bd2618f3c0ca8afd7d766 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-10-143-0/+30
|\ \ \ | |/ /
| * | OMAP4+: EMIF: Enable EMIF Self-Refresh modeGilles-Arnaud Bleu-Laine2011-10-143-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure EMIF Automatic Power Management to Self-refresh mode As EMIF clocks are shutdown when the device goes to OFF mode, DDR will gradually lose its content. To prevent this and hence ensuring a proper resume, DDR data integrity must be preserved by setting it to self-refresh mode. Change-Id: I77e887ca7913e8c097231fd44bee86a8a1eb2b56 Signed-off-by: Vinay Amancha <vinaykumar@ti.com> Signed-off-by: Gilles-Arnaud Bleu-Laine <gilles@ti.com>
* | | Merge branch 'linux-omap-3.0' into android-omap-3.0Iliyan Malchev2011-10-142-25/+68
|\ \ \ | |/ /
| * | omap: rproc: user: add multiple user support for rproc user driverFernando Guzman Lugo2011-10-141-21/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, multiple users can request to enter secure mode, and once we enter secure mode it will be exited only after all the users request to exit secure mode. An additional check is also added in the release function to exit secure mode (or decrease ref counter) if the particular user has requested to enter secure mode. Change-Id: I809cc33b61d6aae0255424575ac91807480dc7df Signed-off-by: Fernando Guzman Lugo <fernando.lugo@ti.com> Signed-off-by: Suman Anna <s-anna@ti.com>
| * | OMAP4: Enable/Disable GPIO clocks before/after Regiter access.Rajeev Kulkarni2011-10-141-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 4430 system was crashing in idle path while accessing GPIO regiters w/o its clocks enabled. In Many platforms some banks may not be used at all. Before acessing any GPIO bank register ensure that the clocks are active. Once accessing is done disable the clocks. Signed-off-by: Axel Haslem <axelhaslam@ti.com> Signed-off-by: Rajeev Kulkarni <rajeevk@ti.com>
* | | Merge branch 'linux-omap-3.0' into android-omap-3.0Simon Wilson2011-10-144-10/+51
|\ \ \ | |/ / | | | | | | | | | Change-Id: Iabbfa478c0dd8f1b531664f070624e703759ef3d Signed-off-by: Simon Wilson <simonwilson@google.com>
| * | ASoC: omap-pcm: Fix the no period wakeup implementationPeter Ujfalusi2011-10-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After omap_request_dma the BLOCK_IRQ is enabled as default configuration for the channel. If we are requested for no period wakeup, we need to disable the BLOCK_IRQ in order to not receive any interrupts. Change-Id: Ibe07a5e772dd8d04eff3ac755d919d171ada48d7 Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
| * | omap_remotproc: implement method dump_registersIliyan Malchev2011-10-131-0/+39
| | | | | | | | | | | | Signed-off-by: Iliyan Malchev <malchev@google.com>
| * | remoteproc: introduce rproc method dump_registersIliyan Malchev2011-10-132-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces method dump_registers() in rproc_ops and replaces the default function dump_remoteproc_regs() with one implemented by each remoteproc (if defined.) Function dump_remoteproc_regs() called __show_regs(), which attemps to print the registers given to it as if they belong to local SMPs and further attempts to dump memory around the addresses pointed by some of them. This is incorrect, as the memory in question does not necessarily even belong to the local SMPs. Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | [ARM] omap: try not to allocate memory page by pageIliyan Malchev2011-10-131-43/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, try to allocate memory for all physical pages together. Idea from Lakshman Gowda <lakshman79@ti.com>. Speeds up allocations from the tiler carveout by ~50ms. This patch also combines three kzallocs into one. Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | Merge branch 'linux-omap-3.0' into android-omap-3.0Erik Gilling2011-10-138-46/+111
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: drivers/mfd/twl6030-madc.c Change-Id: I90bdfede31b046c57527297123eefef2e4fab771
| * | gpu: pvr: Update to DDK 1.8@296806Ben Jones2011-10-134-31/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - http://b/5443319 "PowerVR driver allows screenshots to be taken by any user" The PVRSRVGetDCSystemBuffer function (which mapped the framebuffer to userspace) has now been completely removed. It should no longer be possible for an application to map the system framebuffer. Change-Id: I806b8afedfa601a25d9d4bc84702360d3e805827
| * | ASoC: twl6040: The ADC debounce time is moved to twl6040 preparevenkappa mala2011-10-131-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The delay is creating pop noises during voicecall when audio path changes. The issue has been noticed with McPDM prepare which invokes prior TWL6040 ADC turn on. Therefore,the McPDM UL_DATA will be filling some garbage data to McPDM FIFO before codec ADC stabilization which creates pop noises. However, the debounce time is still required for ASR audio capture test to avoid oscillations. The conclusion, the codec start-up sequence is moved to twl6040 prepare to ensure that the codec ADC should be turn on before McPDM UL_DATA FIFO up for audio capture. Change-Id: I7ca791a9bab22d469801ec50c8de4724759950b7 Signed-off-by: venkappa mala <venkappa.m@samsung.com>
| * | ASoC: OMAP: HDMI: Set IP wrapper to NO-IDLE on poweron notificationAxel Castaneda Gonzalez2011-10-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If HDMI audio is being used, switch IP wrapper to no-idle when POWER-ON notification is triggered, to avoid DSS_L3_ICLK clock to be shutdown during audio activity. Change-Id: I14f24870944c18b1a82ffa543a6cb26c8ae75f31 Signed-off-by: Srinivas Pulukuru <srinivas.pulukuru@ti.com> Signed-off-by: Axel Castaneda Gonzalez <x0055901@ti.com>
| * | gpu: pvr: make SGXPanic dependent on PVRSRV_RESET_ON_HWTIMEOUTErik Gilling2011-10-121-0/+4
| | | | | | | | | | | | | | | Change-Id: Ia5ac7932e2cc89c9e7748c4224a20af62e6079dc Signed-off-by: Erik Gilling <konkers@android.com>
| * | mfd: twl6030 madc: Avoid early conversion timeout on long sleepTodd Poynor2011-10-121-1/+5
| | | | | | | | | | | | | | | Change-Id: Ie7555a4859104e9398213e2693fa7edf0609007f Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-10-1110-70/+73
|\ \ \ | |/ /
| * | gpio: omap: leave edge detect bits alone in idleColin Cross2011-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The edge detect bits should be left set if they were set entering idle, even if wkup_status was cleared for any reason. Apply wkup_status to the level detect bits only. Change-Id: I11b0ae629004a42a7fd8d7d5b2a32208586d7697 Signed-off-by: Colin Cross <ccross@android.com>
| * | OMAP: DSS/DSSCOMP: Wait until manager blank appliesLajos Molnar2011-10-112-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before turning off a display, wait until we had a chance to turn off all overlays on the manager. Otherwise, DISPC may get into an undefined state if we are trying to reuse those overlays on another manager. Also, turning the display off while the GO bit is set may be an issue even if the overlays are not reused on another manager. Change-Id: I43daa4603ec10617b26e8ad2be88f2a25db6c1df Signed-off-by: Lajos Molnar <molnar@ti.com>
| * | ASoC: DSP: Use START cmd for DSP_TRIGGER_PRE/POST typesMisael Lopez Cruz2011-10-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use SNDRV_PCM_TRIGGER_START cmd for DSP runtime start updates in DSP_TRIGGER_PRE and DSP_TRIGGER_POST trigger types. SNDRV_PCM_TRIGGER_STOPT cmd is used during DSP runtime stop updates, so it's critical to have START and STOP cmds balanced as some BE drivers do ref counting on their trigger() op. Change-Id: Ic40fb072b29afc4612fa42d32b7e1697a49eeb11 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| * | ASoC: OMAP ABE: Update ping/pong mode to support 4 buffers.Sebastien Guiriec2011-10-116-60/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current ping/pong mode is supporting only 2 buffers. We can extend the number of buffer to 4 in order to fit with current Audio HAL. This will enable the selection of Ping/pong instead of CBPr and lead to longer time between the different OMAP L3 wake up. Remove duplication of structure definition until rework of ABE code. Change-Id: I2037f50bf46b530f6d22c8306db9f44d9c2856e4 Signed-off-by: Sebastien Guiriec <s-guiriec@ti.com>
* | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-10-116-18/+569
|\ \ \ | |/ /
| * | OMAP4: sram: Mapping 4K of Public internal memory to kernelCarlos Leija2011-10-101-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kernel only needs 4K to map a SO page to drain MPU-2-L3 T2ASYNC FIFO, thus, allocating only the necessary 4K at the end of the internal memory. Change-Id: I8b2306aa347422eefb5e0c080f09ab226b57df21 Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Carlos Leija <cileija@ti.com>