Commit Graph
338376 Commits
Author SHA1 Message Date
Linux Build Service Account 8f9f5e8764 Merge "staging: zsmalloc: Rename page_mapcount_reset" 2013-11-20 09:51:17 -08:00
Linux Build Service Account bf3a041ea8 Merge "msm: mdss: release mdp dsi clock only when reset" 2013-11-20 09:51:11 -08:00
Linux Build Service Account d4427a5112 Merge "mdss: mdp3: request and release clocks for every mdp operation" 2013-11-20 09:51:10 -08:00
Linux Build Service Account 0645a77b2f Merge "Revert "ASoC: msm: Increase Proxy buffering"" 2013-11-20 01:03:23 -08:00
Linux Build Service Account 438e095921 Merge "ASoc: msm: Add check for compressed capture format" 2013-11-19 22:07:57 -08:00
Linux Build Service Account 3bc4aa4e52 Merge "crypto: msm: multiple qce50 support" 2013-11-19 22:07:51 -08:00
Linux Build Service Account 1c453445f1 Merge "power: qpnp-bms: use IAVG for charging adjustments" 2013-11-19 22:07:46 -08:00
Linux Build Service Account d58f7a9446 Merge "tspp: Protect against buffer overflow" 2013-11-19 22:07:28 -08:00
Linux Build Service Account 97207b5ad0 Merge "gpu: ion: Use list_for_each_safe on error path" 2013-11-19 22:07:26 -08:00
Vishwanatha Kumar Ulthur 7c9d56162d Revert "ASoC: msm: Increase Proxy buffering"
This reverts commit c1a463e273

Change-Id: I88ffb9822184d8f227799a97a7cbceaf2f80f769
2013-11-19 19:15:11 -08:00
Olav Haugan c08a3c5d52 staging: zsmalloc: Rename page_mapcount_reset
The page_mapcount_reset function was renamed from
reset_page_mapcount when back-porting zsmalloc from 3.10 kernel.
Revert this change to enable compilation of zsmalloc.

Change-Id: Iba09fc3f0294dae746d2e2b026e0015711c22f01
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2013-11-19 17:51:38 -08:00
Xiaoming Zhou 574be6ab2c msm: mdss: release mdp dsi clock only when reset
Earlier, we were releasing all the MDP clocks during
lk to kernel transition.   We only need to release
the mdp dsi clock.

Change-Id: Iafa43afc1194e5f7cb50445a9542a21b16ffaef5
Signed-off-by: Xiaoming Zhou <zhoux@codeaurora.org>
2013-11-19 19:59:12 -05:00
Xiaoming Zhou 7c42511f6b mdss: mdp3: request and release clocks for every mdp operation
In the command mode panel, all the clocks can be voted off if
there is no display update.  To support this feature, every
operation which requires h/w access will be guarded with clock
vote on and off.

Change-Id: If56a656b9965a6044c38de5aa85969256d581121
Signed-off-by: Xiaoming Zhou <zhoux@codeaurora.org>
2013-11-19 19:58:58 -05:00
Xiaozhe Shi fc7af17ad2 power: qpnp-bms: use IAVG for charging adjustments
When the BMS detects that the charger is in constant voltage (CV)
charging, it will start SoC based on average current. This can cause
issues however, if the charging current suddenly spikes low when the BMS
is reading it from the IADC. There has been instances where current is
reduced by 100mA while charging without any drop in battery voltage when
SoC calculations are being done. When this happens, the charging
adjustment algorithm will make SoC jump high.

Fix this by using iavg, the average current over the last calculation
period calculated from the coulomb counter. This value is a much better
representation of the actual charging current and is less prone to
sudden drops.

Change-Id: I75adfffedfa19370e9c3e4355bd03fa1f59c4f50
Signed-off-by: Xiaozhe Shi <xiaozhes@codeaurora.org>
2013-11-19 15:27:41 -08:00
Linux Build Service Account 0c386cea50 Merge "msm: mdss: Enable hardware reset line based on panel setting" 2013-11-19 09:14:03 -08:00
Linux Build Service Account 795b59382a Merge "ARM: dts: msm: Increase QSEECOM heap size to 13 MB" 2013-11-19 09:13:47 -08:00
Linux Build Service Account f55c7b81a6 Merge "defconfig: Enable msm_sharedmem UIO driver" 2013-11-19 09:13:38 -08:00
Linux Build Service Account 36081edc6c Merge "ARM: dts: msm: Add new 'sharedmem' devices" 2013-11-19 09:13:37 -08:00
Linux Build Service Account b648a890a7 Merge "uio: msm_sharedmem: Add new device driver for sharedmemory access" 2013-11-19 09:13:36 -08:00
Linux Build Service Account 8325c5af52 Merge "msm: vidc: send extradata size in ftb for dynamic buffer mode" 2013-11-19 09:13:32 -08:00
Zhen Kong a403ac3d57 crypto: msm: multiple qce50 support
In some platforms such as fsm9900, multiple instances of qce50 hw
may be supported.  Each qce50 HW has an ndp-bam. Each qce50 HW
can support multiple instances of qce_dev platform device.
Each qce_dev has its own configured pipe set and associated qce50 HW,
defined by crypto-base and bam-pipe-pair fields in the device tree files.
This patch based on io address, it decides to create a new qce50 hw
instance or use the existing known instance at device probe time.

Furthermore, this patch does iomap for only once for each HW BAM instance
to avoid issue with bam driver. If modprobe, and rmmod of qcedev,
and qcrypto are not in first in last out order, kernel may crash in
bam driver in the last rmmod.
This saves virtual space for IO if multiple instances of qcedev
share the same instance of HW BAM.

Change-Id: I1565b1976981b0512832ff793e0adb29c4be3ccc
Acked-by: Chemin Hsieh <cheminh@qti.qualcomm.com>
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
2013-11-18 15:27:36 -08:00
Dhaval Patel ba0d985176 msm: mdss: Enable hardware reset line based on panel setting
DSI clock and data lanes should be in LP11 state before
enabling the hardware reset line for some panels. These
panels might need initialization delay after DSI host and slave
in LP11 state to reach functional. No data traffic
is allowed for such panels during this master delay.

CRs-fixed: 572179
Change-Id: I6a004f55a117f1adfbfbfce85231ef45997e4e6f
Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>
2013-11-18 11:06:02 -08:00
Laura Abbott 18ebf62fdf gpu: ion: Use list_for_each_safe on error path
On an error, the list of pages is walked and destroyed. Since the list
is being destroyed, use list_for_each_safe to avoid list corruption.

Change-Id: Ia397a11d2d890b3458745820c79df2adaa088ade
CRs-Fixed: 565183
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2013-11-18 08:53:23 -08:00
Pratibhasagar V aaf81f8f16 defconfig: Enable msm_sharedmem UIO driver
Enable msm_sharedmem UIO driver on targets which use RemoteFS
(over QMI) and RFSA.

CRs-Fixed: 477427
Change-Id: I63d95aa0fcbbdc17d64fb7749ed50c3890551dce
Signed-off-by: Pratibhasagar V <pratibha@codeaurora.org>
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
2013-11-18 19:30:11 +05:30
Pratibhasagar V c20526ae89 ARM: dts: msm: Add new 'sharedmem' devices
Add new devices which need to maintain the shared memory
address for RemoteFS and RFSA

CRs-Fixed: 477427
Change-Id: Id5f3ea2a827d5a30b06d872d7a72468f1fd7718f
Signed-off-by: Pratibhasagar V <pratibha@codeaurora.org>
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
2013-11-18 19:17:55 +05:30
Pratibhasagar V 52fa28264c uio: msm_sharedmem: Add new device driver for sharedmemory access
Add new device driver to provide a standard interface for its
clients (like RemoteFS and RFSA) to be able to memory map their
respective allotted shared memory address in the client's address space.
The shared memory (a transport buffer) address is unique for each
individual client and is made available to the driver via device tree.

This driver uses the existing UIO framework to facilitate the clients
mmap requirements. Each individual client will be able to use a unique
UIO device for this purpose.

CRs-Fixed: 477427
Change-Id: If07b88086b5f1b87845962818094644575629fcf
Signed-off-by: Pratibhasagar V <pratibha@codeaurora.org>
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
2013-11-18 19:14:29 +05:30
Mingming Yin 15d2618c62 ASoc: msm: Add check for compressed capture format
- Only AMRWB format is supported in compress capture
  path, use default codec.id(SND_AUDIOCODEC_AMRWB) if
  request codec id is invalid.
- Use fixed band mode and dtx mode since these are the
  only supported parameters for AMRWB format

Change-Id: I45a48952a5833c3e85588b515d38d311064cd7fb
Signed-off-by: Mingming Yin <mingming@codeaurora.org>
Signed-off-by: Krishnankutty Kolathappilly <kkolat@codeaurora.org>
2013-11-17 15:04:48 -08:00
Hamad Kadmany 7d8a6f83c7 tspp: Protect against buffer overflow
Change filter->priority to unsigned int. Since it was defined as integer,
it may have had negative value and cause accessing an array outside
of its region

CRs-Fixed: 561802, 561825
Change-Id: Ie72aa09b07e79b0b67081b74e3b2057de30f03d0
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
2013-11-17 11:31:01 +02:00
Linux Build Service Account 6f51c44f07 Merge "mdss: support for solid fill with color specified by HAL" 2013-11-16 08:58:36 -08:00
Linux Build Service Account bd953b4f60 Merge "mdss: mdp3 driver support for solid fill" 2013-11-16 08:58:35 -08:00
Linux Build Service Account 15a4cdeb59 Merge "Revert "msm: kgsl: Get reference to process private when attaching mem entry"" 2013-11-16 08:58:28 -08:00
Linux Build Service Account dcc21e08da Merge "Revert "msm: kgsl: Add TSE performance counter to software hang detection"" 2013-11-16 08:58:27 -08:00
Linux Build Service Account a71e4728d9 Merge "Merge remote-tracking branch 'remotes/quic/jb_3.2' into HEAD" 2013-11-16 08:58:27 -08:00
Linux Build Service Account 0cc84de716 Merge "ARM: dts: msm: Add clock-krait and msm-cpufreq device for msm8974" 2013-11-16 02:40:40 -08:00
Linux Build Service Account 8faec464cd Merge "msm: krait-regulator: fix up CPU_UP_CANCELED handling" 2013-11-16 02:40:39 -08:00
Linux Build Service Account 64dbf20496 Merge "msm: krait-regulator: fix the cold boot sequence" 2013-11-16 02:40:39 -08:00
Linux Build Service Account 3c8dc4a62b Merge "msm: krait-regulator: Add flag to disable LDO mode usage" 2013-11-16 02:40:38 -08:00
Linux Build Service Account 320f256799 Merge "msm: krait-regulator: force BHS on offlined CPUs at boot" 2013-11-16 02:40:37 -08:00
Linux Build Service Account 931e9eb896 Merge "msm: pm-8x60: Use generic clk apis during power collapse" 2013-11-16 02:40:36 -08:00
Linux Build Service Account f3a1a647a2 Merge "msm: clock-mdss-8974: Set min/max div for fixed divider clocks" 2013-11-16 02:40:36 -08:00
Linux Build Service Account 83e3d214d5 Merge "msm: cpufreq: Remove unused msm_cpufreq_set_freq_limits() API" 2013-11-16 02:40:35 -08:00
Linux Build Service Account 242ae611e0 Merge "Revert "Revert "msm: thermal: Clean up msm cpufreq function calls""" 2013-11-16 02:40:34 -08:00
Linux Build Service Account 019536f193 Merge "msm: cpufreq: Add msm_cpufreq debugfs file to show CPU -> L2/BW mapping" 2013-11-16 02:40:33 -08:00
Linux Build Service Account 75584fcd1f Merge "msm: cpufreq: Update frequency index" 2013-11-16 02:40:32 -08:00
Linux Build Service Account a555841f85 Merge "msm: cpufreq: Add support for CPU clocks and msm-cpufreq device" 2013-11-16 02:40:32 -08:00
Linux Build Service Account a86ed9a958 Merge "msm: clock-generic: Add a combined mux_div clock" 2013-11-16 02:40:31 -08:00
Linux Build Service Account 592d356ea9 Merge "msm: clock-generic: Add a get_rate op for slave dividers" 2013-11-16 02:40:30 -08:00
Linux Build Service Account 8c6099484e Merge "msm: clock-generic: Move mux_reg_ops to clock-local2" 2013-11-16 02:40:29 -08:00
Linux Build Service Account 163f64f997 Merge "msm: clock-generic: Allow separate enable/mux-select registers" 2013-11-16 02:40:28 -08:00
Linux Build Service Account e7ce6e34f5 Merge "msm: clock-generic: Add get_rate op for ext clocks" 2013-11-16 02:40:28 -08:00