Commit Graph

265900 Commits

Author SHA1 Message Date
Linux Build Service Account
759104cab2 Merge "msm: rtb: Disable RTB on panic" into msm-3.0 2012-04-25 13:54:37 -07:00
Linux Build Service Account
e6fdbe22b5 Merge "diag: Silence section mismatches" into msm-3.0 2012-04-25 13:54:36 -07:00
Linux Build Service Account
433c742b87 Merge "power: smb349: Fix section mismatch" into msm-3.0 2012-04-25 13:54:33 -07:00
Linux Build Service Account
f73c488f29 Merge "radio-tavarua: Update the low power mode flag during FM off operation" into msm-3.0 2012-04-25 13:54:31 -07:00
Linux Build Service Account
f14886e53e Merge "Asoc: msm: 8064: Add support for in-call features" into msm-3.0 2012-04-25 13:54:26 -07:00
Linux Build Service Account
52e66c3a6c Merge "power: pm8921-charger: Bound lower AICL limit at 500 mA" into msm-3.0 2012-04-25 09:02:50 -07:00
Linux Build Service Account
81d4c7fff4 Merge "spinlock_debug: Print kallsyms name for lock" into msm-3.0 2012-04-25 09:02:48 -07:00
Linux Build Service Account
2994baf458 Merge "gpu: ion: Fix fragmentation message log condition" into msm-3.0 2012-04-25 09:02:45 -07:00
Linux Build Service Account
b4670eb9a8 Merge "msm: kgsl: Cancel events before context is freed" into msm-3.0 2012-04-25 09:02:42 -07:00
Linux Build Service Account
d01a4d4ea2 Merge "msm: clock-8960/8660/9615: Allow PCM to source from external input" into msm-3.0 2012-04-25 09:02:41 -07:00
Linux Build Service Account
1fbf488977 Merge "msm: copper: Rename SDCC device names to msm_sdcc.[slot] format" into msm-3.0 2012-04-25 09:02:38 -07:00
Linux Build Service Account
496adaf7ec Merge "vsprintf: Fix %ps on non symbols when using kallsyms" into msm-3.0 2012-04-25 09:02:34 -07:00
Linux Build Service Account
d6bb7d4237 Merge "msm: camera: Assign Null to unmapped addresses" into msm-3.0 2012-04-25 09:02:31 -07:00
Anantha Krishnan
af2eafc359 radio-tavarua: Update the low power mode flag during FM off operation
The lower power mode flag is not updated after the interrupts
have been disabled during FM turn Off operation. This causes the
interrupts to not to be enabled during next FM turn On
operation and this results in GPIO not toggling for XFR operations.

Change-Id: I0f2199292b570f1add2bc23c9cf6bcd480781c03
CRs-Fixed: 344780
Signed-off-by: Anantha Krishnan <ananthk@codeaurora.org>
2012-04-25 15:46:16 +05:30
Stephen Boyd
197e20bd51 power: smb349: Fix section mismatch
WARNING: vmlinux.o(.text+0x4830fc): Section mismatch in reference
from the function hwinit_worker() to the function
.devinit.text:smb349_hwinit()
The function hwinit_worker() references
the function __devinit smb349_hwinit().
This is often because hwinit_worker lacks a __devinit
annotation or the annotation of smb349_hwinit is wrong.

Change-Id: Id42f1fd3c27a7773d36659b4839b881fadbb9ff9
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2012-04-24 23:54:28 -07:00
Stephen Boyd
8744b04bc0 diag: Silence section mismatches
The diag code is improperly using the __init/__exit markings and
calling functions that don't exist at certain times. Remove the
init and exit markings as these functions are used from both init
and exit context. Note another solution is possible where init
functions are only called from init functions but that would
break the error handling here so we just remove the markings for
simplicity.

Change-Id: I86677b74676871504b1b47f21c92002757ae194a
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2012-04-24 23:52:20 -07:00
Laura Abbott
a29d731c60 msm: rtb: Disable RTB on panic
By the time the panic notifiers have run, all the useful
information for debugging purposes has already been collected.
Stop logging during panic so useful information doesn't get
flooded out.

Change-Id: I7e23db3d6d3dfaf53cad86b2949a550d7cf218d1
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2012-04-24 18:07:32 -07:00
Stephen Boyd
630f325dd2 msm: clock-8960/8660/9615: Allow PCM to source from external input
The pcm clock can source from either the internal mn counter or
the external codec input from a gpio. Support setting the rate of
the pcm clock to zero to support the external codec input. A
non-zero rate signifies use of the mn counter.

Change-Id: I6831dfea5f8fec6ee9330342edb7dcaeff4b33d4
CRs-fixed: 352645
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2012-04-24 15:29:30 -07:00
Helen Zeng
8f92550316 Asoc: msm: 8064: Add support for in-call features
- Add support for slimbus rx and tx channels
  between external modem and APQ.
- Use the slimbus rx channel to route audio packets
  from APQ to external modem for music delivery to
  far-end during a voice call.
- Use the slimbus tx channel to route the voice packets
  from external modem to APQ to record to a file.
- Add mixer control to set mono or stereo recording.

Change-Id: Ice6315de19bf0e2a8d7bd55973976b3c320f1984
Signed-off-by: Helen Zeng <xiaoyunz@codeaurora.org>
2012-04-24 14:47:42 -06:00
Adrian Salido-Moreno
eeb06c7b57 msm: rotator: add YUV444 interleave format support
Add support for H1V1 interleave (YUV444) to rotator

Change-Id: I772ff1823e3c9acf046d339c3a1eeb1ab324b279
Signed-off-by: Kyong Hwa Bae <kbae@codeaurora.org>
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
2012-04-24 12:26:23 -07:00
Adrian Salido-Moreno
2b41048b63 msm_fb: display: add YUV444 interleave format support to mdp
Add support for H1V1 interleave (YUV444) to mdp

Change-Id: I86b76831ad87dede90ddd8d8f5ae64e51fa28c27
Signed-off-by: Kyong Hwa Bae <kbae@codeaurora.org>
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
2012-04-24 12:26:06 -07:00
Lakshmi Narayana Kalavala
72ee044121 msm: camera: Assign Null to unmapped addresses
Observed unhandled virtual addresses with all the camera drivers
while performing reads and writes to the ioremap addresses in different
scenarios, Hence assigining NULL to all the hardware remapped addresses
immediately after the iounmap calls

Change-Id: I1cbb3969db449c5c37ee6cb5d85cc5715d991f19
Signed-off-by: Lakshmi Narayana Kalavala <lkalaval@codeaurora.org>
2012-04-24 10:57:43 -07:00
Lynus Vaz
e91e001acf msm: kgsl: Cancel events before context is freed
Make sure the context is intact when the events are canceled. Since
the timestamps are now per-context, readtimestamp requires a valid
context.

Change-Id: I0c917a77f2e39594a5f5b69985f639de1fb53206
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
2012-04-24 21:01:22 +05:30
Linux Build Service Account
868a078627 Merge "msm: clock: Delete obsolete dummy clock tables for 8960 and 8064" into msm-3.0 2012-04-24 04:11:19 -07:00
Linux Build Service Account
0cd3327ca5 Merge "board: storage: enable SDIO wakeup from msm pin" into msm-3.0 2012-04-24 04:11:15 -07:00
Linux Build Service Account
c933d8502c Merge "board: 8930: update touch config data version to 15.2.0" into msm-3.0 2012-04-24 01:47:53 -07:00
Linux Build Service Account
eeab8591b8 Merge "msm: clock-8x60: Map ppss_p_clk to the msm_dsps device" into msm-3.0 2012-04-24 01:47:50 -07:00
Linux Build Service Account
3bc3652896 Merge "msm_fb: display: Unstage video from primary mixer H/W on unset" into msm-3.0 2012-04-24 01:47:48 -07:00
Linux Build Service Account
340664f006 Merge "msm: gpio-v2: Fix lockdep warning" into msm-3.0 2012-04-24 01:47:46 -07:00
Matt Wagantall
c51e560209 msm: clock: Delete obsolete dummy clock tables for 8960 and 8064
These tables were only used on pre-silicon development platforms
that are no longer supported. They have also fallen out of sync
with respect to the real tables in clock-8960.c. Delete the dummy
tables because they are no longer useful.

Change-Id: I57c126cc6e9bf5e11fa76bb537ddd25af7c9e331
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
2012-04-24 00:57:06 -06:00
Linux Build Service Account
553aef4f78 Merge "diag: Add DCI support" into msm-3.0 2012-04-23 23:49:25 -07:00
Linux Build Service Account
5808f7a332 Merge "msm_fb: display: switch mdp mode without turning off timing generator" into msm-3.0 2012-04-23 23:49:23 -07:00
Linux Build Service Account
965aeb743f Merge "msm: kgsl: use correct 2d ringbuffer offset in resume" into msm-3.0 2012-04-23 23:49:21 -07:00
Linux Build Service Account
b28965fd76 Merge "mfd: PM8018/PM8921: Update PMIC board revision information" into msm-3.0 2012-04-23 23:49:15 -07:00
Subhash Jadavani
55e188eb9a board: storage: enable SDIO wakeup from msm pin
If SDIO slot is using the dedicated MSM pins rather than GPIO
pins then SDIO wakeup interrupt configuration would require
calling msm_mpm_* APIs. For such slots, let's indicate this
by setting a "mpm_sdiowakeup_int" platform entry to appropriate
MPM interrupt number. SDCC will use this entry to call
msm_mpm_* APIs when required.

Change-Id: I8fbeb9bd54c68f0285427d5754444818b66e6e4f
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
2012-04-24 10:46:48 +05:30
Linux Build Service Account
d0f59a169f Merge "USB: OTG: msm: Fix inconsistent lockdep state warning" into msm-3.0 2012-04-23 21:05:59 -07:00
Linux Build Service Account
08f812f520 Merge "msm: camera: Change CSID configuration" into msm-3.0 2012-04-23 21:05:55 -07:00
Linux Build Service Account
6f84ccabce Merge "ASoC: msm: Add support for fm playback on proxy rx port" into msm-3.0 2012-04-23 21:05:53 -07:00
Linux Build Service Account
8e12c6a3e1 Merge "board-msm-8960: Add GSBI9 pdata for SGLTE device" into msm-3.0 2012-04-23 19:33:20 -07:00
Linux Build Service Account
4544dd06ae Merge "msm: ipc: Update the wakelock name to include client info" into msm-3.0 2012-04-23 19:33:17 -07:00
Linux Build Service Account
78b7315ae7 Merge "WLAN: msm9615: Add gpio configurations" into msm-3.0 2012-04-23 19:33:14 -07:00
Linux Build Service Account
cc2fcd7125 Merge "ASoC: msm8960: Fix mbhc multi button detection" into msm-3.0 2012-04-23 19:33:07 -07:00
Linux Build Service Account
59bd848ae8 Merge "msm: mpq8064: Boardfile configuration to enable vcap" into msm-3.0 2012-04-23 19:33:03 -07:00
Linux Build Service Account
10c0828cde Merge "msm: clock: Enhance sanity checks" into msm-3.0 2012-04-23 19:33:00 -07:00
Linux Build Service Account
6ff4c1c9db Merge changes Ia172fbbe,Icc4aedfc,I4203afea into msm-3.0
* changes:
  msm: pil-riva: Migrate to devm_clk_get()
  msm: pil-modem: Migrate to devm_clk_get()
  msm: pil-q6v3: Migrate to devm_clk_get()
2012-04-23 19:32:55 -07:00
Matt Wagantall
5bb16ca568 msm: clock-8x60: Map ppss_p_clk to the msm_dsps device
ppss_p_clk is used by the msm_dsps device, so mark it as such. Also
change the string name of the clock to "iface_clk" to match the naming
convention used for other clocks.

Change-Id: I035e6832a346561a999b6ea791754feb709a3bca
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
2012-04-23 18:08:07 -07:00
Ravishangar Kalyanam
6098eee975 msm_fb: display: Unstage video from primary mixer H/W on unset
Resolve video playback suspend/resume IOMMU page fault by
unstaging video layer on VG pipes from primary mixer H/W during
overlay_unset calls immediately at the next vsync boundary

CRs-Fixed: 350371
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>
Change-Id: Ia1b2369005db500b5042d3226cf8d43027783fe3
2012-04-23 18:04:27 -07:00
David Ng
665140f34e msm: copper: Rename SDCC device names to msm_sdcc.[slot] format
Rename SDCC device names to msm_sdcc.[slot] as opposed to
device tree address,sdcc format to be consistent with
non-device tree targets.  This allows compatibility with
existing userspace applications that require direct
access to specific SDCC slot in a target-independent
manner.

Change-Id: I6012e7a104d1ee3da88e4bca8fa83a60014dda38
Signed-off-by: David Ng <dave@codeaurora.org>
2012-04-23 18:03:57 -07:00
Kuogee Hsieh
5ff2cb661c msm_fb: display: switch mdp mode without turning off timing generator
MDP need to be in idle state before switching to different mode.
Dmap_done interrupt is delivered when the last line of frame is
clocked out. Therefore mdp is in idle state during dmap_done ISR.
This patch execute mdp mode switching inside dmap_done ISR.
Therefore timing generator is not necessary to be turned off
since mdp is in idle state already.

CRs-fixed: 350154
Change-Id: Ib10557bde90856ffd5284a0a76dddbe92f2abc0e
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
2012-04-23 17:53:41 -06:00
Stephen Boyd
431771e568 USB: OTG: msm: Fix inconsistent lockdep state warning
=================================
[ INFO: inconsistent lock state ]
3.0.21-g51ce160-00021-g8b33780-dirty #2904
---------------------------------
inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W}

kworker/0:1/32 [HC0[0]:SC0[0]:HE1:SE1] takes:
 (&irq_desc_lock_class){?.....}, at: [<c01cfd10>] irq_read_line+0x3c/0x80
{IN-HARDIRQ-W} state was registered at:
  [<c01b8768>] __lock_acquire+0x704/0x9f8
  [<c01b9034>] lock_acquire+0x10c/0x130
  [<c0833ac8>] _raw_spin_lock+0x44/0x54
  [<c01d1c30>] handle_fasteoi_irq+0x14/0x108
  [<c01ce8ac>] generic_handle_irq+0x28/0x3c
  [<c0106f6c>] handle_IRQ+0x7c/0xc0
  [<c0100458>] gic_handle_irq+0xac/0x104
  [<c0834798>] __irq_svc+0x58/0x8c
  [<c01070b4>] default_idle+0x28/0x2c
  [<c010742c>] cpu_idle+0x8c/0xf4
  [<c0808ddc>] rest_init+0xd8/0x100
  [<c0008a90>] start_kernel+0x464/0x4d8
  [<8020803c>] 0x8020803c

other info that might help us debug this:
 Possible unsafe locking scenario:

       CPU0
       ----
  lock(&irq_desc_lock_class);
  <Interrupt>
    lock(&irq_desc_lock_class);

 *** DEADLOCK ***

2 locks held by kworker/0:1/32:
 #0:  (events_nrt){.+.+..}, at: [<c019c49c>] process_one_work+0x1f8/0x518
 #1:  ((&motg->sm_work)){+.+...}, at: [<c019c49c>] process_one_work+0x1f8/0x518

stack backtrace:
[<c010c798>] (unwind_backtrace+0x0/0x12c) from [<c01b53bc>]
[<c01b53bc>] (print_usage_bug+0x248/0x2ac) from [<c01b5804>]
[<c01b5804>] (mark_lock+0x3e4/0x6ec) from [<c01b87f4>]
[<c01b87f4>] (__lock_acquire+0x790/0x9f8) from [<c01b9034>]
[<c01b9034>] (lock_acquire+0x10c/0x130) from [<c0833ac8>]
[<c0833ac8>] (_raw_spin_lock+0x44/0x54) from [<c01cfd10>]
[<c01cfd10>] (irq_read_line+0x3c/0x80) from [<c04e79b8>]
[<c04e79b8>] (msm_otg_sm_work+0x1a0/0x1510) from [<c019c57c>]
[<c019c57c>] (process_one_work+0x2d8/0x518) from [<c019cb94>]
[<c019cb94>] (worker_thread+0x220/0x3a0) from [<c01a2a80>]
[<c01a2a80>] (kthread+0x88/0x94) from [<c0107008>]

Change-Id: I7966d183cad54758508cb9635ebe3f31fba408b9
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2012-04-23 15:52:03 -07:00