Commit Graph

259669 Commits

Author SHA1 Message Date
Linux Build Service Account
219a067fc9 Merge "Revert "power: wakelock: don't set check_done flag if aborting"" into msm-3.0 2011-12-02 21:29:05 -08:00
Linux Build Service Account
3d576c0414 Merge changes Ibabfd2e2,I4424f2bd into msm-3.0
* changes:
  msm: board-msm7x30: Voltage level fix for shared Voltage Regulator.
  msm: board-regulator: Regulator Voltage range fix.
2011-12-02 21:29:05 -08:00
Linux Build Service Account
d6f72718c1 Merge "mmc: msm_sdcc: Fix NULL pointer dereference in IRQ handler" into msm-3.0 2011-12-02 21:29:05 -08:00
Linux Build Service Account
46786e7c4c Merge "defconfig: Enable MMC_CLK_GATE for better battery performance" into msm-3.0 2011-12-02 21:29:05 -08:00
Linux Build Service Account
5f0bc5c1eb Merge "msm: Remove msm specific implementation of io_remap_pfn_range." into msm-3.0 2011-12-02 21:29:05 -08:00
Linux Build Service Account
c0b3e4a370 Merge "msm: clock-9615: Do not control gsbi1 and gsbi2 clocks" into msm-3.0 2011-12-02 21:29:05 -08:00
Linux Build Service Account
493a58f36b Merge "8960_BT : Block the tasklets to schedule" into msm-3.0 2011-12-02 21:29:05 -08:00
Linux Build Service Account
4762169cce Merge "slim: msm: Disable runtime PM to avoid suspected slimbus lockup" into msm-3.0 2011-12-02 21:29:05 -08:00
Linux Build Service Account
f0685b99f3 Merge "msm: 8660: Re-order GPIO resources pertaining to SPI" into msm-3.0 2011-12-02 21:29:05 -08:00
Linux Build Service Account
55c981500b Merge "mfd: pm8921-core: Add support for PMIC PM8922 chips" into msm-3.0 2011-12-02 21:29:05 -08:00
Linux Build Service Account
1a5f69ac10 Merge "wcnss: Permit the module to be statically linked into the kernel" into msm-3.0 2011-12-02 21:29:05 -08:00
Linux Build Service Account
aaef2e0f17 Merge "msm: timer: don't use timer workaround on 8064 rumi" into msm-3.0 2011-12-02 21:29:05 -08:00
Linux Build Service Account
cd43b3029d Merge "msm: bam_dmux: Introduce watermarking in client transmit queue" into msm-3.0 2011-12-02 21:29:05 -08:00
Stepan Moskovchenko
8768eff1b9 msm: board-8930: Add support for MSM8627 devices
Add machine records and build support for MSM8627 CDP and
MTP devices. Fix up the board file to take the new machines
into account.

Change-Id: Ia79670b944fedc636995a4f454bb738347c867ad
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2011-12-02 12:22:20 -08:00
Stepan Moskovchenko
db71cd6ee0 msm: socinfo: Update socinfo for new 8627 and 8930 IDs
Create additional CPU type entries for MSM8930 and add CPU
type entries for MSM8627. Add a cpu_is check for 8627, and
update cpu_is_msm8930() to return true on 8930 and 8627.

Change-Id: I6ec8656aac3c6a39f9823b6aa1e2fbab2cd0b453
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2011-12-02 12:22:20 -08:00
Stepan Moskovchenko
39236d705c msm: 8930: Create separate board files for MSM8930
Create dedicated board files for MSM8930 targets, and move
the MSM8930 machine records and init code there. These
files are largely based on the MSM8960 board files.

Change-Id: I7de17856cb9950e98c349d38ddd87ba6109b6d23
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2011-12-02 12:22:20 -08:00
Stepan Moskovchenko
0c547bbe08 msm: board-8960: Create a separate board file for storage devices
Move the MSM8960 SDCC devices and initialization code into
a dedicated board file.

Change-Id: Ia504c5423d7ff1b85cf076aa4b0695d7a65d0c70
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2011-12-02 12:22:20 -08:00
Linux Build Service Account
d1a21be509 Merge "tools: perf: add perf-periodic" into msm-3.0 2011-12-02 10:52:39 -08:00
Linux Build Service Account
02e6753b88 Merge "camera: Correct vb2 buffer type." into msm-3.0 2011-12-02 10:52:39 -08:00
Vikram Mulukutla
fe836aafde msm: clock-9615: Do not control gsbi1 and gsbi2 clocks
Remove these clocks from the clock table since
the modem is utilizing them.

Change-Id: I857dac4bad2578229658a8568b3cf912a32eee64
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
2011-12-02 10:52:37 -08:00
David Collins
999480d505 mfd: pm8921-core: Add support for PMIC PM8922 chips
The PMIC PM8922 chip is very similar to the PM8921 chip.  Modify
the pm8921-core driver so that it can also handle PM8922 chips.

Change-Id: Ibae402ff65d1af4e0f18e4a66304f7ac609065b4
Signed-off-by: David Collins <collinsd@codeaurora.org>
2011-12-02 01:22:32 -07:00
Sathish Ambley
081d7842b1 mmc: msm_sdcc: Fix NULL pointer dereference in IRQ handler
If status indicates both MCI_CMDTIMEOUT and MCI_DATATIMEOUT has
occurred when handling the IRQ, MCI_CMDTIMEOUT handler ends the
pending request that cleans up the current request pointer followed
by MCI_DATATIMEOUT trying to perform similar operation causing a
NULL pointer reference. Check whether msmsdcc_request_end() has been
done before proceeding to service any status bit in the handler.

Change-Id: I26ddffae35779749102d04b5d66a8abf06d3fb6c
Signed-off-by: Sathish Ambley <sambley@codeaurora.org>
2011-12-02 00:16:21 -07:00
Linux Build Service Account
e8992f2213 Merge changes I3435fbda,I3ca11384,I74f29ae6,Ia9db958b,I6253b514 into msm-3.0
* changes:
  msm: board: Clean up device declarations
  msm: board-8960: Move WFD devices into board-msm8960-display
  msm: board-8960: Create a separate board file for PMIC devices
  msm: board-8960: Create a separate board file for display devices
  msm: board-8960: Create a separate board file for camera devices
2011-12-01 22:08:57 -08:00
Bhasker Neti
60734c0dea 8960_BT : Block the tasklets to schedule
Block the tasklets to schedule when there
is no event/data available on the SMD channels

Change-Id: Icc93aad85addc128ff5ad0650989132ebd8d6399
Signed-off-by: Bhasker Neti <bneti@codeaurora.org>
2011-12-01 17:06:38 -08:00
Karthikeyan Ramasubramanian
7bf5ca80ec msm: bam_dmux: Introduce watermarking in client transmit queue
BAM_DMUX does not put any restriction on the number of packets in
flight over the underlying BAM transport. This causes the bandwidth
to be not shared fairly among the clients. So introduce the concept
of watermarking in each client's transmit queue so that the clients
share the transport fairly and efficiently under high throughput
uplink scenarios

Change-Id: Ibf7e12b4cf13e826e7f83a41821f435cb7aa2cb0
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
2011-12-01 17:51:29 -07:00
Jeff Ohlstein
391a3ee697 msm: timer: don't use timer workaround on 8064 rumi
The timer workaround consistently fails to converge on 8064 rumi. Remove
it to prevent boot failures.

Change-Id: I10863bd9a54d0e510bcad332784ac80f029ac22f
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
2011-12-01 16:44:45 -08:00
Linux Build Service Account
6be929895e Merge changes I4d5d73ab,I6e076344,I6cf6035d,I29faa348 into msm-3.0
* changes:
  Perf: Use CPU PM notifiers to save and restore PMU regs
  ARM: cpu_pm: Add cpu power management notifiers
  ARM: Perfevents: Add mode exclusion support for Krait P2
  Perf: Fix detection of Krait implementation events
2011-12-01 15:09:41 -08:00
Linux Build Service Account
ea1c6b5118 Merge "regulator: pm8921-regulator: correct low power mode select bit mask" into msm-3.0 2011-12-01 15:09:41 -08:00
Linux Build Service Account
7af15f92df Merge "msm: timer: use appropriate workaround for timer instability" into msm-3.0 2011-12-01 15:09:41 -08:00
Linux Build Service Account
64964ca658 Merge "msm_fb: HDMI: EDID > 2 blocks, params not set." into msm-3.0 2011-12-01 15:09:41 -08:00
Linux Build Service Account
0fa2eca908 Merge "thermal: msm8960_tsens: Fix reading the correct sensor4 address" into msm-3.0 2011-12-01 15:09:41 -08:00
Linux Build Service Account
a5d11e08e4 Merge "msm: rpm-regulator: fix parameter usage in part helper macros" into msm-3.0 2011-12-01 15:09:41 -08:00
Linux Build Service Account
a9a5be958f Merge changes Ica870d27,Ibaddc7f1 into msm-3.0
* changes:
  ARM: architected timers: Add A15 specific sched_clock implementation
  ARM: local timers: Add A15 architected timer support
2011-12-01 15:09:41 -08:00
Linux Build Service Account
98c8de84ea Merge "msm: clock-local: Add support for cdiv clocks" into msm-3.0 2011-12-01 15:09:41 -08:00
Linux Build Service Account
ac7c4c7506 Merge "mmc: msm_sdcc: Add correct DMA limitations and some cleanup" into msm-3.0 2011-12-01 15:09:41 -08:00
Linux Build Service Account
53c8ec3595 Merge "msm: bam_dmux: Add debug statistics" into msm-3.0 2011-12-01 15:09:41 -08:00
Harini Jayaraman
5d93be1c5b msm: 8660: Re-order GPIO resources pertaining to SPI
This will help when moving to device tree support
where platform_get_resource_byname will be replaced by
platform_get_resource

Change-Id: I014dc85084b680f043fce68a4af5114487a2f4e7
Signed-off-by: Harini Jayaraman <harinij@codeaurora.org>
2011-12-01 13:58:49 -07:00
Stepan Moskovchenko
fc70d90094 msm: board: Clean up device declarations
Add 'static' to device declarations within the 8660 and
8960 board files.

Change-Id: I3435fbda413bb21fc0b68a9202d6b45db8b5249e
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2011-12-01 12:30:34 -08:00
Stepan Moskovchenko
270888d9a0 msm: board-8960: Move WFD devices into board-msm8960-display
Change-Id: I3ca113841854bd626d55c873d52f30ca0a4ee661
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2011-12-01 12:30:34 -08:00
Stepan Moskovchenko
ef1e0b6254 msm: board-8960: Create a separate board file for PMIC devices
Move the MSM8960 PMIC devices, associated devices, and
initialization code into a dedicated board file.

Change-Id: I74f29ae6f4eaed0a83b3622276f79477120748b4
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2011-12-01 12:30:17 -08:00
Stepan Moskovchenko
24cd864d7a msm: board-8960: Create a separate board file for display devices
Move the MSM8960 framebuffer and HDMI devices and
associated initialization code into a dedicated board file.

Change-Id: Ia9db958b13a7376d142b529773a4403505712682
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2011-12-01 12:10:01 -08:00
Stepan Moskovchenko
c6ada42b83 msm: board-8960: Create a separate board file for camera devices
Move the MSM8960 camera devices and associated
initialization code into a dedicated board file.

Change-Id: I6253b5143e7a9a6687f1b029f1af492cda1f6ced
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2011-12-01 12:10:00 -08:00
Naveen Ramaraj
179c22f1a2 msm: Remove msm specific implementation of io_remap_pfn_range.
The msm specific implementation of io_remap_pfn_range is no
longer applicable to current generation of msm targets.

Remove the implementation to avoid any potential remapping
to a wrong memory type.

Change-Id: I5cd5e0459c594e240f138dcdb37aef7c4698bea1
Signed-off-by: Naveen Ramaraj <nramaraj@codeaurora.org>
2011-12-01 12:00:26 -08:00
Shuzhen Wang
a56c140303 camera: Correct vb2 buffer type.
VB2 buffer type should be set according to buffer_type in
plane_info structure, not num_planes.

Change-Id: If8c5b8bc7873a71ee8dbeb317d6e117db630d43a
Signed-off-by: Shuzhen Wang <shuzhenw@codeaurora.org>
2011-12-01 10:19:38 -08:00
Linux Build Service Account
ce23e092e2 Merge "ASoC: wcd9310: Add IIR filter controls" into msm-3.0 2011-12-01 09:30:50 -08:00
Linux Build Service Account
711fa6f462 Merge "rtc: Avoid accumulating time drift in suspend/resume" into msm-3.0 2011-12-01 09:30:50 -08:00
Linux Build Service Account
0be823f673 Merge "Bluetooth: Use default RFC values if none received" into msm-3.0 2011-12-01 09:30:50 -08:00
Linux Build Service Account
1bc099d228 Merge changes I4c99d9e2,I9139b03c into msm-3.0
* changes:
  msm: kgsl: fix adreno225 register ranges
  msm: kgsl: fix error handling in adreno_waittimestamp()
2011-12-01 09:30:50 -08:00
Linux Build Service Account
6e47579058 Merge "hwmon: pm8xxx_adc: Remove pm8921-adc" into msm-3.0 2011-12-01 09:30:50 -08:00
Linux Build Service Account
4891b57d43 Merge "power: pm8xxx-ccadc: fix incorrect offset value" into msm-3.0 2011-12-01 09:30:50 -08:00