Commit Graph

260411 Commits

Author SHA1 Message Date
Linux Build Service Account
ffe4c27017 Merge changes Ie4293847,I050635b7 into msm-3.0
* changes:
  mfd: wcd9310: Make tabla interrupt line to be wakeable
  mfd: wcd9310: Retry read/write on failure
2011-12-22 01:02:15 -08:00
Linux Build Service Account
a7e3817399 Merge "USB: msm: Add support for CDC-ACM composition" into msm-3.0 2011-12-21 22:28:26 -08:00
Hemant Kumar
bc067e9913 defconfig: msm8960: Enable embedded rmnet usb host driver
Change-Id: Iddaec9111feda45a468296fc54c1bcddc46c4c5f
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2011-12-21 16:30:01 -08:00
Linux Build Service Account
dd06d9faec Merge "msm: camera: Configure the vfe bus io format correctly" into msm-3.0 2011-12-21 16:07:32 -08:00
Linux Build Service Account
7e9edb5f6c Merge "net: usb: Add support for embedded rmnet usb host driver" into msm-3.0 2011-12-21 16:07:32 -08:00
Helen Zeng
0705a5f7ea ASoC: msm: Add incall music delivery support
Add one backend DAI, and add one mixer control to route playback stream
to the new backend DAI. Start/stop playback commands will be sent to CVD
if starting/stopping playback, after voice call is established.

Change-Id: I334f1894ac0800e6a71fa7e20ac634b1b05cc414
Signed-off-by: Helen Zeng <xiaoyunz@codeaurora.org>
2011-12-21 06:47:08 -07:00
Linux Build Service Account
09d2ac6698 Merge "defconfig: enable CONFIG_FUSE_FS" into msm-3.0 2011-12-21 00:15:20 -08:00
Ramesh Masavarapu
49259689fe crypto: Add bus scaling request.
Add bus bandwidth request in crypto driver modules.
Add bus scaling request information to platform data files.
Currently the support for bandwidth request is enabled and tested on
msm8960 only.

Change-Id: I77edb827b1633218405cecf3a494c13b7b982c05
Signed-off-by: Ramesh Masavarapu <rameshm@codeaurora.org>
2011-12-20 23:46:34 -07:00
Anup Dasari
0eddea68bc defconfig: enable CONFIG_FUSE_FS
Change-Id: I80c2ca1e17b1e16995d44074d26edfe54d5e0578
Signed-off-by: Anup Dasari <adasari@codeaurora.org>
2011-12-21 11:08:18 +05:30
Rohit Vaswani
a681589929 msm: board-9615: Create a separate board file for gpiomux
Move the MSM9615 gpiomux configuration to a dedicated board
file.

Change-Id: I26c2d5cceab60d3429a7313939a5f7aaecfc7e32
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
2011-12-20 21:45:07 -07:00
Linux Build Service Account
97de8ee2c9 Merge "msm: kgsl: add power tracepoints" into msm-3.0 2011-12-20 20:10:09 -08:00
Linux Build Service Account
9f7f78dff1 Merge "fault_inject: Don't select frame pointer with ARM unwind" into msm-3.0 2011-12-20 20:10:09 -08:00
Linux Build Service Account
db33792b41 Merge "msm: kgsl: Do not ramp to turbo if the screen is off." into msm-3.0 2011-12-20 20:10:09 -08:00
Linux Build Service Account
92b1c95d2a Merge "msm: board-8960: Set PMIC GPIO6 for MHL_PWR_EN_N" into msm-3.0 2011-12-20 20:10:09 -08:00
Linux Build Service Account
d8cec086f7 Merge "msm: smp: cold and warm boot support for 4 cpus" into msm-3.0 2011-12-20 20:10:09 -08:00
Linux Build Service Account
4a55c4ed62 Merge "msm: acpuclock-8k: Return error on unexpected CPU_UP_PREPARE" into msm-3.0 2011-12-20 20:10:09 -08:00
Linux Build Service Account
87c700d998 Merge "usb: diag_bridge: Treat EPROTO as a non-recoverable error" into msm-3.0 2011-12-20 20:10:09 -08:00
Linux Build Service Account
544a005d36 Merge "vidc: Add video driver support for h264 level 3.2" into msm-3.0 2011-12-20 18:27:47 -08:00
Lucille Sylvester
5b3a942f2f msm: kgsl: Do not ramp to turbo if the screen is off.
Change-Id: I1f6e7a829352c0c5c8f31132bc22ad95ed737e28
Signed-off-by: Lucille Sylvester <lsylvest@codeaurora.org>
2011-12-20 18:11:28 -07:00
Matt Wagantall
ed90b00389 msm_xo: Make clock users vote on CXO_CLK instead of buffers
Users of internal MSM clocks derived from CXO should vote on the
CXO_CLK RPM resource rather than just the XO buffer resource. Voting
on CXO_CLK ensures the entire clock tree from the PMIC through to the
MSM clock controller is running, whereas voting for the buffer does
not guarantee the clock will not be gated off within the MPM.

Change-Id: I18199603bcd3ed2833409cb894536fa41711b3bb
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
2011-12-20 16:30:38 -08:00
Stephen Boyd
322a9925ac msm: pil-8960: Break off Riva support into separate driver
Implement the Riva boot and shutdown support as a platform
driver.

Change-Id: I4d9227009b817f2f4b530ebf1eecfb3d8844dd58
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2011-12-20 16:30:38 -08:00
Linux Build Service Account
6db8c62f1b Merge "Bluetooth: Clear sk_send_head when purging ERTM transmit queue" into msm-3.0 2011-12-20 15:39:46 -08:00
Abhishek Kharbanda
b7b13f07b1 msm_fb: HDMI_COMPLIANCE: Disable Encryption on NON HDCP builds.
HDMI Compliance require non HDCP builds to work on HDCP SURF's.
Do not set HDCP flag for NON-HDCP builds, so that encryption enable
bit is never set.

Change-Id: I6f2df598fe2ed4d9ae3673fcec74b76c30e3c0dd
Signed-off-by: Abhishek Kharbanda <akharban@codeaurora.org>
2011-12-20 14:15:49 -08:00
Linux Build Service Account
b3f768c52b Merge "vidc: Add metabuffer mode support for 720p encoder driver" into msm-3.0 2011-12-20 10:10:43 -08:00
Linux Build Service Account
8b5f8d8d83 Merge changes Id675e5f8,I312be3e0 into msm-3.0
* changes:
  msm: board: remove writeback memory from framebuffer
  msm_fb: display: allocate mdp writeback memory
2011-12-20 10:10:43 -08:00
Huaibin Yang
27634b815c msm: board: remove writeback memory from framebuffer
The memory is allocated on the driver side, board side allocation is
not needed any more.

Change-Id: Id675e5f8420aa82b904d057be0818ed017509869
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
2011-12-20 08:26:27 -08:00
Huaibin Yang
910183691e msm_fb: display: allocate mdp writeback memory
The writeback buffer is already reserved on the board side. This
allocation separate writeback buffer from framebuffer.

Change-Id: I312be3e0dfcf4c5b611cd06cd68d2baae7e2add8
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
2011-12-20 08:25:28 -08:00
Jeremy Gebben
b50f33135c msm: kgsl: add power tracepoints
Add kgsl_clk, kgsl_bus, kgsl_irq, kgsl_rail, kgsl_pwrlevel,
kgsl_pwr_set_state and kgsl_pwr_request_state trace
events.

Change-Id: I3bf246f350b1208123ab9a33c08495cea9c533eb
Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
2011-12-20 09:06:56 -07:00
Jeremy Gebben
388c297b8b msm: kgsl: power state cleanup
Clean up kgsl_pwrctrl_sleep() and kgsl_pwrctrl_wake() to make
state transistions clearer.  Add kgsl_pwrctrl_request_state()
and kgsl_pwrctrl_set_state() to make it easier to debug the
state machine.

CRs-Fixed: 315833
Change-Id: I656ce8bd19feabd4186ef91dc031f8a6c6a7d09a
Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
2011-12-20 09:06:55 -07:00
Linux Build Service Account
235ed09705 Merge "defconfig: Enable GENLOCK and GENLOCK_MISCDEVICE for 7627" into msm-3.0 2011-12-20 07:27:19 -08:00
Linux Build Service Account
116c195c7b Merge "msm: board: reserve mdp writeback memory" into msm-3.0 2011-12-20 07:27:19 -08:00
Eugene Yasman
97ee5c6da9 msm: board-8960: Set PMIC GPIO6 for MHL_PWR_EN_N
Configure PMIC GPIO6 to act as MHL_PWR_EN_N.

By default the MHL power is turned off.

Change-Id: I89f2c74f5d28fb8f72953199ed9368870632593c
Signed-off-by: Eugene Yasman <eyasman@codeaurora.org>
2011-12-20 16:20:42 +02:00
Linux Build Service Account
cc68af0ca3 Merge "msm_fb: display: enable pixel repeat on VG pipe only for alpha upscaling" into msm-3.0 2011-12-20 04:32:45 -08:00
Linux Build Service Account
85a6e24455 Merge "base: genlock: Avoid a race condition when releasing locks" into msm-3.0 2011-12-20 04:32:45 -08:00
Rajkumar Raghupathy
242565d1ea USB: msm_otg: Set PHCD bit if its not set by the controller during suspend
PHCD bit is automatically set by controller when SUSP bit is set in PORTSC
in Host mode. SUSP bit of PORTSC is set only when a device attached on the
root hub is suspended.

So during host mode suspend, set the PHCD bit if its not set by the
controller automatically.

Change-Id: I37aaab766d8f8eb658ae6fbeaf04be338e507fed
Signed-off-by: Rajkumar Raghupathy <raghup@codeaurora.org>
2011-12-20 00:08:55 -07:00
Adrian Salido-Moreno
c174d301d8 msm_fb: display: enable pixel repeat on VG pipe only for alpha upscaling
VG pipe doesn't support pixel repeat/drop to avoid alpha channel drop
during downscaling. Keep pixel repeat only for upscaling.

Change-Id: Id400d0f823bc0054a94330600d5085778a65b936
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
2011-12-19 22:45:03 -08:00
Huaibin Yang
a5419425d6 msm: board: reserve mdp writeback memory
The memory allocation happens on the display mdp driver side. This
separation of writeback buffers from the frame buffer is mainly for
content security.

Change-Id: I404b5f8db01dd5ed940916d7d46a8ace2d295e3a
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
2011-12-19 23:35:41 -07:00
Linux Build Service Account
a946f7dcd0 Merge "msm_fb: display: Add MDP 4.2 footswitch ctrl at suspend" into msm-3.0 2011-12-19 22:31:40 -08:00
Linux Build Service Account
067e1261e1 Merge "Camera : Change to retreive system time from Kernel" into msm-3.0 2011-12-19 21:08:27 -08:00
Linux Build Service Account
2ad7367f3a Merge "msm_fb: hdmi: Add DVI sysfs node" into msm-3.0 2011-12-19 21:08:27 -08:00
Linux Build Service Account
bc4ea69016 Merge "msm: rpm-regulator: Add stubs for rpm_vreg_set_*() APIs on copper" into msm-3.0 2011-12-19 21:08:27 -08:00
Linux Build Service Account
bad6b9bdb6 Merge "defconfig: msm-copper: Enable GPT partition support" into msm-3.0 2011-12-19 21:08:27 -08:00
Linux Build Service Account
b8679ed13d Merge "msm: board-8930: Add pil-q6 devices" into msm-3.0 2011-12-19 21:08:27 -08:00
Guruprasad Gaonkar
4c7758f294 Camera : Change to retreive system time from Kernel
This timestamp is needed in the userspace to flush old
video frames.

Change-Id: I432e5f5d35581b10857b41930d7751500ea131dc
Signed-off-by: Guruprasad Gaonkar <ggaonk@codeaurora.org>
2011-12-19 20:48:12 -07:00
Linux Build Service Account
8500cc84af Merge "msm: acpuclock: Remove acpuclock support for older targets like 7x01/7x25" into msm-3.0 2011-12-19 19:45:10 -08:00
Linux Build Service Account
4f4fb0401e Merge "ASoC: wcd9310: Return on an invalid switch value" into msm-3.0 2011-12-19 19:45:10 -08:00
Stephen Boyd
28d5495479 msm: board-8930: Add pil-q6 devices
MSM8930 also contains Q6 processors for audio and modem
operations. Add support for these devices so they can be booted
when needed.

Change-Id: Ib9ea651c75668457e45bdb6a283ca86b094bec05
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2011-12-19 18:56:41 -08:00
Matt Wagantall
9274df9fba msm: rpm-regulator: Add stubs for rpm_vreg_set_*() APIs on copper
Copper platform clock and acpuclock drivers need to call the
rpm_vreg_set_vdd() API to set vdd_dig and vdd_mem voltages. Until a
full rpm-regulator driver for copper is available, add stub functions
that always return success.

To do this a new MSM_RPM_REGULATOR Kconfig is added.

Change-Id: I0e7c3ab7cd56f7760f0083f4aaac000fdb56d0ec
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
2011-12-19 19:36:22 -07:00
Linux Build Service Account
0acb8094c7 Merge "msm: socinfo: Add MTP platform string" into msm-3.0 2011-12-19 18:28:24 -08:00
Linux Build Service Account
9cebc577a6 Merge "defconfig: 8960: Enable stack protector" into msm-3.0 2011-12-19 18:28:24 -08:00