Commit Graph

2497 Commits

Author SHA1 Message Date
Linux Build Service Account
60dc123b04 Merge "input: cy8c_ts: use ABS_MT_PRESSURE to report pressure" into msm-3.0 2011-11-16 22:43:07 -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
Anirudh Ghayal
c2019339bc mfd: pm8058: Modify pm8058 subdevices to pm8xxx interface
Move the following  subdevices to use the pm8xxx interface -
mpp, irq, gpio, keypad, power-key, leds, othc, vibrator,
rtc, batt-alarm, thermal, upl, nfc, pwm, xoadc, regulators,
xo-buffers, charger.

This allows usage of a common driver for modules which are same
across multiple PM8XXX PMICs. It also provides flexibility
to add/remove subdevices for multiple board configurations.

Change-Id: Id9795552fc9f4a2c920c070babfaef1f4cd6ca61
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-11-16 19:06:11 +05:30
Praveena Pachipulusu
0106ea69f7 input: cy8c_ts: use ABS_MT_PRESSURE to report pressure
Change-Id: I271416167fa1800bfbaf05e7269396652b2449bc
Signed-off-by: Praveena Pachipulusu <pveena@codeaurora.org>
2011-11-16 16:11:37 +05:30
Jing Lin
1c46af9fac input: cyttsp-i2c: Fix a few coding issues
Fix issues such as comparing an unsigned integer against 0 and
unnecessary NULL checking.

Change-Id: Ib70b083925229ed9ec5b940e0fb0e80e9b83c960
Signed-off-by: Jing Lin <jinglin@codeaurora.org>
2011-11-15 21:47:34 -08:00
Linux Build Service Account
42474690f7 Merge "Input: atmel_mxt_ts: Fix error handling in mxt_probe" into msm-3.0 2011-11-11 16:10:44 -08:00
Jing Lin
32c7253521 Input: atmel_mxt_ts: Fix error handling in mxt_probe
Fix out-of-order error handling of several error cases in mxt_probe.
Make sure allocated memory is freed in mxt_initialize when an error
occurs.

Change-Id: I4331a71263b62ff6bdeaafbe6881e591b09d2ffc
Signed-off-by: Jing Lin <jinglin@codeaurora.org>
2011-11-08 23:22:36 -08:00
Dima Zavin
050c06eed4 input: gpio_input: don't print debounce message unless flag is set
Change-Id: I29ccb32e795c5c3e4c51c3d3a209f5b55dfd7d94
Signed-off-by: Dima Zavin <dima@android.com>
2011-11-08 22:53:00 -08:00
Mohan Pallaka
07a0807c3e input: cyttsp-i2c: Move irq handler to threaded context
Change-Id: I60d038fc06c8f040cf2b69d6b65d9b8e210ff08b
Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
2011-11-09 11:31:57 +05:30
Linux Build Service Account
a67b6d1b5c Merge "Input: atmel_mxt_ts - Use snprintf for sysfs attribute show method" into msm-3.0 2011-11-04 20:59:40 -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
Daniel Kurtz
4ef11a8fcb Input: atmel_mxt_ts - Use snprintf for sysfs attribute show method
Sysfs attribute show methods are always passed a buffer of length
PAGE_SIZE.  To keep from overwriting this buffer and causing havoc, use
snprintf() to guarantee we never write more than the buffer can hold.

In addition, at least for my touchscreen, the number and size of objects
was far too big to fit in a single 4K page.  Therefore, this patch also
trims some redundant framing text to leave more room for actual data.

Change-Id: If771d66940d9948618b419ff7f0e510a07821274
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Acked-by: Nick Dyer <nick.dyer@itdev.co.uk>
Signed-off-by: Jing Lin <jinglin@codeaurora.org>
2011-11-02 10:52:03 -07:00
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
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
Axel Lin
44d805b30a Input: pmic8xxx-keypad - fix a leak of the IRQ during init failure
Make sure we are passing the same cookie in all calls to
request_any_context_irq() and free_irq().

CRs-Fixed: 313755
Change-Id: Ic5a035dc8fc12705968b44fe75b5e10f01ad748f
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-10-24 09:59:52 +05:30
Jing Lin
bace50b68c input: atmel_mxt_ts: Move regulators to LPM/HPM in suspend/resume
Change-Id: I75900b242a628a3ab024e8489273c4cad185c52b
Signed-off-by: Jing Lin <jinglin@codeaurora.org>
2011-10-21 11:46:20 -07:00
Jing Lin
36aee816a0 input: atmel_mxt_ts: Add retry mechanism for I2C read/write
Try up to 3 times for each I2C read/write with 25ms delay between retries.
This is especially needed when writing to T7 to wake up the controller
from deep sleep mode.
Read/write T7 object in block, instead of one byte at a time.

Change-Id: Ibca9cdbf38c5726af5ff4ee9f0ce9ea6f0d183ee
Signed-off-by: Jing Lin <jinglin@codeaurora.org>
2011-10-21 11:46:20 -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
Amy Maloche
2b59bab63c input: atmel_mxt_ts: remove mt protocol b capability
Change-Id: I3bbb94ff1b2380c85bc960ec79d6c7fcc791cf1f
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
2011-10-18 15:05:39 -06:00
Amy Maloche
f0d7b8d83b Input: atmel_mxt_ts: increase delay required for power stabilization
Logging removed which threw previous delay off

Change-Id: I476f584755f676bb80be5b278a60e20f0a4cbb8a
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
2011-10-17 14:20:29 -07:00
Anirudh Ghayal
61d88f754d input: atmel-maxtouch: Fix enabling of IRQ in worker thread
Enable the interrupt only when no work is to be scheduled.

Change-Id: I006688b73331428850936f0cfea14c10f41fcd52
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-10-17 11:46:38 +05:30
Bryan Huntsman
4e7305f5d1 Merge AU_LINUX_ANDROID_GINGERBREAD.02.03.05.00.132 into msm-3.0
* AU_LINUX_ANDROID_GINGERBREAD.02.03.05.00.132:
  usb: Add delay before checking request status
  msm: sdio: Fixing race condition in LPM test.
  msm_fb: display: avoid staging up two pipes at same mixer_stage
  gpu: ion: Add cache flushing APIs
  msm: vidc: Increase the decoder input buffer size.
  devices: 8660: route GSBI12 interrupts to DSPS when enabled
  msm-camera: unregister sd_vpe sub-device in close.
  msm: audio: qdsp6v2: Modify dspcrashd to use new memory addresses
  msm_fb: display: received writeback offset from board file
  msm: bam_dmux: manipulate skb->truesize per packet
  vidc: vdec: Buffer optimization for smooth streaming.
  genirq: fix handle_nested_irq for lazy disable
  msm: sdio: Add validation tests for streaming channels.
  input: cyttsp-i2c: Remove deprecated function strlen
  leds-pm8xxx: Pass LED flags from board file
  msm: platsmp: Remove extraneous boot_secondary delay
  arm: Implement ticket spin-locks
  Revert "spi_qsd: GPIO configuration changes for SPI chip-select line"
  msm: clock-9615: Add RPM-controlled clock support
  Bluetooth: Complete LE Auth failure notification
  ASoC: msm: qdsp6: Print message only when string is not NULL
  msm_fb: display: Fix display driver init calls for auto-detection
  msm: 8960: Enable Multi-tiering support on 8960
  msm: timer: make first_boot flag per-cpu
  msm: board-9615: Add support for cpuidle and pm
  msm: msm9615_defconfig: Enable CONFIG_PM and CONFIG_CPU_IDLE
  msm: Makefile: Compile pm-8x60.c and cpuidle for 9x15
  vidc: venc: Return the correct error code for IOCTL.
  arm: cache-l2x0: Restore the data latency ctrl register after suspend.
  msm: sdio: expose SDIO_CIQ channel for test application
  msm: msm_bus: Correctly validate the pointer to fabrics
  msm: enable CONFIG_ARCH_POPULATES_NODE_MAP on 8960
  msm: smd: Fix Modem-FW subsystem restart support
  msm: clock-8960: Add support for 8064 multimedia clocks
  msm: audio: qdsp6v2: Set tx and rx flags based on current device
  msm_fb: display: vg pipe shared by both rgb and yuv format
  gpu: ion: Add IS_CACHED macro
  defconfig: Enable KS8851 SPI Ethernet as a module
  mfd: pmic: Fix memory leak in debug probe
  mfd: pm8xxx: Free the mutex before probe exit
  spi_qsd: GPIO configuration changes for SPI chip-select line
  msm_charger: Fix race condition with battery supply
  msm: defconfig: Enable Oprofile and cpaccess by default for 7x27a.
  msm: devices-9615: Initialize SPM registers for 9615
  input: atmel_mxt_ts: put device in LPM from T7 and T9
  Bluetooth: Guarantee BR-EDR device will be registered as hci0
  msm: camera: Fix register offsets and add toggle bank selects
  defconfig: msm8660: Enable LCDC_MIPI_DETECT config
  msm_fb: display: Add boot param LCDC/MIPI panel detection support
  msm_fb: display: 7x27a support for panel auto detection.
  board: msm8x60: Add LCDC and MIPI panel detection support
  board: msm8960: Add MIPI panel detection support
  msm: acpuclock-8960: Temporarily disable secondary clock gating
  msm: kgsl: Debugfs knob to configure wait timeout of adreno device

Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
2011-10-11 23:44:12 -07:00
Matt Wagantall
4608830e7a input: evdev: Fix bad merge resolution for wakelock acquisition
The wakelock should only be acquired once in evdev_pass_event().

Change-Id: If0b71d0812511c8a415405280d0679e617b081af
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
2011-10-11 14:38:19 -07:00
Mohan Pallaka
04b7f7980c input: cyttsp-i2c: Remove deprecated function strlen
Replace deprecated function strlen with it's safer
counter part strnlen. Return error code from probe
when cyttsp_initialize() fails.

Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
2011-10-11 09:59:29 -07:00
Amy Maloche
5226221101 input: atmel_mxt_ts: put device in LPM from T7 and T9
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
2011-10-11 09:59:24 -07:00
Mohan Pallaka
9c050f1f6f input: cyttsp-i2c: Remove deprecated functions
Replace deprecated functions sprintf/strncpy with their safer
counter parts, snprintf/strlcpy.

Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
2011-10-05 10:35:46 -07:00
Mohan Pallaka
ab51f2ba25 input: atmel_mxt_ts: Remove deprecated functions
Replace deprecated function sprintf with its safer
counter part, snprintf.

Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
2011-10-05 10:27:13 -07:00
Dima Zavin
183a1fcfd8 input: evdev: do not block waiting for an event if fd is nonblock
If there is a full packet in the buffer, and we overflow that buffer
right after checking for that condition, it would have been possible
for us to block indefinitely (rather, until the next full packet) even if
the file was marked as O_NONBLOCK.

Change-Id: Icd0f59f8cc98392be4c4d13bd45b5cf94317eb5a
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-04 22:51:05 -07:00
Dima Zavin
587b1eb162 input: evdev: if no events and non-block, return EAGAIN not 0
Change-Id: I5f0da721f74e5de111cffc7e7b375b72dd80e530
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-04 22:51:03 -07:00
Dima Zavin
4873193751 input: evdev: only allow reading events if a full packet is present
Without this, it was possible for the reader to get ahead of packet_head.
If the the input device generated a partial packet *right* after the
reader got ahead, then we can get into a situation where the device is
marked readable but read always returns 0 until the next packet is
finished (i.e a SYN is generated by the input driver).

This situation can also happen if we overflow the buffer while a reader
is trying to read an event out.

Change-Id: If01ab371bc7de1bf1f90c122dcc5a29242b01a09
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-04 17:28:47 -07:00
Anirudh Ghayal
e961eb231d input: pm8xxx-pwrkey: Move from threaded irq to any-context irq
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-10-04 17:14:26 -07:00
Anirudh Ghayal
9ffded25fd input: atmel-maxtouch: Modify the work handling in IRQ context
The cancel-work construct is not needed as the new IRQ is
generated only after the old work has completed execution.

Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-10-03 16:20:51 -07:00
Amy Maloche
7e447434cc input: atmel_mxt_ts: Update proper reset time for mxt1386
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
2011-10-03 16:19:47 -07:00
Iiro Valkonen
4ac053cdb9 Input: atmel_mxt_ts - Make wait-after-reset peroid compatible with all chips
The delay before the chip can be accessed after reset varies between different
chips in maXTouch family. Waiting for 200ms and then monitoring the CHG (chip
is ready when the line is low) is guaranteed to work with all chips.

v4: Adjust delay depending on the family ID of the chip. Also add a readback
    of command register after backup is issued, to make sure we are not
proceeding
    too fast there.
v3: Add a check for NULL read_chg() function, and add the read_chg() to platform
    files using this driver (currently only mach-goni.c)
v2: At Dmitry's suggestion, add a timeout so we are not stuck looping
    endlessly in case the CHG is not going low.

Signed-off-by: Iiro Valkonen <iiro.valkonen@atmel.com>
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
2011-10-03 16:19:35 -07:00
Anirudh Ghayal
ba3bc7acf2 input: atmel-mxt-ts: Make digitizer object(43) readable/writeable
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-10-03 16:18:39 -07:00
Anirudh Ghayal
909dcfdd04 input: cyttsp-i2c: Move resume call under CONFIG_PM
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-10-03 16:18:24 -07:00
Anirudh Ghayal
84e511925f input: cyttsp-i2c: Fix the EARLYSUSPEND and PM defines
This change prevents the resume handler being called in the
regular resume callback. It should get called only during late
resume. This can cause the device to wake up earlier than expected.

Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-10-03 16:18:02 -07:00
Praveena Pachipulusu
8b621e4279 input: cyttsp-i2c: Change the permission of firmware sysfs entries
CRs-fixed: 302911
Signed-off-by: Praveena Pachipulusu <pveena@codeaurora.org>
2011-10-03 16:17:00 -07:00
Amy Maloche
13dcf554d9 input: cyttsp-i2c: Reduce time needed to resume from sleep
Reduce the number to attempts to move out of bootloader
mode.

Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
2011-10-03 16:16:20 -07:00
Anirudh Ghayal
ab2754e472 input: cyttsp-i2c: Improve error handling in bootloader mode
Attempt multiple I2C writes (in case of failures) to get the
device out of bootloader mode.

Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-10-03 16:16:19 -07:00
Zhang Chang Ken
f5a4bbe4a0 input: cy8c_ts: Add support for TMA340 TS controller
This controller uses the same packet format as TMA300

Signed-off-by: Zhang Chang Ken <kenz@codeaurora.org>
2011-10-03 16:16:01 -07:00
Mohan Pallaka
727225f609 input: cyttsp-i2c: Add support for disabling ghost touch detection
Add support to treat ghost touches as normal touches incase firmware
reports all touches as ghost touches.

Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
2011-10-03 16:15:53 -07:00
Anirudh Ghayal
f1071c0d57 input: atmel-mxt-ts: Make USERDATA as writable object
The USERDATA object can be used to store user specific
data such as version info.

Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-10-03 16:15:25 -07:00
Anirudh Ghayal
253ce1292f input: atmel-mxt-ts: Add earlysuspend support
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-10-03 16:15:24 -07:00
Anirudh Ghayal
a498e4d825 input: atmel-mxt-ts: Add regulator support and init. callbacks
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-10-03 16:15:24 -07:00
Mohan Pallaka
df53bc38e9 input: cy8c_ts: Clear status register in resume
To avoid firmware getting lock up after suspend
clear the status register in resume.

CRs-fixed: 300494
Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
2011-10-03 16:14:10 -07:00
Mohan Pallaka
1cef4a0f37 input: cyttsp-i2c: Verify checksum before firmware upgrade
Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
2011-10-03 10:27:46 -07:00
Amy Maloche
edd5fd79fb input: cyttsp-i2c: choose firmware start address
Firmware start address changes from GEN3 to GEN2 devices.
Select proper firmware start address based on chip generation.

Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
2011-10-03 10:26:42 -07:00
Bryan Huntsman
3f2bc4d6eb Initial Contribution
msm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142

Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
2011-10-03 09:57:10 -07:00
Bryan Huntsman
66589de55e Merge remote-tracking branch 'linux-audio/sgc/topic/omap_3.0'
* linux-audio/sgc/topic/omap_3.0: (106 commits)
  ASoC: twl6040: Configure init gain to minimal value
  ASoC: ABE: Protect playback/capture triggers against removal
  ASoC: DSP: Connect FE->BE links if FE is active
  ASoC: McPDM: Update channel management (for squash)
  ASoC: OMAP4 - Port Manager: Fix up DEBUG_FS compilation error
  ASoC: ABE DSP: Fixes for firmware equalizer parsing
  ASoC: ABE DSP: Use same firmware strategy for built-in and modules
  ASoC: ABE HAL: Allow flexible firmware loading
  ASoC: ABE DSP: Fix compilation warnings
  ASoC: OMAP ABE: update Firmware version 09.45
  ASoC: pcm - fix locking for dsp ops
  ASoC: OMAP ABE: Update for PM.
  ASoC: McPDM: Update channels management to link UL and DL
  ASoC: ABE DAI: Call modem trigger in bespoke_trigger()
  ASoC: ABE DAI: support 2 channels for MODEM DAI
  OMAP4: SDP4430: Fix merge issue with new MFD driver
  ASoC: OMAP: SDP4430 fix merge issue.
  ASoC: dapm: Fix long_name pointer for DAPM muxes
  ASoC: mcpdm: Enable watchdog during audio activity
  ASoC: SDP4430: Fix DMICs stream name
  ...
2011-09-23 11:00:20 -07:00