Commit Graph

25550 Commits

Author SHA1 Message Date
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
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
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
Linux Build Service Account
23342b6268 Merge changes Ic0dedbad,Ic0dedbad into msm-3.0
* changes:
  msm: kgsl: Add timestamp events
  msm: kgsl: Reimplement the timestamp comparison function
2011-11-23 09:13:58 -08:00
Bryan Huntsman
849b79e1f0 msm: trivial: 'chmod 644' for non-executable files
Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
2011-11-22 18:44:06 -08:00
Jordan Crouse
d4bc9d2e0c msm: kgsl: Add timestamp events
Add support for triggering asynchronous events when a timestamp
expires.  The infrastructure is generic enough to support different
sorts of events and callbacks.  The first user of the event
infrastructure is a way to release a genlock locks on behalf of a
user space process.

Change-Id: Ic0dedbadfe67d98a5678453cbe0ac6996ba5c68f
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2011-11-22 17:51:51 -07:00
Anirudh Ghayal
ca42c7dec9 mfd: pm8xxx-irq: Provide the IRQ base address through core data
Facilitate the driver to support PMICs (such as PM8901)
with different IRQ base address.

Change-Id: I285a9b859b795508620ea6dfd7b5ef6953e7aeb3
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-11-22 21:26:33 +05:30
Linux Build Service Account
f756be5b27 Merge "ASoC: wcd9310: add I2C\I2S support for tabla codec" into msm-3.0 2011-11-22 06:35:56 -08:00
Laura Abbott
e80ea017f1 gpu: ion: Add support for flushing via fd
Userspace clients pass fds around, not handles. Support flushing
via fd.

Change-Id: Ic22d9327e9fa72cb604c3010a2a6f798be8dfdb1
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2011-11-21 12:27:52 -08:00
Abhijeet Dharmapurikar
82d939848f power: pm8xxx-ccadc: Add pm8xxx ccadc subdevice
Until now only the BMS system was using the ccadc so there was
no need to create a separate ccadc driver.

However we can run in a configuration with BMS disabled
and clients won't be able to read battery current via ccadc.

Separate the ccadc from the bms, this change in is preparation
to add a ccadc api to read the battery current.

Change-Id: Ib96b146d91d01d196df9291eb23432cd430db4d0
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2011-11-21 11:21:31 -07:00
Linux Build Service Account
df0f40090a Merge "power: pm8921-charger: use resume_voltage_delta" into msm-3.0 2011-11-21 10:14:36 -08:00
Linux Build Service Account
d9ff38ad69 Merge "usb: otg: Upgrade support for PHY retention mode" into msm-3.0 2011-11-21 10:14:36 -08:00
Linux Build Service Account
121d4a7001 Merge "drivers: base: Add generic cross-process locking API" into msm-3.0 2011-11-21 05:26:28 -08:00
Anirudh Ghayal
c49157f837 msm: 8660: Add ssbi device for PM8901
Use the msm-ssbi driver for communication over
the SSBI interafce.

Change-Id: Ibc26754944c32ac8eaa939f552033974e1a7758f
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-11-21 10:06:00 +05:30
Abhijeet Dharmapurikar
d55878e749 power: pm8921-charger: use resume_voltage_delta
Since the driver will be changing the max vdd if the battery
temperature enters warm or cool zone, it should also change
the vbatdet voltage so resume of charging can begin accordingly.

Also provide a means to quickly debug is the battery is in cool/warm
zone.

Change-Id: I0fe83a4fabf76711bf86377c3ac23cceecb6e98b
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2011-11-20 19:32:40 -07:00
Amit Blay
58b3147caf usb: otg: Upgrade support for PHY retention mode
Current implementation supports PHY retention mode, when
VBUS detection is done by PMIC.
This change adds the support for PHY retention mode, for
the case where VBUS detection is done by USB PHY.
In that case, the PHY wakes up the MPM and CORE using its
High-Voltage interrupts.

Change-Id: I5fec518337413f175a8bc671897836affc55381c
Signed-off-by: Amit Blay <ablay@codeaurora.org>
2011-11-20 14:37:57 +02:00
Jordan Crouse
29f66af8a0 drivers: base: Add generic cross-process locking API
Add a generic locking API for situations where multiple user-space
processes and/or kernel drivers need to cooordinate access to a
shared resource such as a graphics buffer.

Change-Id: Ic0dedbad74b970d7bd1a6624a845b5b1b9847443
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2011-11-19 13:28:49 -07:00
Linux Build Service Account
517a34cb37 Merge "Kbuild: Export msm_audio_voicememo.h to user space" into msm-3.0 2011-11-19 06:35:27 -08:00
Linux Build Service Account
2f0ec1450b Merge "Merge remote-tracking branch 'common/android-3.0' into msm-3.0" into msm-3.0 2011-11-18 21:35:29 -08:00
Manish Dewangan
1ba4da1263 Kbuild: Export msm_audio_voicememo.h to user space
- Add msm_audio_voicememo.h in Kbuild to export to user space.
- Remove copyright and license information from audio header files
  exported to user space to avoid any licensing issues.

Change-Id: Ic252c77e4fed2639546ad711ab0d2de6d6fb1453
Signed-off-by: Manish Dewangan <manish@codeaurora.org>
2011-11-18 22:54:46 +05:30
Santosh Mardi
e15e230fcf ASoC: wcd9310: add I2C\I2S support for tabla codec
Add support for I2C\I2S interface for tabla codec along
With SLIMBUS interface.

Change-Id: Ib0f2ebe62121c1e43a9bdbcaec7621e9d96ac3c4
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2011-11-18 03:06:26 +05:30
Linux Build Service Account
014783ce1c Merge "Kbuild: Add msm_audio_amrnb.h and msm_audio_qcp.h" into msm-3.0 2011-11-17 09:29:49 -08:00
Bryan Huntsman
d074fa2796 Merge remote-tracking branch 'common/android-3.0' into msm-3.0
* common/android-3.0: (570 commits)
  misc: remove kernel debugger core
  ARM: common: fiq_debugger: dump sysrq directly to console if enabled
  ARM: common: fiq_debugger: add irq context debug functions
  net: wireless: bcmdhd: Call init_ioctl() only if was started properly for WEXT
  net: wireless: bcmdhd: Call init_ioctl() only if was started properly
  net: wireless: bcmdhd: Fix possible memory leak in escan/iscan
  cpufreq: interactive governor: default 20ms timer
  cpufreq: interactive governor: go to intermediate hi speed before max
  cpufreq: interactive governor: scale to max only if at min speed
  cpufreq: interactive governor: apply intermediate load on current speed
  ARM: idle: update idle ticks before call idle end notifier
  input: gpio_input: don't print debounce message unless flag is set
  net: wireless: bcm4329: Skip dhd_bus_stop() if bus is already down
  net: wireless: bcmdhd: Skip dhd_bus_stop() if bus is already down
  net: wireless: bcmdhd: Improve suspend/resume processing
  net: wireless: bcmdhd: Check if FW is Ok for internal FW call
  tcp: Don't nuke connections for the wrong protocol
  ARM: common: fiq_debugger: make uart irq be no_suspend
  net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT
  mm: avoid livelock on !__GFP_FS allocations
  ...

Conflicts:
	arch/arm/mm/cache-l2x0.c
	arch/arm/vfp/vfpmodule.c
	drivers/mmc/core/host.c
	kernel/power/wakelock.c
	net/bluetooth/hci_event.c

Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
2011-11-16 13:52:50 -08:00
Liyuan Li
d973663b4a video: msm: Adding support for MDP4 HSIC controls
Adding support for users to adjust Hue, Saturation, Intensity and
Contrast of the display.

Change-Id: I79cb69c871686ccba115798f635f768b9a50affc
Signed-off-by: Liyuan Li <liyuanl@codeaurora.org>
2011-11-16 12:44:14 -07:00
Linux Build Service Account
a07e03c349 Merge changes Icf600a63,Ib105cc94,I0a50b050 into msm-3.0
* changes:
  msm: configs: Copper: Enable HSUSB OTG, Device and android gadget
  msm: Copper: Add USB clocks to dummy clock list
  msm: Add device tree support for HSUSB
2011-11-16 10:00:17 -08:00
Praveena Pachipulusu
76891c0de2 Kbuild: Add msm_audio_amrnb.h and msm_audio_qcp.h
Change-Id: Icaec1c0d5454dc2d6c3f85cb28d88fc334829296
Signed-off-by: Praveena Pachipulusu <pveena@codeaurora.org>
2011-11-16 22:13:18 +05:30