Commit Graph

261162 Commits

Author SHA1 Message Date
Linux Build Service Account
7dbdcf7435 Merge "radio: iris: Use service availability to indicate station's signal strength" into msm-3.0 2012-01-19 14:59:10 -08:00
Linux Build Service Account
0652ee4b0e Merge "msm: 8930: Add SDC1 and SDC3 platform data" into msm-3.0 2012-01-19 14:59:10 -08:00
Linux Build Service Account
58e5babc00 Merge "msm_fb: display: perform backlight updates on overlay play" into msm-3.0 2012-01-19 14:59:10 -08:00
Linux Build Service Account
10e435cc9b Merge "USB: OTG: msm: Add PMIC VBUS notification support for peripheral only mode" into msm-3.0 2012-01-19 13:23:10 -08:00
Linux Build Service Account
1980cb37f5 Merge changes Icc844d30,I527768f0,If1cd6dda,I8cc87d5a into msm-3.0
* changes:
  msm: board: Add ION heap for Audio
  msm: board: Increase ION MM heap size
  msm: board: Restore SF and MM heap to PMEM sizes
  gpu: ion: Add new heap for qse comm
2012-01-19 13:23:10 -08:00
Linux Build Service Account
0f7e3d0587 Merge "ASoC: WCD9310: Read MBHC Firmware data for calibration" into msm-3.0 2012-01-19 13:23:10 -08:00
Linux Build Service Account
0c80c1a1eb Merge "ASoC: msm: Reduce the minimum period size for compress audio" into msm-3.0 2012-01-19 11:52:58 -08:00
Linux Build Service Account
adbdf7f375 Merge "net: usb: Set skb protocol based on RMNET Link Layer Protocol Mode" into msm-3.0 2012-01-19 11:52:58 -08:00
Linux Build Service Account
51e08eab20 Merge "ARM: 6993/1: platsmp: Allow secondary cpu hotplug with maxcpus=1" into msm-3.0 2012-01-19 11:52:58 -08:00
Linux Build Service Account
32a110abce Merge changes Iab2aff3d,I5ff76c3a into msm-3.0
* changes:
  of/irq: of_irq_init: add check for parent equal to child node
  of/irq: introduce of_irq_init
2012-01-19 11:52:58 -08:00
Linux Build Service Account
669649a990 Merge "msm_fb: hdmi: Correct logical clock rate for 480p" into msm-3.0 2012-01-19 11:52:58 -08:00
Linux Build Service Account
dc9635e3fe Merge "clk: add config option HAVE_CLK_PREPARE into Kconfig" into msm-3.0 2012-01-19 11:52:58 -08:00
Linux Build Service Account
a418bc2385 Merge "vidc: Map firmware buffers after memory clocks are ON." into msm-3.0 2012-01-19 11:52:58 -08:00
Linux Build Service Account
949f2c999c Merge "msm: iomap-8064: Add RPM, SAW-L2 and SAW-CPU memory map" into msm-3.0 2012-01-19 10:02:45 -08:00
Linux Build Service Account
e52e81b7e3 Merge "vidc: Added proper check for ION handle." into msm-3.0 2012-01-19 10:02:45 -08:00
Linux Build Service Account
ca6a61e107 Merge changes I4917de40,Id64bc384,Iae5182ff into msm-3.0
* changes:
  mfd: pm8038-core: enable bms and charger devices
  msm: 8930: enable charger, bms and ccadc
  mfd: pm8xxx: add charger, bms and ccadc devices on PM8038
2012-01-19 01:54:26 -08:00
Linux Build Service Account
369bafccfc Merge "msm: bam_dmux: migrate to new clock voting api" into msm-3.0 2012-01-19 01:54:26 -08:00
Linux Build Service Account
9734544609 Merge changes I1eafe532,Icea070c6 into msm-3.0
* changes:
  msm: idle_stats: Detect serialized use cases.
  msm: idle_stats: Reset all idle stats events
2012-01-19 01:54:26 -08:00
Linux Build Service Account
1ed4548689 Merge changes I31aa21c0,I9550c900 into msm-3.0
* changes:
  msm: 7x27a: Enable idle stats device for 7x27A
  msm: Config option to enable idle stats device
2012-01-19 01:54:26 -08:00
Linux Build Service Account
4b697d60d2 Merge "usb: gadget: Add proper cleanup of disabled endpoints" into msm-3.0 2012-01-19 01:54:26 -08:00
Linux Build Service Account
eddc1d32f6 Merge "msm: Copper: Add board and device tree support for SPI driver" into msm-3.0 2012-01-19 01:54:26 -08:00
Linux Build Service Account
48448409f2 Merge "msm: sdio: Remove sdio tty ciq device." into msm-3.0 2012-01-19 00:24:15 -08:00
Linux Build Service Account
c5f192c7e2 Merge "msm: rotator: Add pseudo-planar output for interleaved format." into msm-3.0 2012-01-19 00:24:15 -08:00
Linux Build Service Account
bf00c11662 Merge "msm_fb: display: fix underrun seen with big src coordinates" into msm-3.0 2012-01-19 00:24:15 -08:00
Gopikrishnaiah Anandan
cc5d20d1c1 vidc: Map firmware buffers after memory clocks are ON.
Change will delay mapping of buffers until bus bandwidth is
requested by video driver

Change-Id: Ibb6867baf6b3e821ec3ceafcdcab1e9225a5b109
Signed-off-by: Gopikrishnaiah Anandan <gopikr@codeaurora.org>
2012-01-19 13:26:27 +05:30
Linux Build Service Account
7ed41d531c Merge changes I1dbe1343,If2efa95c,Id299d224,I81fb7eee,Id3a3706d,Iecb7b40a,Icc18437a into msm-3.0
* changes:
  gpu: ion: Refactor debugfs printing
  gpu: ion: Add error message when allocation fails
  gpu: ion: Fix ion client name allocation
  gpu: ion: Add decrement of mapping count
  gpu: ion: Clean up logging messages
  gpu: ion: Fix SCM call message size
  gpu: ion: Add support for adjacent heaps
2012-01-18 21:35:34 -08:00
Linux Build Service Account
76ed95963d Merge "msm: vidc: Remove endianness change for 1080p firmware." into msm-3.0 2012-01-18 21:35:34 -08:00
Venkateshwarlu Domakonda
d6140eb5ef radio: iris: Use service availability to indicate station's signal strength
Check the service availability event to indicate the signal strength
of the tuned station.

Change-Id: I7d1c1f3de13351222cfdc27bc2d80dd08aadfdf2
CRs-Fixed: 331137
Signed-off-by: Venkateshwarlu Domakonda <Venkateshwarlu@codeaurora.org>
2012-01-19 09:51:55 +05:30
Pavankumar Kondeti
0d81f31555 USB: OTG: msm: Add PMIC VBUS notification support for peripheral only mode
Add PMIC VBUS notification support for peripheral only mode and
allow PHY retention and power collapse.  This patch also makes
changes to probe function to request PMIC ID IRQ in only OTG mode.

CRs-fixed: 330349
Change-Id: I4a5a6c50b0a3b56dcf78aea5b23499a264b3c9d5
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2012-01-19 08:15:37 +05:30
Gopikrishnaiah Anandan
4d05ed3776 vidc: Enable clocks required for secure playback.
The video driver should enable iommu clocks for vcodec, mdp and
rotator for content protection playback. Expose clocks to video
driver to enable for secure playback.

Change-Id: I2037cf5825d0b9cc7f37cf7fe56396163cb1db24
Signed-off-by: Gopikrishnaiah Anandan <gopikr@codeaurora.org>
2012-01-18 18:43:21 -08:00
Patrick Lai
64b43261ea ASoC: WCD9310: Read MBHC Firmware data for calibration
The MBHC headset specific calibration data is stored in the filesystem
as a firmware file. Read this data during initializing MBHC and
perform calibration. If this data is not found, fallback to using
default data provided by the machine driver.

Change-Id: I1cabfb2bb19ef379cdce14ed6b1af8a62e34c790
Signed-off-by: Patrick Lai <plai@codeaurora.org>
2012-01-18 18:22:37 -08:00
Olav Haugan
7355db0130 msm: board: Add ION heap for Audio
Add 2.72MB ION heap for Audio to enable Audio
to use ION for memory management. This ION heap
will replace pmem_audio pmem device.

Change-Id: Icc844d30873dc60e6f8c41b24ea98de021a75205
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2012-01-18 17:45:29 -08:00
Olav Haugan
a21169dc44 msm: board: Increase ION MM heap size
Increase ION MM heap size to 120MB to allow Camera
to work at 8MP with 5 snapshots.

Change-Id: I527768f02b39c6a97e1ea06b5e3e171d14e2e1e4
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2012-01-18 17:45:11 -08:00
Olav Haugan
b88eef1aca msm: board: Restore SF and MM heap to PMEM sizes
SF and MM heap are currently incorrectly sized.
Clients of these two heaps will run out of memory
and start failing.

Restore the SF and MM heap sizes to PMEM sizes. SF
heap will be 64MB if HDMI is configured as primary
otherwise 40MB. MM heap will be 66MB.

Change-Id: If1cd6dda58195ab6e4b71d111a017e1c59249849
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2012-01-18 17:44:44 -08:00
Olav Haugan
80854eb491 gpu: ion: Add new heap for qse comm
Add new 1MB carveout heap for Qualcomm Secure Executive (QSE)
communications.

Change-Id: I8cc87d5af68e9fd4f775770b16638ee01ef88e05
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2012-01-18 17:44:32 -08:00
Linux Build Service Account
089ec2e761 Merge changes Icc72e27b,I4bdddb5d into msm-3.0
* changes:
  thermal: tsens: Change the TSENS min threshold
  thermal: tsens: Add tsens notify callback
2012-01-18 17:01:10 -08:00
Olav Haugan
3d4fe1ac86 gpu: ion: Refactor debugfs printing
Printing to debugfs is done from a centralized location for
all the heaps managed by ion. This architecture is not
sustainable in the long run since different heaps have different
requirements for what should be printed.

Refactor the debugfs printing for ion so that each heap is
responsible for printing its information.

Change-Id: I1dbe13432a4ab07f27ea4756c3be7fa01ad1df92
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2012-01-18 16:41:56 -08:00
Olav Haugan
35e2f2f14b gpu: ion: Add error message when allocation fails
Add error message when allocation from ion fails.

Change-Id: If2efa95c563c9f076b85958a70ea66afa3983325
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2012-01-18 16:41:47 -08:00
Olav Haugan
63e5f3bc5a gpu: ion: Fix ion client name allocation
The ion client name used for debugging were being
allocated on the stack for user space clients. This
causes the name to be garbled when later printed.

Instead, allocate the name from the heap.

Change-Id: Id299d224192f127197bef2eeb22d881b3a31795c
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2012-01-18 16:41:26 -08:00
Olav Haugan
cb9ad9ead5 gpu: ion: Add decrement of mapping count
Add decrement of mapping count when mapping fails
and corresponding SMI release region call.

Change-Id: I81fb7eeee9973c770a65f02236c5358ce313e3a0
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2012-01-18 16:41:15 -08:00
Olav Haugan
9b2d1c2f8c gpu: ion: Clean up logging messages
Remove duplicate logging message for failure to create
a heap. Add logging message with name, base address, and
size of each heap created.

Change-Id: Id3a3706d914ffa72b0ecd84eb98785a678ceda9a
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2012-01-18 16:41:04 -08:00
Olav Haugan
41cf3e3363 gpu: ion: Fix SCM call message size
The SCM call message size used to protect and
unprotect memory is incorrect. The interface expects
13 bytes but 16 bytes is sent due to padding of the
message struct.

Pack the message structure to force the size of the
structure to 13 bytes.

Change-Id: Iecb7b40aa7e94454620c19cd70c3106392d2d311
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2012-01-18 16:40:53 -08:00
Olav Haugan
42ebe71efc gpu: ion: Add support for adjacent heaps
ION has to guarantee that two of the heaps are
adjacent to each other. This is due to a limitation
in the hardware. Add code to ensure these heaps
are adjacent.

Change-Id: Icc18437a50e1d872112468d02b61ab47fd70acc9
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2012-01-18 16:40:39 -08:00
Linux Build Service Account
3110d3fbe0 Merge "tzcom: Add support for modifying specific fields in cmd_buf" into msm-3.0 2012-01-18 15:18:40 -08:00
Linux Build Service Account
b67b56973b Merge "msm: board-8064: Port ION from 8960 to 8064" into msm-3.0 2012-01-18 15:18:40 -08:00
Hemant Kumar
964f1c9b9f net: usb: Set skb protocol based on RMNET Link Layer Protocol Mode
Embedded rmnet driver is setting skb protocol to ethernet link layer
protocol, which causes the IP stack to drop the packets if it is set
to raw IP link layer protocol mode. Hence set the SKB protocol based
on the RMNET link layer protocol mode.

Change-Id: Ife1243feec54a50c00ec833b6ed72f59bf883b94
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2012-01-18 14:57:51 -08:00
Deva Ramasubramanian
8f920ae2dc msm: defconfig: Enable writeback panel for wfd
For wifi display, the writeback panel is needed to capture the output of
mdp.  Setting this config enables the writeback panel.

Change-Id: I51006b74f63d286af6ca62bd95aa4fe2129f9fe4
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
2012-01-18 13:19:28 -08:00
Rajesh Sastrula
284fc85908 msm_fb: display: Fix incorrect goto call
During the probe for writeback panel, for MDP hardware versions
earlier than 4.3 an incorrect goto call un registers the bus scale handle
that primary panel uses. This is causing the boot failures because the
primary panel turn on sequence triggers the bus scale update request on
already unregistered handle.

Change-Id: Ie604b0ba5606d9664d2aeff28b8bea131965de61
Signed-off-by: Rajesh Sastrula <vrajesh@codeaurora.org>
2012-01-18 13:19:07 -08:00
Praveen Chidambaram
d9a4173222 msm: iomap-8064: Add RPM, SAW-L2 and SAW-CPU memory map
Add memory map for RPM, SAW L2 and SAW CPU registers for
cores 2 and 3 in a quad core system.

Change-Id: I6adf24ec072f09390d15596b8e267fcd9ee0acec
Signed-off-by: Praveen Chidambaram <pchidamb@codeaurora.org>
2012-01-18 12:31:16 -07:00
Rob Herring
506cfe7691 of/irq: of_irq_init: add check for parent equal to child node
With the revert of "of/irq: of_irq_find_parent: check for parent equal to
child" (dc9372808412edb), we need another way to handle parent node equal
to the child node. This can simply be handled in of_irq_init by checking
for this condition.

Change-Id: Iab2aff3db1e3eb61982102053806c44aceb5008b
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Tested-by: Pawel Moll <pawel.moll@arm.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
2012-01-18 11:01:48 -08:00