Commit Graph

45433 Commits

Author SHA1 Message Date
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
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
Linux Build Service Account
e2cc3becb7 Merge changes Ib1cd158f,Ide80d824 into msm-3.0
* changes:
  USB: EHCI: Add registers support for SMSC hsic hub
  defconfig: msm8960: enable I2C support for smsc hsic hub
2012-04-17 09:45:28 -07:00
Ido Shayevitz
9fb83457bf usb: gadget: dwc3: Add support for DBM (MSM specific) endpoints.
In MSM architecture, the DBM, Device Bus Manager, is a HW module within
the USB3.0 core wrapper, implementing BAM interface support for USB3.0 IP.
The DBM HW unit requires for its operation a special transfer to be
started, with special TRBs structure. These usb requests will operate in
BAM2BAM mode.

This change adds to the dwc3-msm.c driver a support for queuing
a special transfers to endpoints which serve the DBM.

A function driver can now call to msm_ep_config(*ep) with some
endpoint which will serve the DBM. After this, the function
driver can queue a request to this endpoint as usual ep->queue(*ep,*req).
The function driver may need to add a few more parameters in req->udc_priv
field according to the bit mask fields defined in msm_hsudb.h file.

Change-Id: Iad530dabc68414c61d44e9eaef4402f868b2b12f
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-04-17 13:42:44 +03:00
Ido Shayevitz
d1cb16ccbf usb: gadget: Move udc_priv bit fields to MSM central header file.
The req->udc_priv value is used to transfer parameters from a function
driver to a udc, for enabling sps/bam mode for MSM architecture.

This change moves the definitions of the bit fields inside the udc_priv to
msm_hsusb.h in order to avoid duplicate definitions in u_bam.c and
ci13xxx_udc.h. Also this will allow other function drivers and other udcs
to use this definitions, for example, debug class over dwc3 udc.

Change-Id: I37a011524f7ba6d06029d1f3ab3f58d4cb248e4d
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-04-17 13:42:43 +03:00
Vijayavardhan Vennapusa
361da68d1b USB: EHCI: Add registers support for SMSC hsic hub
Add SMSC hub registers that can be changed over I2C bus
for changing the default configuration.

Change-Id: Ib1cd158fdd3c3f58d7211428984ca424563c4f14
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2012-04-17 10:34:57 +05:30
Carl Vanderlip
7b8b64075e video: msm: Add Histogram collection framework for MDP blocks
Expand the previous histogram collection implementation to support the
addition of other MDP blocks that allow for histogram data collection.
Support the VG1, VG2, DMA-P, and DMA-S histograms using this new
framework (VG pipes only supplying the histogram of luminance).

Change-Id: I94088c1f714fa5d91256ae7b0f5548f8a0b81763
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
2012-04-16 15:08:33 -07:00
Asish Bhattacharya
f868a1fcd6 ASoC: wcd9304: Pull in pending fixes for sitar.
Fix Lineout and DMIC configurations. The configurations are similar
to tabla codec driver and hence pull in changes to sitar driver.

Change-Id: Ia00359e6f8888c08365b85423197821fc16f963b
Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>
2012-04-17 00:46:40 +05:30
Vijayavardhan Vennapusa
afbbb8f569 USB: EHCI: Add I2C support for SMSC hsic hub
Currently default configuration will be active
during SMSC hub enumeration. For changing the default
configuration, requires I2C support for configuring
the configurable parameters of SMSC hub like VID,PID.

Change-Id: Ie0449b166ddaae990b9a69c3a75f8059250faf0e
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2012-04-16 12:56:32 -06:00
Linux Build Service Account
d7e20e2a2d Merge changes Ic67b798a,I0f2b440b,Iffb6a7c8 into msm-3.0
* changes:
  power: pm8921-bms: account for capacitive drop
  power: pm8921-bms: Add connector resistance
  power: pm8921-bms: fix the units of batt_temp for rbatt
2012-04-16 09:34:09 -07:00
Santosh Mardi
695be0df97 msm: mpq8064: Add support to enable 100KHz level shifter
cs8427 chip will be functional at i2c 100KHz frequency and
3.3 to 5V to enable this level shifter should be enabled

Change-Id: I4d30c597edc3367be89280edc85e2a272a67ae1e
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2012-04-15 09:49:55 -07:00
Santosh Mardi
e27ed78b17 ASoC: msm: Add support for AC3 pass through playback
Add support for AC3 tunnel mode playback where dsp acting
As pass through.

Change-Id: Ibc6536a439f7cae8cbbadcaddd4ad27e4ee84543
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2012-04-15 09:49:02 -07:00
Santosh Mardi
2332120bcd ASoC: msm: qdsp6: Add APIs for compressed audio playback/capture
Add APIs for compressed audio playback/capture in pass through mode

Change-Id: Ic9b4c71b518e653dae4726112edb75025ccc2bc2
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2012-04-15 09:45:25 -07:00
Santosh Mardi
1cb0c5d8da ASoC: CS8427: Add initial driver for cs8427 chip
Introduce initial cs8427 driver which is compliant
To ASoC codec driver standards.

Change-Id: Ie4fc0a3fc9b97f3ab0fbac2f0a3232078035fdae
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2012-04-14 23:46:11 -07:00
Linux Build Service Account
12f5d909ab Merge "clk: Add devm_clk_get()" into msm-3.0 2012-04-14 23:21:25 -07:00
Linux Build Service Account
e54376fed1 Merge changes I3d34bc47,Ia4a902d7 into msm-3.0
* changes:
  ASoC: msm: Add the kcontrol support different I2S audio format
  ASoC: msm: qdsp6: Add new AFE API supported by q6
2012-04-14 01:59:20 -07:00
Linux Build Service Account
98bc5242a3 Merge "msm: kgsl: Add per context timestamp" into msm-3.0 2012-04-14 01:59:13 -07:00
Kuirong Wang
a36f288edd ASoC: msm: qdsp6: Add new AFE API supported by q6
Add new I2S AFE API command to q6 to support multiple
audio formats to I2S port including L-PCM, compressed,
L-PCM packed in IEC-60958, and compressed in IEC-60958.

Change-Id: Ia4a902d750a62bd183f45d1d72359596822be6dd
Signed-off-by: Kuirong Wang <kuirongw@codeaurora.org>
2012-04-13 14:00:20 -07:00
Linux Build Service Account
7def9eac06 Merge "Bluetooth: Grace period to re-enable encryption" into msm-3.0 2012-04-13 09:30:37 -07:00
Carter Cooper
7e7f02ed0a msm: kgsl: Add per context timestamp
Add new ioctls for per context timestamps.
Timestamp functions (read/write/wait) will now be context
specific rather than only using the global timestamp.
Per context timestamps is a requirement for priority
based queueing.

Change-Id: I5fdfb816480241b9552ecf90ed1bb22db3a652b5
Signed-off-by: Carter Cooper <ccooper@codeaurora.org>
2012-04-13 08:26:07 -06:00
Abhijeet Dharmapurikar
ded189bb51 power: pm8921-bms: account for capacitive drop
As the battery discharges, we need to account for the voltage drop across
capacitance in the battery. This voltage drop can be simulated using
a resistance in series with the battery such that it increases as state of
charge of the battery decreases.

Add parameter to account for this resistance in the profile tables.

Change-Id: Ic67b798ae8f480d8f42d9321e3847c4294bf7db3
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2012-04-13 01:00:00 -07:00
Abhijeet Dharmapurikar
baffba4e76 power: pm8921-bms: Add connector resistance
The current software does not take in to account the resistance
introduced because of the battery connectors and rsense. This
needs to be accounted for when the battery resistance is
calculated.

Change-Id: I0f2b440bae8168868b26f35c8ec59a21d4906f0f
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2012-04-13 00:59:59 -07:00
Linux Build Service Account
cb8abea1e7 Merge "regulator: Add qpnp-regulator driver" into msm-3.0 2012-04-12 23:03:05 -07:00
Linux Build Service Account
e8a19a59cb Merge "msm: 8064: hsic: Add msm_bus vote for hsic controller driver" into msm-3.0 2012-04-12 19:09:19 -07:00
Linux Build Service Account
3f0a4f9e03 Merge changes I38882200,Ia1ac4d9e,Idef723e5 into msm-3.0
* changes:
  msm: camera: v4l2 updates
  msm: camera: sensor changes for 7x30 v4l2
  msm: camera: prepare msm8x55 camera for V4L2 architecture.
2012-04-12 19:09:14 -07:00
Linux Build Service Account
c126085486 Merge "msm: vidc: Adds API to request performance level." into msm-3.0 2012-04-12 17:15:58 -07:00
Stephen Boyd
a073c2f70a clk: Add devm_clk_get()
Add a resource managed clk_get() to simplify clock usage in
drivers. This allows driver authors to "get and forget" about
their clocks by automatically calling clk_put() when the driver
is detached. This also encourages clock consumers to use the
clk_get() API correctly by passing in a struct device as an
argument.

Change-Id: I1ed53cd3c26c0390fa30cd3c3dca14bcdd59939f
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2012-04-12 15:44:22 -07:00
Philippe Gravel
4a3b942514 msm: camera: v4l2 updates
- Adds some protection against unexpected calls
- Update ifdef guards in msm_camera.h

Change-Id: I388822001159188a6c487f8c0deefa8fb5238249
Signed-off-by: Philippe Gravel <pgravel@codeaurora.org>
Signed-off-by: Sunil Joseph <sunilj@codeaurora.org>
2012-04-12 15:44:03 -07:00
Vinay Kalia
700f5c27d0 msm: vidc: Adds API to request performance level.
Adds API to request for a particular performance
level from video core. This is needed for Wi-fi
display (WFD) to reduce end to end latency.

Change-Id: Ib4133b8cd62ccad286be1984f944911754b887c5
Signed-off-by: Vinay Kalia <vkalia@codeaurora.org>
2012-04-12 11:54:53 -07:00
Linux Build Service Account
eaa3b3284a Merge "media: rc: Add support for RC6 philips IR remote control keymap" into msm-3.0 2012-04-12 10:26:52 -07:00
Hemant Kumar
e6275973cf msm: 8064: hsic: Add msm_bus vote for hsic controller driver
Drivers need to specify their bandwidth requirements to
bus-scaling driver to get guaranteed bandwidth on fabrics.

HSIC USB performance depends upon system fabric frequency
as HSIC USB controller has to support high bi-directional
data transfers. Hence, request for high bus bandwidth as
long as HSIC is active.

Also add debugfs entry to enable/disable the bus voting:-
echo enable > /sys/kernel/debug/ehci_hsic_msm_dbg/bus_voting
echo disable > /sys/kernel/debug/ehci_hsic_msm_dbg/bus_voting

CRs-Fixed: 342032
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
Change-Id: I7e208d67ef1c0168cd7621aeae4e8b123adef255
2012-04-12 09:34:53 -07:00
Linux Build Service Account
53e4d58968 Merge "msm: camera: Acutuator and flash control" into msm-3.0 2012-04-12 01:49:42 -07:00