Commit Graph

25573 Commits

Author SHA1 Message Date
Linux Build Service Account
a5df020eed Merge "mfd: pm8038: Add PMIC 8038 core driver" into msm-3.0 2011-12-10 15:31:48 -08:00
Linux Build Service Account
5411d64555 Merge "msm_fb: display: enable border color fill on external display" into msm-3.0 2011-12-09 17:24:47 -08:00
Jay Chokshi
9d36a3d457 mfd: pm8038: Add PMIC 8038 core driver
Add support for the Qualcomm PM8038 PMIC chip. The core driver
will communicate with the PMIC chip via the MSM SSBI bus.

Initial support is provided for: IRQ, GPIO, MPP, RTC, Power Key,
Misc, and Debug.

Change-Id: I83f995cc238699100a05e82d04b45ea2a63eb667
Signed-off-by: Jay Chokshi <jchokshi@codeaurora.org>
2011-12-09 17:24:27 -08:00
Linux Build Service Account
76bb397d5a Merge "msm: audio: qds6v2: Add support for new hardware codecs" into msm-3.0 2011-12-09 13:32:33 -08:00
Linux Build Service Account
f077c70ec8 Merge "mm: Add total_unmovable_pages global variable" into msm-3.0 2011-12-09 02:43:11 -08:00
Linux Build Service Account
c1ab5d376f Merge "clk: provide prepare/unprepare functions" into msm-3.0 2011-12-08 23:47:51 -08:00
Russell King
ed6e321217 clk: provide prepare/unprepare functions
As discussed previously, there's the need on some platforms to run some
parts of clk_enable() in contexts which can schedule.  The solution
which was agreed upon was to provide clk_prepare() and clk_unprepare()
to contain this parts, while clk_enable() and clk_disable() perform
the atomic part.

This patch provides a common definition for clk_prepare() and
clk_unprepare() in linux/clk.h, and provides an upgrade path for
existing implementation and drivers: drivers can start using
clk_prepare() and clk_unprepare() once this patch is merged without
having to wait for platform support.  Platforms can then start to
provide these additional functions.

Eventually, HAVE_CLK_PREPARE will be removed from the kernel, and
everyone will have to provide these new APIs.

Change-Id: Ib9d24a7a0fdb571d392b970b1c159acabb07b365
Acked-by: Saravana Kannan <skannan@codeaurora.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2011-12-08 18:19:09 -08:00
Adrian Salido-Moreno
fc6be921ee msm_fb: display: enable border color fill on external display
Enable border color fill feature on external display. This avoids usage
of RGB pipe for background border fill and can now be used as overlay
layer for UI display.

Change-Id: I652ab3ffe2c43260590e4e5a2ffc986340c4a8c0
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
2011-12-08 17:19:01 -08:00
Anji jonnala
7da3f26984 usb: msm_otg: vote and unvote for TCXO through XO API
USB PHY takes TCXO clock as input and using the PHY internal PLL,
gets the 480MHz clock for USB operations. While USB PHY is suspended,
the TCXO clock can be turned off.
On 8960 target, mandating that TCXO clock users must need to vote for
TCXO and if all the users vote for TCXO clock-off, then MSM can switch to
lower power clock and can run.

Change-Id: Ia9a91bca52a1003439a3a38bbd8eb835dbf349e1
Signed-off-by: Anji jonnala <anjir@codeaurora.org>
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
2011-12-08 16:04:18 -08:00
Deepa Madiregama
52a74c097e msm: audio: qds6v2: Add support for new hardware codecs
Add support for following codecs
	-MP3 decoder
	-AMRNB decoder
	-AMRWB decoder
	-EVRC decoder
	-QCELP(v13k) decoder
	-AMRWB encoder

Change-Id: I3d6fe52b206ab7a82d0d068d35769c3aa8c2b855
Signed-off-by: Deepa Madiregama <dmadireg@codeaurora.org>
2011-12-08 15:11:11 +05:30
Jay Chokshi
89489c3e48 power_supply: Add driver for LTC4088 Charger
LTC4088 is high efficiency USB powerpath controller
and Li-Ion/Polymer battery charger. This driver
enables the charger, allows to set current limits,
and detection.

Change-Id: I844431210cfd6e71d02fa7ffb730ee56d8417273
Signed-off-by: Jay Chokshi <jchokshi@codeaurora.org>
2011-12-07 19:00:30 -08:00
Willie Ruan
e6bee116fb power: core: add power supply APIs
Add two APIs, 1) set_current_limit API and 2) set_charging_by.
set_current_limit api is used for external control, such as for USB
driver to tell a charger driver the maximum current to draw.
set_charging_by is used to change the state of the charger.

Change-Id: I147eab37836b54627ca1458167eb117ba3eacd7a
Signed-off-by: Willie Ruan <wruan@codeaurora.org>
2011-12-07 19:00:30 -08:00
Linux Build Service Account
0ac06e4925 Merge changes Id3e9fc8e,I61b85b48 into msm-3.0
* changes:
  perf: add raw event selection by reg/code/group for scorpion l2
  Perf: Add support for L2 cycle counter in default list
2011-12-06 19:03:13 -08:00
Jack Cheung
59f9f1c9ae mm: Add total_unmovable_pages global variable
Vmalloc will exit if the amount it needs to allocate is
greater than totalram_pages. Vmalloc cannot allocate
from the movable zone, so pages in the movable zone should
not be counted.

This change adds a new global variable: total_unmovable_pages.
It is calculated in init.c, based on totalram_pages minus
the pages in the movable zone. Vmalloc now looks at this new
global instead of totalram_pages.

total_unmovable_pages can be modified during memory_hotplug.
If the zone you are offlining/onlining is unmovable, then
you modify it similar to totalram_pages.  If the zone is
movable, then no change is needed.

Change-Id: Ie55c41051e9ad4b921eb04ecbb4798a8bd2344d6
Signed-off-by: Jack Cheung <jackc@codeaurora.org>
2011-12-06 15:00:36 -08:00
Linux Build Service Account
c3a5a8cb8a Merge "power: pm8921-charger: Allow disabling of input current limit" into msm-3.0 2011-12-06 14:52:29 -08:00
Linux Build Service Account
ed8dee710b Merge "input: pmic8xxx-pwrkey: Change algorithm on converting trigger delay" into msm-3.0 2011-12-06 12:47:37 -08:00
Linux Build Service Account
5c5bed0c36 Merge "msm: nl80211: Add WAPI support for cfg80211." into msm-3.0 2011-12-06 11:36:58 -08:00
Jing Lin
eecdc06dfe input: pmic8xxx-pwrkey: Change algorithm on converting trigger delay
The previous algorithm requires that kpd_trigger_delay_us be set to
1/32 of the preferred trigger delay. The new algorithm allows setting
kpd_trigger_delay_us to the preferred trigger delay directly.

The actual delay can only be one of the eight levels: 2 sec, 1 sec,
1/2 sec, 1/4 sec, 1/8 sec, 1/16 sec, 1/32 sec, and 1/64 sec. The valid
range of kpd_trigger_delay_us is 1/64 second to 2 seconds. A value
within the valid range will be rounded down to the closest level. Any
value outside the valid range will be rejected.

Update board files for targets that use this driver accordingly.

CRs-Fixed: 307203
Change-Id: If98b9cd32e03ab85cd078024b2adee02212cf030
Signed-off-by: Jing Lin <jinglin@codeaurora.org>
2011-12-06 10:29:19 -08:00
Ashwin Chaugule
389497b245 Perf: Add support for L2 cycle counter in default list
Adding the L2 cycle counter in the default list of events
has the advantage that the user can do a :

perf stat -e l2-cycles -e cycles ls

and see the outputs for the L2 cycle counter and L1 cycle
counter separately. Previously, it was only accessible via
the raw code "rsfe".

This method also allows us to program the L2 cycle counter
only from one CPU.

The changes in this patch are used by the userspace perf
tool.

Change-Id: I61b85b48f5474fe9f6ffb1a405b60b4332ab60c7
Signed-off-by: Ashwin Chaugule <ashwinc@codeaurora.org>
2011-12-06 12:30:24 -05:00
Linux Build Service Account
65a8aae7a0 Merge "ARM: cpu_pm: Fix compilation when CONFIG_PM disabled" into msm-3.0 2011-12-06 06:33:33 -08:00
David Keitel
012deefa0b power: pm8921-charger: Allow disabling of input current limit
Some use cases require higher input currents which are out of range
of USB specification.

Fix this by adding a call to disable the input current limit and
warn the user with an adequate message that input current limiting
is disabled when the function is called

CRs-Fixed: 318511
Change-Id: I7e2baa0378c94b0b9af22c00d8605b9df8d4f826
Signed-off-by: David Keitel <dkeitel@codeaurora.org>
2011-12-05 12:23:44 -08:00
Laura Abbott
8c0173668e gpu: ion: Add support for iommus
Add infrastructure to support mapping allocations
into iommus.

Change-Id: Ia5eafebee408e297013bf55284abf67d9eb8d78b
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2011-12-05 10:36:11 -08:00
Taniya Das
a75b3df26b ARM: cpu_pm: Fix compilation when CONFIG_PM disabled
When CONFIG_PM is disabled we see cpu_pm_register_notifier error at
link time.

in function init_hw_perf_events:perf_event.c(.init.text+0x14a8): error:
undefined reference to 'cpu_pm_register_notifier'

Change-Id: I97525a3f8938543b2d2c9cafeee83367b8ffe702
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2011-12-05 14:12:58 +05:30
Chintan Pandya
cba43d2faa rfkill: Fix compilation when PM is disabled
Add config macros for RFKILL_PM to fix compilation when
CONFIG_PM is disabled

Change-Id: I9fba48fb02d671885665354091101f3813426f57
Signed-off-by: Chintan Pandya <cpandya@codeaurora.org>
2011-12-05 12:38:11 +05:30
Chintan Pandya
94dd4f4b85 wakelock: Fix compilation when PM is disabled
If PM is disabled, WAKELOCK will also get disabled.
That gives compilation error at kgsl driver.

drivers/gpu/msm/kgsl_pwrctrl.c:755: error:
'struct wake_lock' has no member named 'name'

So, ifdef check whithin struct wake_lock will not give
more advantages but break builds. So, remove
CONFIG_HAS_WAKELOCK check in struct wake_lock.

Change-Id: I9f808f3b6ff14af6fa7f91dee7fe279ddab09add
Signed-off-by: Chintan Pandya <cpandya@codeaurora.org>
2011-12-05 12:38:11 +05:30
Linux Build Service Account
d32590c92a Merge "misc: pmic8058-xoadc: Fix #include guard" into msm-3.0 2011-12-03 19:45:06 -08:00
Linux Build Service Account
cc7c99e950 Merge "msm: audio: qdsp6v2: Add codec support in mvs driver" into msm-3.0 2011-12-03 18:19:43 -08:00
Linux Build Service Account
3f83653a6d Merge "USB: gadget: Add CCID function driver" into msm-3.0 2011-12-03 04:41:18 -08:00
Linux Build Service Account
388e93dc45 Merge "gpu: ion: Add callbacks to enable SMI voting in ION." into msm-3.0 2011-12-02 23:25:46 -08:00
Rob Walker
16e79b9fd8 misc: pmic8058-xoadc: Fix #include guard
Correct inclusion guard to prevent compilation error on
multiple header file inclusion.

Change-Id: I022b47b4ff30af9b46dc32db390003ca20db3529
Signed-off-by: Rob Walker <rwalker@codeaurora.org>
2011-12-02 18:08:23 -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
Chiranjeevi Velempati
e130fd0c7b USB: gadget: Add CCID function driver
This USB CCID function driver will be a transport layer between
userspace CCID component and the Windows Host. Data and control
commands from the Windows Host will be sent to the userspace component
and vice-versa.

Change-Id: I5f00f9802a57329d2c932bba740b286b98cb8e27
Signed-off-by: Chiranjeevi Velempati <cvelempa@codeaurora.org>
2011-12-02 11:09:17 +05:30
Chaithanya Krishna Bacharaju
68993b52c7 msm: audio: qdsp6v2: Add codec support in mvs driver
Support for Qcelp-13k, EFR, FR, HR, G.711 modes in mvs driver.

Change-Id: I5b8f90388b2fc79ad6d9b6276d0dd29e3cc6ba80
Signed-off-by: Chaithanya Krishna Bacharaju <chaithan@codeaurora.org>
2011-12-02 10:32:56 +05:30
Alex Bird
8a3ede3801 gpu: ion: Add callbacks to enable SMI voting in ION.
This change is part of the move from PMEM to ION. ION needs an SMI
voting interface smiliar to PMEM's.

Change-Id: I18888f46198848694fb7e1e0d2671074bf51d7c9
Signed-off-by: Alex Bird <alexbird@codeaurora.org>
2011-12-01 17:45:22 -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
6e47579058 Merge "hwmon: pm8xxx_adc: Remove pm8921-adc" into msm-3.0 2011-12-01 09:30:50 -08:00
Siddartha Mohanadoss
af91d9056d hwmon: pm8xxx_adc: Remove pm8921-adc
Switch clients to use pm8xxx-adc and remove pm8921-adc.
pm8xxx-adc supports PMIC HK/XOADC for 8960, 9x15, 8064
platforms.

Change-Id: Id27fa908cc097d52e6033c28ce243c6bcf64ed27
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2011-12-01 04:35:59 -07:00
Hemant Kumar
1b820d5863 usb: frmnet: Add support to use multiple transport functions
Current driver supports the single instance of control and data
transport. Add support to use multiple control and data transport
pairs per port (interface) basis. Control and data transport pair is
passed by user space from
/sys/class/android_usb/android0/f_rmnet/transports

Also moved and renamed common function str_to_xport and xport_to_str
to header file and updated respecitve callers of the function.

Change-Id: Ib0ceff85a1224336f7f4929235b6a40b8f13e849
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2011-11-30 13:33:23 -08:00
Linux Build Service Account
72e79e4235 Merge "gpu: ion: Add support for flushing via fd" into msm-3.0 2011-11-29 16:58:29 -08:00
Linux Build Service Account
c821f1053a Merge "Kbuild: export msm_audio_sbc.h to user-space" into msm-3.0 2011-11-29 16:58:29 -08:00
Linux Build Service Account
f7e7c6ed04 Merge "mfd: pm8921-core: PMIC 8921 rev 3.0 revision mask" into msm-3.0 2011-11-29 16:58:29 -08:00
Linux Build Service Account
a90f3352e9 Merge "msm: kgsl: Use the new clock naming conventions effectively" into msm-3.0 2011-11-29 16:58:29 -08:00
Colin Cross
06e857251e ARM: cpu_pm: Add cpu power management notifiers
During some CPU power modes entered during idle, hotplug and
suspend, peripherals located in the CPU power domain, such as
the GIC, localtimers, and VFP, may be powered down.  Add a
notifier chain that allows drivers for those peripherals to
be notified before and after they may be reset.

Signed-off-by: Colin Cross <ccross <at> android.com>
[santosh.shilimkar <at> ti.com: Rebased against 3.1-rc3]
Signed-off-by: Santosh Shilimkar <santosh.shilimkar <at> ti.com>
Tested-by: Kevin Hilman <khilman <at> ti.com>
Change-Id: I6e076344b268869d12033f57321f3e7cf23b05e8
Signed-off-by: Ashwin Chaugule <ashwinc@codeaurora.org>
2011-11-29 16:42:33 -05:00
Deepthi Gowri
5b26a95110 msm: nl80211: Add WAPI support for cfg80211.
This provides WAPI support for cfg80211.

Change-Id: I6ec1f6804cd9017bd332b4dd5ab06f18b390e120
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
2011-11-29 17:09:02 +05:30
Linux Build Service Account
73341822cc Merge "input: atmel_maxtouch: Rename mxt_platform_data to maxtouch_platform_data" into msm-3.0 2011-11-28 23:16:15 -08:00
Jay Wang
27193fb5e1 Kbuild: export msm_audio_sbc.h to user-space
Change-Id: Idf932187378e054fff1da96da08a12ba5daf0dc0
Signed-off-by: Jay Wang <jaywang@codeaurora.org>
2011-11-28 22:16:36 -08:00
David Keitel
70251b0b81 mfd: pm8921-core: PMIC 8921 rev 3.0 revision mask
Add the revision mask for PMIC8921 revision 3.0 to avoid
printing unknown PMIC revision in kernel log.

Change-Id: Ied28321866551aecbb1658dda5f17018256254a3
Signed-off-by: David Keitel <dkeitel@codeaurora.org>
2011-11-28 14:50:02 -08:00
Lucille Sylvester
dce84cdc3f msm: kgsl: Use the new clock naming conventions effectively
Still allow the clocks a per-platform map for clock error checking,
but use a const array of their identical names.

Change-Id: If83654b4cf68b34f0cbde68021c267aceb423db8
Signed-off-by: Lucille Sylvester <lsylvest@codeaurora.org>
2011-11-28 11:34:53 -07:00
Linux Build Service Account
3e1ed470b6 Merge "msm: trivial: 'chmod 644' for non-executable files" into msm-3.0 2011-11-28 01:13:02 -08:00
Mohan Pallaka
4e9a94e60d input: atmel_maxtouch: Rename mxt_platform_data to maxtouch_platform_data
Opensource driver atmel_mxt_ts has the platform data
structure name as atmel_maxtouch. Avoid name conflict
by renaming atmel_maxtouch driver's platform data to
maxtouch_platform_data.

Change-Id: I4bf3ed83e3eab55c4464de365c6009965da73744
Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
2011-11-26 23:45:35 -07:00