Commit Graph

45463 Commits

Author SHA1 Message Date
Linux Build Service Account
b453723ee9 Merge "iopoll: Introduce memory-mapped IO polling macros" into msm-3.0 2012-04-28 06:06:02 -07:00
Linux Build Service Account
4f155a85b8 Merge "ASoC: WCD9304: Fix register defaults for clock select" into msm-3.0 2012-04-28 03:55:01 -07:00
Bhalchandra Gajare
2776af1ee4 ASoC: WCD9304: Fix register defaults for clock select
On any codec path bringup and teardown, the external clock
gate in digital block is not required to be changed.
Fix by setting the register value as default and not change
during bringup or teardown

Change-Id: Ie2c57cc9814f5e85bcc755679a29ed36d7f199a6
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
2012-04-27 18:08:11 -07:00
Pravin Tamkhane
b18c9e2948 msm_fb: Provide support for ARGC and CSC for layer mixer 2
MDP 4.4 supports additional layer mixer (LM2) with ARGC and
CSC blocks. Extend existing ARGC and CSC functionality to additional
layer mixer (LM2).

Change-Id: Id9e5d0a80fcd9a6e3b6132b083d8a43450c0efa1
Signed-off-by: Pravin Tamkhane <pravint@codeaurora.org>
2012-04-27 12:09:14 -07:00
Matt Wagantall
b3ed9c1138 iopoll: Introduce memory-mapped IO polling macros
It is sometimes necessary to poll a memory-mapped register until its
value satisfies some condition. Introduce a family of convenience macros
that do this. Tight-loop and sleeping versions are provided with and
without timeouts.

Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
Change-Id: Ia7db00cbe60ded8b0ed9bbff264aaea0841da92a
2012-04-27 09:29:24 -07:00
Linux Build Service Account
db4bc81621 Merge changes I61f72bf1,I197a4c43 into msm-3.0
* changes:
  msm: vidc: Fixes memory protection in secure enc/dec concurrency
  msm: vidc: Handles secure/non-secure concurrency.
2012-04-27 08:02:12 -07:00
Linux Build Service Account
c4993225e8 Merge changes I48b37aef,Iec439cd7,I2b2d9ba1 into msm-3.0
* changes:
  gpio: qpnp-gpio: Remove config param inv_int_pol
  gpio: qpnp-gpio: Remove MODULE_AUTHOR line
  msm: copper: Enable CONFIG_GPIO_QPNP
2012-04-27 08:02:02 -07:00
Linux Build Service Account
494493315e Merge "hwmon: pm8xxx-adc: Add BATT_ID_THERM configuration" into msm-3.0 2012-04-27 03:46:02 -07:00
Linux Build Service Account
a6b18a2882 Merge "Bluetooth: Disconnect ACL after 8sec when no service level connection." into msm-3.0 2012-04-27 01:28:57 -07:00
Linux Build Service Account
1ce96ca6b8 Merge "msm: camera: Add SOF timestamps" into msm-3.0 2012-04-27 01:28:50 -07:00
Deepak kotur
13d82f8216 msm: vidc: Handles secure/non-secure concurrency.
Handles concurrency scenarios by preventing
nonsecure sessions when secure sessions are
ongoing. This is required since secure and
non-secure sessions cannot run concurrently.

Change-Id: I197a4c437312d916c0f75e7eb026c0570fee12ff
Signed-off-by: Deepak Kotur <dkotur@codeaurora.org>
2012-04-26 18:41:30 -07:00
Linux Build Service Account
2bee9ec6ef Merge "ASoC: msm: Add support for 4 channel recording" into msm-3.0 2012-04-26 18:33:12 -07:00
Michael Bohan
13cbc59d76 gpio: qpnp-gpio: Remove config param inv_int_pol
This configuration option should never have existed. It does not
exist in the qpnp-gpio block. It was mistakenly being used to
represent the 'output_value' parameter within the code. Fix such
occurrences so that the semantics are consistent.

Also move qpnp-gpio documentation to a more meaningful location.
It belongs in the gpio directory and not spmi.

Change-Id: I48b37aef02793934f60b9886347068cf37331c3f
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
2012-04-26 15:26:14 -07:00
Siddartha Mohanadoss
f9383d5583 hwmon: pm8xxx-adc: Add BATT_ID_THERM configuration
PM8018 ADC arbiter uses a single AMUX8 channel to
read either battery id or battery tempertaure. On
existing platforms these pins are grounded.

Add default configuration to read battery ID. If clients
need to read the battery temperature instead, follow the
instructions in the comments for the ADC channel listing.
Clients would need to update the scaling function in the
channel configuration to use the appropriate battery
thermistor scaling function.

CRs-Fixed: 350907
Change-Id: Ia3a8054c9be1e90d2076fd583ef8480353b78c6d
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2012-04-26 14:46:50 -07:00
Linux Build Service Account
8a5e928f3d Merge changes I13b16c71,Ic8d75e49 into msm-3.0
* changes:
  nl80211: Add probe response offload attribute
  nl80211: advertise device AP SME
2012-04-26 13:50:56 -07:00
Linux Build Service Account
48f19622bc Merge "ASoc: msm: Serialize soc dsp trigger commands." into msm-3.0 2012-04-26 13:50:55 -07:00
Mingming Yin
647e9eaf54 ASoC: msm: Add support for 4 channel recording
Enable 4 channel recording in kernel

Signed-off-by: Mingming Yin <mingming@codeaurora.org>
Change-Id: I91c76e21a4080c0542a63555f0258010ed061fc0
2012-04-26 04:01:57 -06:00
Rohit Singh
f371a5f164 Bluetooth: Disconnect ACL after 8sec when no service level connection.
Some Remote device disconnects service level connection but do not initiate
ACL disconnect hence ACL connection remains alive for 40s. Reducing timer
value to 8s as reconnection initated by remote device was rejected due to
existing ACL connection.

Change-Id: I26c2665bb9754ad08e3bc8d8a58f192c47c41764
CRs-Fixed: 337702
Signed-off-by: Rohit Singh <singhr@codeaurora.org>
2012-04-26 10:45:28 +05:30
Linux Build Service Account
daebae7573 Merge "msm_hsusb: Vote for corner of VDD CX instead of voltage of VDD CX" into msm-3.0 2012-04-25 15:37:35 -07:00
Ninad Mahimkar
ee55c1984b msm: camera: Add SOF timestamps
Add a message for passing real time clock timestamp
to userspace when SOF is generated

Change-Id: I99cb05bb3d619c4bf6da520366bd42e7e6ac8ee2
Signed-off-by: Ninad Mahimkar <ninadm@codeaurora.org>
2012-04-25 14:36:17 -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
Mayank Rana
248698c9d4 msm_hsusb: Vote for corner of VDD CX instead of voltage of VDD CX
New platform uses RBCPR hardware feature, with that voting for
absolute voltage of VDD CX is not required. Hence vote for corner of
VDD CX which uses nominal corner voltage on VDD CX.

CRs-Fixed: 355399
Change-ID: I22a73c5a439c98195b907ff3d032eb675a557612
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2012-04-25 05:14:10 +05:30
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
Jayasena Sangaraboina
bac6062324 ASoc: msm: Serialize soc dsp trigger commands.
- Fast Device switching during playback is resulting in
backend dai shutdown is being invoked before startup is
processed.
- Fix the issue by protecting the trigger function with
spinlock to serialize trigger start and stop cmds.

CRs-fixed: 348790
Change-Id: Id18c4e535ed47c8307d59ad80073335a67a31e13
Signed-off-by: Jayasena Sangaraboina <jsanga@codeaurora.org>
2012-04-24 11:49:10 -07:00
Linux Build Service Account
553aef4f78 Merge "diag: Add DCI support" into msm-3.0 2012-04-23 23:49:25 -07:00
Jay Chokshi
1ba115da95 mfd: PM8018/PM8921: Update PMIC board revision information
To incorporate the release of new revisions of the PM8921
and PM8018, add the new revision numbers to the database.

Change-Id: I5073802131aeed51795df77ac065878eeff34461
Signed-off-by: Jay Chokshi <jchokshi@codeaurora.org>
2012-04-23 15:48:32 -07:00
Stephen Boyd
364da7c6dd vsprintf: Fix %ps on non symbols when using kallsyms
Using %ps in a printk format will sometimes fail silently and
print the empty string if the address passed in does not match a
symbol that kallsyms knows about. But using %pS will fall back to
printing the full address if kallsyms can't find the symbol. Make
%ps act the same as %pS by falling back to printing the address.

While we're here also make %ps print the module that a symbol
comes from so that it matches what %pS already does. Take this
simple function for example (in a module):

	static void test_printk(void)
	{
		int test;
		pr_info("with pS: %pS\n", &test);
		pr_info("with ps: %ps\n", &test);
	}

Before this patch:

 with pS: 0xdff7df44
 with ps:

After this patch:

 with pS: 0xdff7df44
 with ps: 0xdff7df44

Change-Id: Id03d74b079d40fe24b07a978909faedc741e281a
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2012-04-23 14:29:54 -07:00
Deepthi Gowri
2b990717ca nl80211: Add probe response offload attribute
Notify user-space about probe-response offloading support in the driver.
A wiphy flag is used to indicate support and a bitmap of protocols
determines which protocols are supported.

Change-Id: I13b16c71449ab61f4308b6caa1cca35529f905b4
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
2012-04-23 20:31:08 +05:30
Deepthi Gowri
a86a02fb86 nl80211: advertise device AP SME
Add the ability to advertise that the device contains the AP SME and
what features it can support.There are currently no features in the
bitmap -- probe response offload will be advertised by a few patches
Arik is working on now (who took over from Guy Eilam) and a device
with AP SME will typically implement and require response offload.

Change-Id: Ic8d75e4933d795d43a0c30df6ec187f4d0ab6d8c
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
2012-04-23 20:27:09 +05:30
Linux Build Service Account
df28e9c349 Merge "ion: support creation of mm heap in a fixed place" into msm-3.0 2012-04-21 18:26:06 -07:00
Jordan Crouse
f7370f8e2a msm: kgsl: Control power savings features from userspace
Sometimes, the userspace driver has a need to disable some of the
power savings features in the kernel for a brief period.  Add a
property to control nap and DCVS from the user space driver via
KGSL_IOCTL_SETPROPERTY.

Change-Id: Ic0dedbad5dbc2f027b0c3316e29f620b8ea127fd
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2012-04-21 12:23:07 -06:00
Linux Build Service Account
0bec0a6ffe Merge changes Ic0dedbad,Ic0dedbad,Ic0dedbad into msm-3.0
* changes:
  msm: kgsl: Cleanup a superfluous structure in kgsl_device.h
  msm: kgsl: Record the queued context timestamp in the snapshot
  msm: kgsl: Read the queued timestamp from the device
2012-04-21 10:51:33 -07:00
Shalabh Jain
1c99e4c64c diag: Add DCI support
This change adds DIAG Consumer Interface (DCI). This will help
Android user space applications use DIAG to send command requests
to modem and receive responses back. Until now, this was done using
tools or scripts on PC. With this change, this functionality is available
on target itself.

Change-Id: I66c187e406fe93ae23c4ca0ead2cf0aed3502197
Signed-off-by: Shalabh Jain <shalabhj@codeaurora.org>
2012-04-20 17:44:02 -07:00
Terence Hampson
a6914ca5f0 msm: mpq8064: Add VCAP v4l2 device for MPQ8064
Adding v4l2 interface for VCAP device driver that utilizes
video capture (VC) portion of VCAP.

Future addition will allow for v4l2 VCAP to utilize video
processing (VP).

Change-Id: I5e68f4ba39f569ef07d67ca39fb922ad5a19aa4e
Signed-off-by: Terence Hampson <thampson@codeaurora.org>
2012-04-20 13:26:49 -04:00
Larry Bassel
2d8b42d31f ion: support creation of mm heap in a fixed place
The multimedia firmware on 8960 will always be
loaded into a fixed address, and all callers into
this firmware must be no more than 256M above the
start of this firmware.

This implies that the the mm ION heap and its associated heaps
(mm_fw and mfc) must also be created in a fixed place.

This version of the patch keeps the mm fw heap size
to 2M for compatibility with the current tip. This
will eventually be reduced to 1M.

Change-Id: I35f89b8c60165fb0adbb9d04412e0e200117beb9
Signed-off-by: Larry Bassel <lbassel@codeaurora.org>
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2012-04-20 09:57:59 -07:00
Jordan Crouse
c659f38e57 msm: kgsl: Read the queued timestamp from the device
Add KGSL_TIMESTAMP_QUEUED to the list of timestamp types that can be
queried from the device specific readtimestamp. QUEUED returns the
last timestamp ID that was initiated by issuing a command buffer to
the ringbuffer.

Change-Id: Ic0dedbad780cbc9f7d4cf5cf2ffc11a7d9d2d3e5
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2012-04-20 09:38:47 -06:00
Linux Build Service Account
d8cb6536e9 Merge "msm: Enable msm_adc for 7x27a/8x25" into msm-3.0 2012-04-19 15:28:34 -07:00
Linux Build Service Account
6457184b8b Merge "mmc: core: Detect card removal on I/O error" into msm-3.0 2012-04-19 12:58:46 -07:00
Linux Build Service Account
2d0666ed8d Merge "msm_fb: Provide IOCTL to configure QSEED tables" into msm-3.0 2012-04-19 12:58:40 -07:00
Ulf Hansson
c331348e4d mmc: core: Detect card removal on I/O error
To prevent I/O as soon as possible at card removal, a new
detect work is re-scheduled without a delay to let a rescan
remove the card device as soon a possible.

Additionally, MMC_CAP2_DETECT_ON_ERR can now be used to handle
"slowly" removed cards that a scheduled detect work did not
detect as removed. To prevent further I/O requests for these
lingering removed cards, check if card has been removed and then
schedule a detect work to properly remove it.

Change-Id: Iec07260ad51fbe66dc5c54393579b65137d08ad1
Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com>
[subhashj@codeaurora.org: Fixed merge conflicts]
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
2012-04-19 12:24:41 +05:30
Linux Build Service Account
6b843393d8 Merge "qseecom: Add support for loading elf images" into msm-3.0 2012-04-18 18:35:08 -07:00
Siddartha Mohanadoss
bc2103fb68 msm: Enable msm_adc for 7x27a/8x25
The msm_adc interface is used to read the HKADC from the
remote processor. It uses the DALRPC layer to communicate
to the remote HKADC driver.

Add support to read PMIC Thermistor from the HKADC to support
thermal clients on the apps. PMIC temperature is one of the
thermal nodes used for performing thermal mitigation.

Change-Id: I9d9e8178e19daf5d830588281855dd8a40de1f0d
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2012-04-18 17:20:13 -07:00
Pravin Tamkhane
67726da111 msm_fb: Provide IOCTL to configure QSEED tables
Provide sub-operation for MSMFB_MDP_PP IOCTL to configure QSEED tables.
QSEED is used for smoothing, sharpening and scaling of content on video
pipes in MDP.

Change-Id: I069d9c793553cb4c400973690ebd7f8d3bcc1c68
Signed-off-by: Pravin Tamkhane <pravint@codeaurora.org>
2012-04-18 16:21:20 -07:00
Linux Build Service Account
35d64858c6 Merge "msm: camera: 8960: Unify Autofocus actuator" into msm-3.0 2012-04-18 15:25:09 -07:00
Linux Build Service Account
0d1ae58ffd Merge changes Ieda320b6,I1b2b8328 into msm-3.0
* changes:
  wcnss: add driver API to support Thermal Mitigation
  wcnss: add sysfs entry to support Thermal Mitigation
2012-04-18 10:18:41 -07:00
Rajakumar Govindaram
6627b36ee0 msm: camera: 8960: Unify Autofocus actuator
The actuator functionality is the same for different camera
modules. So a single actuator driver module is supported.
The variation is because of actuator control parameters,
which are made available in user space actuator driver
for better integration with tools used for autofocus
tuning.

Change-Id: Ibbae2ef426b570c59ec3796ac56abcf05af28259
Signed-off-by: Rajakumar Govindaram <rajakuma@codeaurora.org>
2012-04-18 10:10:41 -07:00
Linux Build Service Account
9d68331071 Merge changes I4317a595,Ia00359e6 into msm-3.0
* changes:
  ASoC: WCD9304: Enable Digital MIC recording
  ASoC: wcd9304: Pull in pending fixes for sitar.
2012-04-18 04:04:31 -07:00
Linux Build Service Account
9ac575b9ad Merge "video: msm: Add Histogram collection framework for MDP blocks" into msm-3.0 2012-04-17 15:15:47 -07:00
Mona Hossain
5ab9d77b3a qseecom: Add support for loading elf images
Add following IOCTLs
 - QSEECOM_IOCTL_LOAD_EXTERNAL_ELF_REQ
   sends QSEE command to load and elf image
 - QSEECOM_IOCTL_UNLOAD_EXTERNAL_ELF_REQ
   sends command to QSEE to unload an elf image

Change-Id: Ia1e0cb4df382af327f9dd8f283fa6a3d0e083f0c
Signed-off-by: Mona Hossain <mhossain@codeaurora.org>
2012-04-17 12:52:47 -07:00
Jeff Johnson
613746588b wcnss: add driver API to support Thermal Mitigation
The wcnss driver currently supports a sysfs-based mechanism which
allows the Thermal Mitigation function in userspace to read and write
the current thermal mitigation level.  An API is added to allow other
drivers (specifically the WLAN Driver) to register a notifier to be
invoked when the thermal mitigation level is changed.

CRs-Fixed: 317376
Change-Id: Ieda320b618a0a08186db791168e586a86b54d173
Signed-off-by: Jeff Johnson <jjohnson@codeaurora.org>
2012-04-17 12:18:44 -07:00