Commit Graph

45250 Commits

Author SHA1 Message Date
Linux Build Service Account
80b6c0a555 Merge "vidc: Migrate to new ION cache ops API." into msm-3.0 2012-03-23 10:51:04 -07:00
Linux Build Service Account
e812e74212 Merge "mdm9615: Add calibration data for TSENS" into msm-3.0 2012-03-23 10:51:04 -07:00
Linux Build Service Account
bfdf4e1ff1 Merge "msm: kgsl: Remove IOCTL_KGSL_DEVICE_REGREAD from msm_kgsl.h" into msm-3.0 2012-03-23 10:51:04 -07:00
Siddartha Mohanadoss
7e25dc1065 mdm9615: Add calibration data for TSENS
MDM9615 has identical configuration for the number
of sensors and slope with MSM8960. Add support to
enable the TSENS for calibrated parts.

Change-Id: Ieb1f118ce916ab5a4f079b18b11541d86c3a5560
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2012-03-22 22:37:15 -07:00
Linux Build Service Account
f241e16031 Merge changes Ibfd4ba25,Ifc6054cd into msm-3.0
* changes:
  ASoC: wcd9310: Add high impedance headphone detection support
  ASoC: jack: Add API report sock jack without DAPM sync
2012-03-22 15:52:14 -07:00
Linux Build Service Account
17f5150328 Merge changes I16c7c3b8,I3553fcf6 into msm-3.0
* changes:
  msm: camera: handle mediaserver crash elegantly.
  msm: camera: add fields to msm_stats_buf for cache operations.
2012-03-22 10:55:12 -07:00
Linux Build Service Account
069cbac25e Merge changes Ic6cfa7fb,I260ae216,Ib0c17763 into msm-3.0
* changes:
  mmc: core: Remove BROKEN_CLK_GATING quirk for WCN1314 cards
  mmc: msm_sdcc: fixup for enabling MMC_CLKGATE feature for SDIO cards
  mmc: core: Export mmc_set_ios so that host drivers can use it
2012-03-22 10:55:12 -07:00
Joonwoo Park
0332483368 ASoC: wcd9310: Add high impedance headphone detection support
If HPHL and HPHR have relatively high impedance, internal MBHC HPHL
trigger cannot trigger so results in headphone/headset detection
failure.
Utilize MIC trigger as well as HPHL trigger in order to detect headphone
and headset which have high impedance on headphone line.

CRs-fixed: 339390, 337590, 336847, 334339
Change-Id: Ibfd4ba254197233f2b5e253f5d1fa2a98c848c97
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>
2012-03-21 19:33:02 -07:00
Linux Build Service Account
2f1493e995 Merge "power: smb349: add support for smb349 charger chip" into msm-3.0 2012-03-21 19:01:13 -07:00
Linux Build Service Account
14697881a0 Merge "WLAN: WCN1314: Add card removal notification functionality." into msm-3.0 2012-03-21 19:01:13 -07:00
Linux Build Service Account
970c2a00c6 Merge "mfd: pm8018-core: Add PMIC thermal alarm device" into msm-3.0 2012-03-21 13:00:50 -07:00
Deepak Kotur
ef091c9243 vidc: Migrate to new ION cache ops API.
New cache ops API are provided thru ION interface
migrating the in kernel cache ops to use the
new cache ops API.

Change-Id: Idf152429316cec2eec8417d72160b7bd53488fc4
Signed-off-by: Deepak Kotur <dkotur@codeaurora.org>
2012-03-21 11:20:48 -07:00
David Keitel
c526ddbaeb power: smb349: add support for smb349 charger chip
The SMB349 charger chip allows charge batteries
with a higher current. Add this driver to be able to
control charging from kernel space and deliver charging
information to userspace.

Also add debugfs entries to show current register
settings of SMB349 charger.

Change-Id: Ic88b539304539a49ebe69517d13045cbb18091bf
Signed-off-by: David Keitel <dkeitel@codeaurora.org>
2012-03-21 08:30:20 -07:00
Pavan Kumar
89f18c3765 WLAN: WCN1314: Add card removal notification functionality.
Function driver can register for card removal notifications.
Before removing the card, let function driver notify the same
and allow it to cleanup.

Change-Id: I5d423807277bdd7476a6ea7d6a7c9ef71c0725f5
Signed-off-by: Pavan kumar <pavan@codeaurora.org>
2012-03-21 18:14:50 +05:30
Sujit Reddy Thumma
f4a999cf00 mmc: msm_sdcc: fixup for enabling MMC_CLKGATE feature for SDIO cards
In the current implementation, turning off SDCC clocks when
SDIO card is inserted, is controlled by the SDCC driver in
suspend/resume callbacks. This makes the dynamic clock gating
(MMC_CLKGATE) feature, when enabled, to be broken for SDIO cards,
as configuring of sdio wakeup interrupt is entirely handled
in system suspend/resume callbacks. Handle this by moving all
of the wakeup handling code to generic set_ios function which can be
called either from core layer or driver layer.

Since the SDCC controller supports asynchronous notification of
SDIO card activity when the clocks are off use this for enabling
MMC_CLKGATE feature which helps in TCX0 during idle state.

Also, handle the case where the SDIO function driver is not interested
in waking up the system during suspend but the SDCC driver still
configures DAT1 line as wakeup interrupt.

Change-Id: I260ae2161cfe9160f93e6af4f9b6c34db96397c0
Signed-off-by: Sujit Reddy Thumma <sthumma@codeaurora.org>
2012-03-21 14:50:04 +05:30
Sujit Reddy Thumma
f0410bc6dc mmc: core: Export mmc_set_ios so that host drivers can use it
mmc_set_ios() is used by host drivers during suspend/resume
routines in indirect way i.e., by calling host->ops->set_ios().
But now with MMC_CLKGATE enabled, mmc_set_ios() also updates
host->clk_gated flag. So export this API so that host controller
drivers can use it.

Change-Id: Ib0c177635bb8d87ba68c98e08b8d940c73f2b80c
Signed-off-by: Sujit Reddy Thumma <sthumma@codeaurora.org>
2012-03-21 14:35:44 +05:30
Linux Build Service Account
12f67e4b9e Merge changes If37ca9fd,I1a33be9a,I15d374d1 into msm-3.0
* changes:
  of/irq: Add interrupts-names property to name an irq resource
  of/address: Add reg-names property to name an iomem resource
  of: Add helpers to get one string in multiple strings property
2012-03-20 15:31:17 -07:00
Linux Build Service Account
ea5780a1fb Merge "Bluetooth: Poll for RSSI updates from the remote device" into msm-3.0 2012-03-20 13:13:49 -07:00
David Collins
39914be208 mfd: pm8018-core: Add PMIC thermal alarm device
Register a PMIC pm8xxx thermal alarm device in the pm8018-core
driver.  This device will allow userspace to monitor the
temperature of the PMIC die.

Change-Id: I888c0737dd991da9eaec039b20b381a2bfd7923c
Signed-off-by: David Collins <collinsd@codeaurora.org>
2012-03-20 10:07:04 -07:00
Linux Build Service Account
f460a8a8f3 Merge changes Ieea5bcfa,I89564dcc,If8df9333 into msm-3.0
* changes:
  power: pm8921-charger: remove obsolete wakelock
  power: pm8921-charger: calibrate hkadc upon insertion/removal
  power: pm8921-charger: implement ir compensation
2012-03-19 23:50:54 -07:00
Archana Ramachandran
26a752b8a7 Bluetooth: Poll for RSSI updates from the remote device
This feature is required for implementing Low energy
proximity client immediate alert service. The proximtiy
client registers with the kernel for receiving RSSI updates
of the remote device. The kernel starts polling for RSSI
value using READ_RSSI HCI command and When it reaches
a particular threshold set by the proximity client,
updates are sent to the client.

Change-Id: I723dd140ad3bf02978c57b3ab127bb6768f28cca
CRs-fixed: 344936
Signed-off-by: Archana Ramachandran <archanar@codeaurora.org>
2012-03-19 21:21:45 -07:00
Joonwoo Park
a909e1258f ASoC: jack: Add API report sock jack without DAPM sync
Currently snd_soc_jack_report() always acquires codec->mutex and
synchronize DAPM widgets.  This automation is helpful if jack has defined
widget.  However if codec driver doesn't have defined jack widget and
non-jack widget wants to synchronize with report_sock_jack's thread which
is usually irq handler, it can make dead-lock as all DAPM widget
call-backs are called after codec->mutex acquisition.
Add new API snd_soc_jack_report_no_dapm() so codec driver can have ability
of control DAPM synchronization part of snd_soc_jack_report()

Change-Id: Ifc6054cd8b6d8a6b52517cf84baca1e3949e09fe
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>
2012-03-19 19:32:14 -07:00
Linux Build Service Account
dd5ab517d3 Merge "diag: Fix incorrect parsing of log codes" into msm-3.0 2012-03-19 17:57:32 -07:00
Benoit Cousson
d89cc02f11 of: Add helpers to get one string in multiple strings property
Add of_property_read_string_index and of_property_count_strings
to retrieve one string inside a property that will contains
severals strings.

Change-Id: I15d374d13ee7711548e3626e49875b6ee8be0e1f
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Kevin Hilman <khilman@ti.com>
[mbohan@codeaurora.org: resolve conflict in include/linux/of.h]
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
2012-03-19 16:20:19 -07:00
Ankit Premrajka
073e0cab00 msm: camera: add fields to msm_stats_buf for cache operations.
Add a couple of fields to the msm_stats_buf structure
for cache coherence support on stats buffers from
user-space.

Change-Id: I3553fcf6359e4e748eb309d4a0a5979999d96f09
Signed-off-by: Ankit Premrajka <ankitp@codeaurora.org>
2012-03-19 14:35:43 -07:00
Harsh Vardhan Dwivedi
b6cebfe735 msm: kgsl: Remove IOCTL_KGSL_DEVICE_REGREAD from msm_kgsl.h
The code for IOCTL_KGSL_DEVICE_REGREAD was removed long ago
but the header was never cleaned up.

Change-Id: Id3eaf0486fae133dfd72a56ea915f63fcb3f6bb1
Signed-off-by: Harsh Vardhan Dwivedi <hdwivedi@codeaurora.org>
2012-03-19 11:51:57 -06:00
Linux Build Service Account
bfa4b58370 Merge "ASoC: msm: Add support for voice over Bluetooth" into msm-3.0 2012-03-18 11:11:45 -07:00
Linux Build Service Account
b7029072ef Merge "Bluetooth: Set security level based on remote device features." into msm-3.0 2012-03-17 05:05:07 -07:00
Neema Shetty
3c9d286936 ASoC: msm: Add support for voice over Bluetooth
Add support for Slimbus channels between external modem and APQ.
These channels transfer voice packets to/from the modem to the
BT stack on APQ.

Change-Id: I48bd5248104719574fbc6cf52edfb92cff79bff9
Signed-off-by: Neema Shetty <nshetty@codeaurora.org>
2012-03-17 02:04:01 -07:00
Shalabh Jain
fbf3bdc54f diag: Fix incorrect parsing of log codes
DIAG maintains mask info in a buffer. This buffer is parsed
using a structure. Recently this structure was modified to add
another member. Now, the parsing code has to change to account
for this new member, otherwise, the parsing is incorrect and
misses certain log codes.

Also updated log codes with the latest on modem.

Change-Id: Iaaf86e4f3342fd73898eb11124b4893ec79aa564
Signed-off-by: Shalabh Jain <shalabhj@codeaurora.org>
2012-03-16 21:12:39 -07:00
Kevin Chan
210061ffd9 msm: camera: Add media device node
Add media device node for each camera sensor
Sensor and video node info will be used
for device discovery from userspace

Change-Id: Id8c2f3e952c83259bb6b273cb6b3f04ed93d0ef3
Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
2012-03-16 10:34:41 -06:00
Deva Ramasubramanian
a7046bbcfd [media] v4l: Add new mode for in-band video header in all I-frames
V4L clients should be able to specify the video header to be present
in all I-frame (as it is common in many broadcasting scenarios).  By
specifying this mode, V4L clients will receive sps/pps information
prepended to all I-frames.

Change-Id: Ia93b1d0a59b8d1abf13d1bdb8de494f13ebe1c95
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
2012-03-16 10:26:51 -06:00
Linux Build Service Account
7cd20b9aad Merge "mm_video: vidc: SPS PPS enable for IDR and zero stuff bytes" into msm-3.0 2012-03-15 02:36:15 -07:00
Linux Build Service Account
c17ab9bb48 Merge changes I04eb39d9,If3ce2aaa into msm-3.0
* changes:
  msm: qpnp: Add gpiolib support for PMIC GPIOs
  of: of_spmi: Add support for spmi-dev-container binding
2012-03-14 22:07:27 -07:00
Michael Bohan
0ba63b86ba msm: qpnp: Add gpiolib support for PMIC GPIOs
Add a gpio_chip driver to support the Qualcomm SPMI PMIC
architecture called QPNP. The driver supports Device Tree
and allows a device_node to be registered as a gpio-controller.

The driver also specifies APIs to allow a non-Device Tree user
the ability to configure the PMIC GPIOs.

This driver does not handle interrupts for GPIOs directly.
Instead, that work is handled by the existing qpnp-int driver.
This is feasible since the interrupt register map for all
QPNP peripherals is the same.

Change-Id: I04eb39d9855b0957f0647010fcb203ec2fc83c7c
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
2012-03-14 14:05:41 -07:00
Michael Bohan
86622b3ef7 of: of_spmi: Add support for spmi-dev-container binding
The spmi-dev-container binding is intended for SPMI
configurations that have multiple device nodes associated with
only one spmi_device. By default, if this flag is not specified,
each device node will create a new spmi_device.

Sometimes having multiple spmi_devices for SPMI device nodes is
superfluous. One example of this is gpios. In some architectures,
a single gpio is treated as a unique device. But from a gpio_chip
perspective, the chip is comprised of many gpios. Beyond wasting
memory allocating a unique spmi_device per gpio, the implication
of not coalescing spmi_devices is that the clients probe() routine
would be called N number of times. But this sort of behavior makes
it difficult to realize when a gpio_chip starts and stops. If we
assume that one gpio_chip represents one call to probe(), then
this problem is solved, since all gpios in that chip will be
passed as resources.

In order to support multiple device nodes per spmi_device, we
also need to extend the data structures for spmi_resources.

This change also makes an effort to cleanup some of the error
handling for illegal combinations of device bindings, as well as
adding some additional documentation.

Change-Id: If3ce2aaaa07bdf79e0d9fdedf16419e74a00fbec
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
2012-03-14 14:05:41 -07:00
Michael Bohan
9b7ac517c2 regulator: Add stub regulator support
Add support for a dummy driver that has an implementation
connected to no real hardware devices. Its purpose is to aid
bringup scenarios by providing clients a regulator interface
that they expect. This driver shouldn't be enabled if a real
device implementation for a particular platform already exists.

Change-Id: Ib83027b4e599ebbc3cb153b2f346bb03495bb746
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
2012-03-14 13:58:11 -07:00
Linux Build Service Account
5fafd3ce28 Merge "net/wireless: Support to disable CCK rate for management frame" into msm-3.0 2012-03-14 12:14:20 -07:00
Abhijeet Dharmapurikar
40491ce8d0 power: pm8921-charger: implement ir compensation
The charger hardware has a +/-30mv error for vdd_max settings. This
means that when vdd_max is set to 4200mV the actual voltage on vph_pwr
line could range from 4170mV to 4230mV. This further means that when
constant current to constant voltage transition happens, the battery
may not be charged up to 4200mV - leading to an premature end of charge.

Fix this by implementing periodic IR compensation. On a device measure the
resistance from the vbat terminal to the ground by shorting the +ve and
-ve of the battery terminals (without a battery), this will be referred to
as rconn in the description. In the code it is rconn_mohm to reflect the
units.

The voltage at battery terminal will be
Vbat(terminal) = Vbat(xoadc) + Ibat * rconn
where Ibat is the current flowing out of (or into if -ve) of the battery.

Vbat(xoadc) and Ibat can be obtained by using the override mode of the
bms. So Vbat(terminal) can be deduced and compensated by increasing
vdd_max. This also helps in increasing constant current mode thereby
decreasing constant voltage mode and decreasing the overall charging time.

The value of rconn will be specific to a PCB layout, it is
passed in from platform_data.

Change-Id: If8df93333ca6b0bad35505895a4fc5577562fadd
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2012-03-14 10:41:08 -07:00
Prabhakaran Mc
453651c5db Bluetooth: Set security level based on remote device features.
Connection security level is modified based on remote device's
extended feature. Deciding SSP capability of remote device
by EIR response is incorrect, because few BT2.1 devices do not
send EIR and few BT2.1 devices which send EIR do not support
SSP. SSP capability of remote device has to be decided based on
remote_extended_features event. This patch makes sure that
MEDIUM_SECURITY is set for non ssp devices' pairing process.

Change-Id: I328a35a30895f2ab6abaaeec51b364ecd633e642
CRs-fixed: 339166
Signed-off-by: Prabhakaran Mc <prabhakaranmc@codeaurora.org>
2012-03-14 16:05:16 +05:30
Linux Build Service Account
6b302e1753 Merge changes Idc72ee81,Ibe2519ff,I2982b9f4,Icb2a8c32 into msm-3.0
* changes:
  USB: android: Add OTG descriptor to configuration
  USB: OTG: msm: Add support for SRP and HNP
  USB: EHCI: use otg_start_hnp() to intiate HNP in ehci-hub.c
  USB: gadget: Add OTG support for ci13xxx_udc
2012-03-14 02:38:42 -07:00
Sunil Dutt Undekari
08166fc6f4 net/wireless: Support to disable CCK rate for management frame
Provision to distinguish the P2P scan and the normal scan
with no_cck flag and thus disable the 11b rates for
p2p scan.

Change-Id: Ia4073a5f926c6ac97dffdee99f54ba53535fea85
Signed-off-by: Sunil Dutt Undekari<duttus@codeaurora.org>
2012-03-14 14:23:14 +05:30
Linux Build Service Account
f2b497fec2 Merge "msm-camera: enhance the camsenser query structure" into msm-3.0 2012-03-14 00:34:42 -07:00
Mingcheng Zhu
c85b8ade5c msm-camera: enhance the camsenser query structure
More information needs to pass to userspace.

Change-Id: Ia7c5a5cf9a7f48e1c6167fd3ca2ddd56fbdbf8c9
Signed-off-by: Mingcheng Zhu <mingchen@codeaurora.org>
2012-03-13 01:43:53 -07:00
Vijayavardhan Vennapusa
a3152031da USB: OTG: msm: Add support for SRP and HNP
This patch changes OTG driver to support different
OTG statemachine states for OTG2.0 complaince. It will
also enable to swap Host role between two OTG devices
via HNP and enable B device to request A device to start
VBUS session via SRP.

Change-Id: Ibe2519ff1570768f51e879af483a6f5c23b38d8f
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2012-03-13 11:39:37 +05:30
Arun Menon
4093ccc3b1 mm_video: vidc: SPS PPS enable for IDR and zero stuff bytes
This change includes the driver support for the
latest firmware updates - SPS PPS generation for
every IDR frame encode and MPEG-2 zero stuff
bytes consumption.

Change-Id: Icdf3728897f47c90667cd650946ca324346611c5
Signed-off-by: Arun Menon <menon@codeaurora.org>
2012-03-12 15:20:45 -07:00
Sandeep Kodimela
c6f7867e7f msm-camera: Add 8MP and 1MP sensor support
Add support to mt9e013 and ov9726 sensors for v4l2 camera
architecture

Change-Id: Ie0e12bb0b8f1d80c0aa40800f5578208ca86efcb
Signed-off-by: Sandeep Kodimela <skodimela@codeaurora.org>
2012-03-12 11:41:07 +05:30
Linux Build Service Account
ce8927b4fe Merge changes I58e8325e,Idaeae269,If5723f0d,I49a84dca,I1241f952 into msm-3.0
* changes:
  msm: Define 4 domains for IOMMU
  gpu: ion: Delay unmapping from IOMMU.
  gpu: ion: Add map_dma support in IOMMU heap
  gpu: ion: Add cache operations to IOMMU heap
  gpu: ion: Allow smaller mappings
2012-03-10 09:51:46 -08:00
Linux Build Service Account
7e157991a6 Merge "Merge remote-tracking branch 'idos/usb3-msm-3.0-backport-dwc3' into merge/idos" into msm-3.0 2012-03-09 16:37:44 -08:00
Linux Build Service Account
025b0782ab Merge "bluetooth: Add support for remote_features" into msm-3.0 2012-03-09 16:37:44 -08:00