Commit Graph

119914 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
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
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
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
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
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
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
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
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
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
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
Rob Herring
54dca2dd09 of/irq: introduce of_irq_init
of_irq_init will scan the devicetree for matching interrupt controller
nodes. Then it calls an initialization function for each found controller
in the proper order with parent nodes initialized before child nodes.

Based on initial pseudo code from Grant Likely.

Changes in v4:
- Drop unnecessary empty list check
- Be more verbose on errors
- Simplify "if (!desc) WARN_ON(1)" to "if (WARN_ON(!desc))"

Changes in v3:
- add missing kfree's found by Jamie
- Implement Grant's comments to simplify the init loop
- fix function comments

Changes in v2:
- Complete re-write of list searching code from Grant Likely

Change-Id: I5ff76c3aa0f7bdf66577970dd9506336cd5712dd
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Reviewed-by: Jamie Iles <jamie@jamieiles.com>
Tested-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
2012-01-18 11:01:40 -08:00
Linux Build Service Account
6be5d51835 Merge "radio-tavarua: Modify FM Turn Off Sequence." into msm-3.0 2012-01-18 08:32:55 -08:00
Linux Build Service Account
4c8dbf894a Merge "msm: Camera: clear control queue" into msm-3.0 2012-01-18 06:21:01 -08:00
Linux Build Service Account
9b2463db60 Merge "radio: iris: Increase the RT buffer to fit the RT header" into msm-3.0 2012-01-18 04:39:10 -08:00
Linux Build Service Account
399efeb501 Merge changes Ic6fc032a,I02413658 into msm-3.0
* changes:
  msm: board-9615: Add HSIC Peripheral support
  usb: gadget: Add HSIC peripheral support.
2012-01-18 04:39:10 -08:00
Anna Perel
97b8c22352 usb: gadget: Add proper cleanup of disabled endpoints
Clear driver_data after disabling endpoints
to prevent shortage of endpoints and failures
on their reallocation.

Change-Id: I2dc74799d440b2e1d5e53fc0f89decbce494d6ec
Signed-off-by: Anna Perel <aperel@codeaurora.org>
2012-01-18 10:08:14 +02:00
Linux Build Service Account
6ccfed8446 Merge "vidc: 1080p: Increase context memory size of the H.264 encoder." into msm-3.0 2012-01-17 23:37:46 -08:00
Linux Build Service Account
bb13504182 Merge "usb: otg: Add support for power supply API for USB charging" into msm-3.0 2012-01-17 23:37:46 -08:00
Manogna Reddy Alle
7a068da60a msm: Camera: clear control queue
Clear control queue everytime before entering wait in msm_control as
there might be invalid payloads in the queue and this can lead to
not waiting at all and exit before the valid command completes.

Change-Id: I34991968cb6bb9c2978bcea4d8ce641894cc2453
Signed-off-by: Manogna Reddy Alle <cmalle@codeaurora.org>
2012-01-18 12:19:21 +05:30
Lynus Vaz
dde09ee24d msm: Config option to enable idle stats device
MSM_SLEEP_STATS_DEVICE option is used to compile idle stats device
framework which is needed for GPU DCVS feature.

Change-Id: I9550c90054587aa4fcec40131761eeaf54da8a03
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
2012-01-18 10:46:01 +05:30
Adrian Salido-Moreno
fa559f6cb6 msm_fb: display: fix underrun seen with big src coordinates
MDP underrun happens if combination of x + w or y + h exceeds 2048.
To handle such use cases add an offset to the source address instead.

Change-Id: I36a8b687c4e21cac9915b5bf71211c97f6b44ddd
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
2012-01-17 17:31:00 -08:00
Adrian Salido-Moreno
da2f3cc000 msm_fb: display: perform backlight updates on overlay play
Perform pending backlight requests on overlay play to handle cases in
which framebuffer updates are not happening to update backlight.

Change-Id: I97a39c8fc9405f308ed684041b171bccc917154d
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
2012-01-17 18:24:05 -07:00
David Keitel
b0f4036c4a mfd: pm8038-core: enable bms and charger devices
Enable charger and bms devices to make sure they are probed
on 8930.

Change-Id: I4917de40a672628bab868260b280cfb580668e4e
Signed-off-by: David Keitel <dkeitel@codeaurora.org>
2012-01-17 14:55:23 -08:00
Deepak Kotur
c59d62226a vidc: Added proper check for ION handle.
ION handle check was not correct for error case,
added the proper check for ION handle to handle
the error cases properly.

Change-Id: I6bf3ce32d5b77d4f2c606fda1c511967156d62c0
Signed-off-by: Deepak Kotur <dkotur@codeaurora.org>
2012-01-17 14:43:47 -08:00
Linux Build Service Account
7756577620 Merge changes I99f8604d,I50a535e8 into msm-3.0
* changes:
  msm: v4l2: add ISP support for more formats.
  msm: v4l2: fix support for test app.
2012-01-17 12:27:40 -08:00
Linux Build Service Account
956e5be694 Merge "spi_qsd: Add support for new QUPe controller." into msm-3.0 2012-01-17 10:52:54 -08:00
Deepika Pepakayala
e0e9e92051 msm: vidc: Remove endianness change for 1080p firmware.
Endianness change is no longer required for 1080p
firmware starting with Nov 30th 2011 firmware version.

Change-Id: I309d63b7efb544f80b44c6fc13955f186ece934b
Signed-off-by: Deepika Pepakayala <deepikap@codeaurora.org>
2012-01-17 10:35:17 -08:00
Shawn Guo
4ebfc3ff2e clk: add config option HAVE_CLK_PREPARE into Kconfig
The commit 40d3e0f (clk: provide prepare/unprepare functions) provides
the config option HAVE_CLK_PREPARE for platforms that have
prepare/unprepare implementation to select.  This patch adds the option
into drivers/clk/Kconfig, so that it can be actually selected.

Change-Id: I6d448486d26792bcd87a28a3ead25c063af40731
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
[sboyd@codeaurora.org: Remove CLKDEV config that isn't in 3.0]
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2012-01-17 09:02:22 -08:00