Commit Graph

25452 Commits

Author SHA1 Message Date
Linux Build Service Account
363899275c Merge "msm: audio: qdsp6v2: Add 4GV wb/nb support in mvs driver" into msm-3.0 2011-11-08 18:03:38 -08:00
Vinay Kalia
27020d1b5d video: msm: Writeback support in mdp for WFD.
Adds writeback mode in mdp for wifi-display(WFD).
This mode can be used to get the captured
frames from mdp. This is added to support
wifi-display capture device.

Change-Id: Iae30cac65af181d8df4b514a128cd876fe7dda1c
Signed-off-by: Vinay Kalia <vkalia@codeaurora.org>
2011-11-05 17:33:26 -06:00
Vijayavardhan Vennapusa
2b592824f9 USB: EHCI: Configure HSIC host<->hub<->Conventional USB devices
SMSC hub must be configured so that Conventional USB
devices can be connected to SMSC hub on 8960 liquid.

Change-Id: I261798de153d3c37f2fa2c4d7e15d96bb81c432f
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2011-11-04 14:09:57 -06:00
Linux Build Service Account
e0d4643f8e Merge "dt: add empty of_get_property for non-dt" into msm-3.0 2011-11-04 11:04:37 -07:00
Linux Build Service Account
de09bc6240 Merge changes I3d56518b,I60f4e108 into msm-3.0
* changes:
  msm8960: defconfig: Enable CONFIG_MMC_CLKGATE
  mmc: core: Use delayed work in clock gating framework
2011-11-04 11:04:37 -07:00
Linux Build Service Account
c4658f2250 Merge changes Ic0dedbad,Ic0dedbad into msm-3.0
* changes:
  msm: kgsl: Add ION as an external memory source
  msm: kgsl: Fixup per-process memory statistics
2011-11-04 01:11:07 -07:00
Stephen Warren
76ee8d653f dt: add empty of_get_property for non-dt
The patch adds empty function of_get_property for non-dt build, so that
drivers migrating to dt can save some '#ifdef CONFIG_OF'.

This also fixes the current Tegra compile problem in linux-next.

Change-Id: I2b60b6b9172051e847a0b1e4cc38e80ffc147047
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2011-11-04 08:25:05 +05:30
Linux Build Service Account
30dbf3483f Merge "hwmon: pm8921-adc: Add reverse calibration for BTM" into msm-3.0 2011-11-03 15:35:08 -07:00
Santosh Mardi
2292028c22 ASoC: wcd9310: Update legacy mode, txfe controls based on platform data
Based on tabla platform data update the legacy mode, txfe bypass and
txfe buff mode on tx path.

CRs-Fixed: 308208
Change-Id: I96df7a213578ed8e975030dc8d4b983d03eb6518
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2011-11-03 13:28:59 -06:00
Linux Build Service Account
c478970dc7 Merge "power: pm8921-charger: use trickle time for trickle charging" into msm-3.0 2011-11-03 00:21:06 -07:00
Sujit Reddy Thumma
0d0bc29d8c mmc: core: Use delayed work in clock gating framework
Current clock gating framework disables the MCI clock as soon as the
request is completed and enables it when a request arrives. This aggressive
clock gating framework when enabled cause following issues:

When there are back-to-back requests from the Queue layer, we unnecessarily
end up disabling and enabling the clocks between these requests since 8MCLK
clock cycles is a very short duration compared to the time delay between
back to back requests reaching the MMC layer. This overhead can effect the
overall performance depending on how long the clock enable and disable
calls take which is platform dependent. For example on some platforms we
can have clock control not on the local processor, but on a different
subsystem and the time taken to perform the clock enable/disable can add
significant overhead.

Also if the host controller driver decides to disable the host clock too
when mmc_set_ios function is called with ios.clock=0, it adds additional
delay and it is highly possible that the next request had already arrived
and unnecessarily blocked in enabling the clocks. This is seen frequently
when the processor is executing at high speeds and in multi-core platforms
thus reduces the overall throughput compared to if clock gating is
disabled.

Fix this by delaying turning off the clocks by posting request on
delayed workqueue. Also cancel the unscheduled pending work, if any,
when there is access to card.

sysfs entries are provided to tune the delay as needed with default
value set to 200ms.

Change-Id: I60f4e1087c4f22bfe7817153c54a0c72ae22b6b6
Signed-off-by: Sujit Reddy Thumma <sthumma@codeaurora.org>
2011-11-03 11:27:49 +05:30
Jordan Crouse
8eab35ab5a msm: kgsl: Add ION as an external memory source
Allow ION buffers to be attached via IOCTL_KGSL_MAP_USER_MEM

Change-Id: Ic0dedbada34d12fb70b528f3a93dd21805a4c8a4
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2011-11-02 18:29:03 -07:00
Anirudh Ghayal
f9929b1e29 input: cyttsp-i2c: Move regulators to LPM/HPM in suspend/resume
Change-Id: I341f33d2627dc9f3f7c511a69db8a84c4b886841
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-11-02 14:49:16 -06:00
Laura Abbott
63cfd7e6a2 8660: Add support for Ion
Add support for Ion

Change-Id: I1c04b8a6df005c6ced8681f419f4445592b4832d
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2011-11-01 16:30:51 -07:00
Abhijeet Dharmapurikar
e45c3d38a6 power: pm8921-charger: use trickle time for trickle charging
Correct a typo where safety time is used for trickle charge time
in the code.

Add the valid ranges and power on defaults for safety timer and
trickle charge timer.

CRs-Fixed: 313652
Change-Id: I49a04c6445d197555b2a434bf4577b6e38e3d3e3
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2011-11-01 16:28:57 -06:00
Siddartha Mohanadoss
b377415f17 hwmon: pm8921-adc: Add reverse calibration for BTM
-Change BTM threshold table to map temperature vs
input voltage instead of temperature vs A/D word.
Apply reverse calibration to convert the input
voltage to A/D word.
-Fix representing low/high threshold voltage as
a signed int.

CRs-Fixed: 313653
Change-Id: Ib565c672130f8a246a05636c1353ef0d5b373b7d
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2011-11-01 11:17:45 -07:00
Laura Abbott
6557696b65 gpu: ion: Add header file for ERR_PTR
Add err.h for the declaration of ERR_PTR which
is used with the stubbed out ion headers.

Change-Id: Ic5e5aea556723ea6b9c8953ef54ad5a82d3761ec
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2011-10-31 22:40:09 -07:00
Linux Build Service Account
ebd2931e42 Merge "USB: Add nop functions for !USB case" into msm-3.0 2011-10-31 05:54:03 -07:00
Anirudh Ghayal
5213eb8787 mfd: pm8xxx-misc: Add uart gpio mux control API
CRs-Fixed: 313982
Change-Id: I10ea5283271619f0ae510ad7039e0df8b1745f57
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-10-31 11:19:34 +05:30
Pavankumar Kondeti
15f2553568 USB: Add nop functions for !USB case
OTG drivers that use USB core functions like usb_add_hcd, usb_remove_hcd,
etc can be selected for gadget only mode without selecting CONFIG_USB.

Change-Id: Ie4b0c1703622cc9051ad9f50b8901f0005daeeb6
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2011-10-31 09:02:45 +05:30
Laura Abbott
2d1760b4f1 board-msm8960: Add ion heaps corresponding to pmem heaps
Add adsp heaps for ion. This corresponds directly
to what pmem currently does. This also includes disabling
the adsp and pmem heaps for pmem.

Change-Id: I4354c713413ebbe949579741efdd75e9c444c8e7
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2011-10-30 06:02:16 -06:00
Jordan Crouse
8cd4832d4d gpu: ion: Add inline stubs for Ion functions
Add inline stubs for in-kernel Ion functions to use when
Ion is not enabled in the kernel config.

Change-Id: Ic0dedbadbe4d7bab8f24763e67dd775c769b06df
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2011-10-28 15:27:14 -06:00
Laura Abbott
273dd8e94a gpu: ion: Add API to get the buffer flags
Clients may want to know what the existing flags are on a
handle for mapping, cache flushing or other purposes. Add
an API to get those flags.

Change-Id: I2d8c93194d1fc940042529b8851ebecf35d6e3de
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2011-10-28 13:18:34 -07:00
Linux Build Service Account
8cce8536a1 Merge changes I4ac6f9ef,I96bc377c,Ia5fdfb02,I601d24ef into msm-3.0
* changes:
  mmc: core: use non-reentrant workqueue for clock gating
  mmc: core: prevent aggressive clock gating racing with ios updates
  mmc: rename mmc_host_clk_{ungate|gate} to mmc_host_clk_{hold|release}
  Revert "mmc: fix a race between card-detect rescan and clock-gate work instances"
2011-10-28 11:59:46 -07:00
Linux Build Service Account
b89e7c3714 Merge "cne: Add reference count for Smart Wireless Interface Manager" into msm-3.0 2011-10-27 18:42:13 -07:00
Linux Build Service Account
cf5a9faf69 Merge "power: pm8921-charger: enable external charger" into msm-3.0 2011-10-27 14:35:52 -07:00
Chinh Tran
bbebbfed74 cne: Add reference count for Smart Wireless Interface Manager
Add the reference count for Smart Wireless Interface Manager to
know whether there are any process who still has the socket in
question in use or not.
Enable INET DIAG.
Redefine the TCP_FLAG as it gives compiling error when an enum is defined
by a function return.

Change-Id: I1aa9c810fec2e332048c9ef4199ec3f996bc3a75
Signed-off-by: Chinh Tran <chinht@codeaurora.org>
2011-10-27 09:23:11 -07:00
Linux Build Service Account
d5ad0085fe Merge "msmfb: display: support for overlay wait ioctl" into msm-3.0 2011-10-26 19:23:21 -07:00
Jay Chokshi
868312e934 leds: pm8xxx: Add PWM feature in leds-pm8xxx
Pass PWM period and other configuration from board file.
Update the LPG LUT based on the duty cycles,
pause count, and period.

Change-Id: Ie1812ae8010d986a943af6f3883b13c25bc7244c
Signed-off-by: Jay Chokshi <jchokshi@codeaurora.org>
2011-10-26 12:23:49 -07:00
Amir Samuelov
d31ef501b8 power: pm8921-charger: enable external charger
The pmic 8921 charger has a limit of 2Amp of charge current. This limit
makes it inadequate to charge multi-cell batteries.

The pm8921 charger supports a configuration where an external charger
with more current capacity may be used to charge the battery while the
pm8921 itself can charge from a USB source. In such a configuration
the external charger source is connected to the DCIN pins, this makes the
pmic detect insertion and removal of the external charger source. In turn
this enables automatic switching on or off the usb charging path when an
external charger is plugged out or in respectively. The pm8921 charger
driver has to call start and stop on external charger. The internal
FSM and logic correctly indicates that it is charging from a DC source.

The resume charging of a fully charged battery when an external source
is present needs to start charging from an external source. The driver
relies on VBATDET comparator to signal a low.

Change-Id: Iab5439ac2408ab061bce477f4d41d7b6a8de9b38
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
2011-10-26 14:41:36 +02:00
Nagamalleswararao Ganji
0737d65bb7 msmfb: display: support for overlay wait ioctl
this adds supports for overlay wait ioctl and it allows the
userapce start overlay play and HDMI and can call wait
later point of the time

Change-Id: I8000cc52a497861e0a5fdfe58c0c049219724ab6
Signed-off-by: Nagamalleswararao Ganji <nganji@codeaurora.org>
2011-10-25 23:35:15 -07:00
Chris Ball
5fdf175187 Revert "mmc: fix a race between card-detect rescan and clock-gate work instances"
This reverts commit 26fc8775b5, which has
been reported to cause boot/resume-time crashes for some users:

https://bbs.archlinux.org/viewtopic.php?id=118751.

Change-Id: I601d24efb867446156d2cc9db43a7697b6f52618
Signed-off-by: Chris Ball <cjb@laptop.org>
Cc: <stable@kernel.org>
Signed-off-by: Sujit Reddy Thumma <sthumma@codeaurora.org>
2011-10-25 16:33:23 +05:30
Linux Build Service Account
dd346d2474 Merge changes Ibb7afffd,Ie00815ed into msm-3.0
* changes:
  msm: board-qrd7627a: Add support for synaptics touchscreen
  input: touchscreen: Add support for synaptics clearpad3000
2011-10-24 17:10:20 -07:00
Grant Likely
971a0ee566 dt/irq: add irq_domain_generate_simple() helper
irq_domain_generate_simple() is an easy way to generate an irq translation
domain for simple irq controllers.  It assumes a flat 1:1 mapping from
hardware irq number to an offset of the first linux irq number assigned
to the controller

Change-Id: I0820754314a0c15b1cc9881bc38b75b0de2509b2
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Sathish Ambley <sambley@codeaurora.org>
2011-10-24 10:42:45 -07:00
Grant Likely
6469dfb4ee irq: add irq_domain translation infrastructure
This patch adds irq_domain infrastructure for translating from
hardware irq numbers to linux irqs.  This is particularly important
for architectures adding device tree support because the current
implementation (excluding PowerPC and SPARC) cannot handle
translation for more than a single interrupt controller.  irq_domain
supports device tree translation for any number of interrupt
controllers.

This patch converts x86, Microblaze, ARM and MIPS to use irq_domain
for device tree irq translation.  x86 is untested beyond compiling it,
irq_domain is enabled for MIPS and Microblaze, but the old behaviour is
preserved until the core code is modified to actually register an
irq_domain yet.  On ARM it works and is required for much of the new
ARM device tree board support.

PowerPC has /not/ been converted to use this new infrastructure.  It
is still missing some features before it can replace the virq
infrastructure already in powerpc (see documentation on
irq_domain_map/unmap for details).  Followup patches will add the
missing pieces and migrate PowerPC to use irq_domain.

SPARC has its own method of managing interrupts from the device tree
and is unaffected by this change.

Change-Id: Ia5fa674a97c85e2fc8e30275753b1494a97bd1d9
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Sathish Ambley <sambley@codeaurora.org>
2011-10-24 10:42:45 -07:00
Linux Build Service Account
0c2b0b6ebc Merge "mfd: 8018: Add led and pwm devices" into msm-3.0 2011-10-24 01:52:03 -07:00
Taniya Das
6f0884bf86 input: touchscreen: Add support for synaptics clearpad3000
Change-Id: Ie00815ed507d81c6934ac0d4b1dfa745215ff01a
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2011-10-24 12:12:17 +05:30
Linux Build Service Account
caeef66d6d Merge changes I75900b24,Ibca9cdbf,Ic926e968 into msm-3.0
* changes:
  input: atmel_mxt_ts: Move regulators to LPM/HPM in suspend/resume
  input: atmel_mxt_ts: Add retry mechanism for I2C read/write
  input: atmel_mxt_ts: Clean up pdata and update config array
2011-10-23 16:41:13 -07:00
Linux Build Service Account
f22463f414 Merge changes Id6b5096f,Ic8bd7e13 into msm-3.0
* changes:
  eeprom_93cx6: Add write support
  eeprom_93cx6: Add data direction control.
2011-10-21 11:59:28 -07:00
Linux Build Service Account
9f5f6e5fab Merge changes Idb1e623b,I854d90ac into msm-3.0
* changes:
  msm_rq_stats: removing calculation of rq_stats
  rq_stats: Doing rq_stats calculation in the scheduler tick.
2011-10-21 11:59:28 -07:00
Jing Lin
2f863174f9 input: atmel_mxt_ts: Clean up pdata and update config array
Remove blen, tchthr, x_line, y_line, orient and voltage from platform
data to not to overwrite the config data with these values. Update
config array to have the proper values.
Turn on i2c_pull_up in platform data.

Change-Id: Ic926e96886f52cea3dad29e9a44559b26c717259
Signed-off-by: Jing Lin <jinglin@codeaurora.org>
2011-10-21 11:46:20 -07:00
Jay Chokshi
e91f55cdb5 mfd: 8018: Add led and pwm devices
Change-Id: I92b9f6956aac24cef8898ce59263dd80b5b30d3f
Signed-off-by: Jay Chokshi <jchokshi@codeaurora.org>
2011-10-21 10:39:28 -07:00
Linux Build Service Account
12c97b5651 Merge changes I7cdf8e45,Id54dcc80 into msm-3.0
* changes:
  USB: EHCI: msm: Configure GPIOs for HSIC strobe and data lines
  USB: EHCI: msm: Add support for HSIC based Host Controller
2011-10-21 06:05:40 -07:00
Linux Build Service Account
391afad386 Merge "diag: Add support for APQ8064" into msm-3.0 2011-10-21 03:06:17 -07:00
Linux Build Service Account
ab1ae85997 Merge "msm_fb: display: CSC Matrix update support is added" into msm-3.0 2011-10-20 22:35:31 -07:00
Ben Dooks
a6c514f3fb eeprom_93cx6: Add write support
Add support for writing data to EEPROM.

Change-Id: Id6b5096f2d59d21773c06ba3803151c2f3248956
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Linux Kernel <linux-kernel@vger.kernel.org>
[sboyd@codeaurora.org: use usleep_range() instead of msleep()]
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2011-10-20 19:02:06 -07:00
Ben Dooks
69215d9680 eeprom_93cx6: Add data direction control.
Some devices need to know if the data is to be output or read, so add a
data direction into the eeprom structure to tell the driver whether the
data line should be driven.

The user in this case is the Micrel KS8851 which has a direction
control for the EEPROM data line and thus needs to know whether
to drive it (writing) or to tristate it for receiving.

Change-Id: Ic8bd7e13ce9bde423001ca23f3de02e76e1dbdaf
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Linux Kernel <linux-kernel@vger.kernel.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2011-10-20 19:02:06 -07:00
Siddartha Mohanadoss
5bcd20614d mfd: pm8018: Add PM8018 ADC resource
Change-Id: I6a4df32671b95070cdb719d80767f0ffde8cd40a
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2011-10-20 18:07:37 -07:00
Amar Singhal
f49d99bc41 rq_stats: Doing rq_stats calculation in the scheduler tick.
With this change, we do the average run queue statistics calculation
in the scheduler tick itself. This helps avoid any extra timers to
do the same. Also doing this calculation in the scheduler tick avoids
any bias if the calculation is done in a workqueue

Change-Id: I854d90acc05cc7a7226487be5555976826d8c837
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
2011-10-20 14:35:49 -07:00
Vijayavardhan Vennapusa
e3316a1098 USB: EHCI: msm: Configure GPIOs for HSIC strobe and data lines
As part of HSIC initialization, in addition to enabling HSIC host
mode and periodic pad calibration, need to configure GPIO150 and
GPIO151 pins for HSIC strobe and data lines respectively for
proper data communication between HSIC devices.

Change-Id: I7cdf8e4532045d813ac6c6e3f53455d0a640245b
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2011-10-21 00:15:27 +05:30