Commit Graph

45345 Commits

Author SHA1 Message Date
Linux Build Service Account
82330b9f32 Merge "diag: Add tools support for new 8x30 and 8x27 targets" into msm-3.0 2012-02-04 05:23:43 -08:00
Linux Build Service Account
a27dc74adc Merge changes I95f949b5,I1f4a392d,I80254c3a,I910680ca,Ifa1aafaf into msm-3.0
* changes:
  gpu: ion: Add ION support for fmem
  gpu: ion: Add check for cached kernel mappings
  gpu: ion: Remove protection of heap on first alloc
  fmem: Add reserved_size to fmem
  fmem: clean up tmem metadata before leaving T-state
2012-02-04 03:29:28 -08:00
Linux Build Service Account
4ac08fd96a Merge changes I21cffb4e,Ic583c824,I0ea73d3b,Icfc51c01 into msm-3.0
* changes:
  msm: board-8960: Enable PMIC USB OTG switch over current protection
  msm: board-8960: Support PMIC USB OTG switch over current protection
  regulator: pm8xxx-regulator: Add OCP control functionality for switches
  mfd: pmic: Add voltage switch test registers to PMIC core drivers
2012-02-04 03:29:28 -08:00
Linux Build Service Account
2970cea5bf Merge changes I02b24c23,Iebbd012b,Ibd87db4f into msm-3.0
* changes:
  wfd: Remove support for V4L2_CID_MPEG_VIDEO_ENCODING control
  [media] v4l: Add frameskip parameter
  [media] v4l: add fourcc definitions for compressed formats
2012-02-04 03:29:28 -08:00
Linux Build Service Account
721dfb4fb6 Merge changes Ic320ab90,I8415288f,I25568cb6,I23c6e004 into msm-3.0
* changes:
  msm: camera: Remove DIS related code from VPE driver.
  msm: camera: Add MCTL camera node.
  msm: camera: Configure VFE for two output mode.
  msm: camera: Correct the reserve buffer logic in mctl_pp.
2012-02-03 21:38:54 -08:00
Laura Abbott
caafeea7ce gpu: ion: Add ION support for fmem
FMEM allows ION to release memory for other
purposes when ION clients are not using the
memory.

Add new heap type for fmem that make calls
into fmem API to transition memory from T to
C state and vice versa. Add support for
fmem to content protection heap.

Change-Id: I95f949b57c99949e6eafe6a6f5fd147bdaa264f6
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2012-02-03 15:21:49 -08:00
Felipe Balbi
9e42b8b008 usb: gadget: fix typo for default U1/U2 exit latencies
s/DEFULT/DEFAULT/, no functional changes.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-02-03 21:28:40 +02:00
Sebastian Andrzej Siewior
61a3b903ab usb: gadget: udc-core: add "new-style" registration interface
udc_start() should only trigger the internal state machine and make
minimal house keeping. Before that call udc-core calls the bind()
callback and after the callback the pullup().

udc_stop() is simillar, udc-core calls pullup(), unbind() and finally
udc_stop().

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-02-03 21:28:37 +02:00
Tatyana Brokhman
355527ba15 usb: gadget: add SuperSpeed support to the Gadget Framework
SuperSpeed USB has defined a new descriptor, called
the Binary Device Object Store (BOS) Descriptor. It
has also changed a bit the definition of SET_FEATURE
and GET_STATUS requests to add USB3-specific details.

This patch implements both changes to the Composite
Gadget Framework.

[ balbi@ti.com : slight changes to commit log
		 fixed a compile error on ARM ]

Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-02-03 21:28:36 +02:00
Tatyana Brokhman
fd11902012 usb: gadget: add max_speed to usb_composite_driver
This field is used by the Gadget drivers to specify
the maximum speed they support, meaning: the maximum
speed they can provide descriptors for.

The driver speed will be set in consideration of this
value.

[ balbi@ti.com : dropped the ifdeffery ]

Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-02-03 21:28:36 +02:00
Tatyana Brokhman
24728e0ee2 usb: gadget: add streams support to the gadget framework
This patch defines necessary fields to support
streaming for USB3.0.

It implements a new function, called
usb_ep_autoconfig_ss(), to be used instead of the
existing usb_ep_autoconfig() when working in
SuperSpeed mode and there is a need to search for
an endpoint according to the number of required
streams.

[ balbi@ti.com : slight changes to commit log ]

Signed-off-by: Maya Erez <merez@codeaurora.org>
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-02-03 21:28:35 +02:00
Tatyana Brokhman
ebd3f395ba usb: gadget: use config_ep_by_speed() instead of ep_choose()
Remove obsolete functions:
1. ep_choose()
2. usb_find_endpoint()

Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
[idos@codeaurora.org: Changed also the following files to
comply with this commit: f_accessory.c,f_adb.c,f_diag.c,f_mtp.c,
f_rmnet.c,f_rmnet_sdio,f_rmnet_smd,f_rmnet_smd_sdio,f_serial.f_ccid.c.
Also merged a patch in f_serial.c for correct checking of the return value
of config_ep_by_speed. See "usb: gadget: fix g_serial regression".
Also fix a bug in ci13xxx_udc. Since f_serial is now checking if the endpoint
descriptors are null in the set_alt function, need to set them to null on
ep_disable in case of cable disconnect. Since the ep descriptor was inserted
to struct usb_ep in "usb: gadget: add usb_endpoint_descriptor to struct usb_ep"
then simply convert the ci13xxx_udc to work with mEp->ep.desc instead of
mEp->desc, this will ensure that the correct descriptor will be cleared
on endpoint disable.
I will upstream it to Linux community soon, I will name it:
"usb: gadget: use usb ep descriptor of struct usb_ep instead of wrapper desc"]
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-02-03 21:28:34 +02:00
Tatyana Brokhman
e2a9f931cc usb: gadget: configure endpoint according to gadget speed
Add config_ep_by_speed() to configure the endpoint
according to the gadget speed.

Using this function will spare the FDs from handling
the endpoint chosen descriptor.

Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-02-03 21:28:34 +02:00
Tatyana Brokhman
9168a350f7 usb: gadget: add usb_endpoint_descriptor to struct usb_ep
Change usb_ep_enable() prototype to use endpoint
descriptor from usb_ep.

This optimization spares the FDs from saving the
endpoint chosen descriptor. This optimization is
not full though. To fully exploit this change, one
needs to update all the UDCs as well since in the
current implementation each of them saves the
endpoint descriptor in it's internal (and extended)
endpoint structure.

Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
[idos@codeaurora.org: Added more changes for the following files
since API break with msm code tree: ci13xxx_udc.c,f_accessory,f_adb,
f_diag,f_mtp,f_rmnet,f_rmnet_sdio,f_rmnet_smd, f_rmnet_smd_sdio,u_bam.c,
u_sdio.c,u_rmnet.h,u_sdio.c,u_smd.c,f_ccid.c,u_data_hsic.c]
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-02-03 21:28:33 +02:00
Felipe Balbi
b657342882 usb: gadget: introduce UDC Class
this class will be used to abstract away several of the duplicated
operations scattered among the USB gadget controller drivers.

Later, we can add an atomic notifier to tell interested drivers about
what's happening with the controller. Notifications such as suspend,
resume, enumerated, etc. will be useful, at a minimum, for implementing
usb charger detection.

As part of the converting process usb_gadget_probe_driver() is no longer
part of each udc but pushed into the ->stap() callback. The same for his
couterpart.

The core is currently set explicit to 'n'. It will be changed to 'y' once
all users are converted since it provides functions which clash with
other drivers.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-02-03 21:28:32 +02:00
Sebastian Andrzej Siewior
1e4eabf4be usb: ch9: add function defines from ch9, USB 3.0 spec
not to confuse with Table 9-7 in USB 2.0 spec

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-02-03 21:28:32 +02:00
kuninori.morimoto.gx@renesas.com
24a340bc5f usb: add usb_endpoint_maxp() macro
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
[idos@codeaurora.org: use __le16_to_cpu instead of le16_to_cpu]
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-02-03 21:27:03 +02:00
David Collins
0c19fa8e52 regulator: pm8xxx-regulator: Add OCP control functionality for switches
Add the ability to selectively enable over current protection
(OCP) for LVS and MVS type PMIC voltage switches.  OCP is used to
automatically disable the output of a PMIC switch in hardware when
the load on the switch becomes too large.

The sequence used when enabling a switch when OCP is desired is as
follows:
1. Disable OCP.
2. Enable the switch.
3. Wait for ocp_enable_time microseconds.
4. Enable OCP.

This sequence is used to ensure that sufficient time is allowed
for inrush current to subside so that a false OCP event is not
triggered.  The delay time is board specific.

Change-Id: I0ea73d3bddd3280ff25f232ece0f1175a52d36cc
Signed-off-by: David Collins <collinsd@codeaurora.org>
2012-02-03 11:12:25 -08:00
David Collins
1b570d26b8 mfd: pmic: Add voltage switch test registers to PMIC core drivers
Specify the SSBI test register address for each of the voltage
switches in PMIC 8018, 8038, and 8921 core drivers.  This will
allow for future handling of over current protection (OCP) in
the pm8xxx-regulator driver.

Also define the OCP IRQs associated with each of the switches
on these PMICs.

Change-Id: Icfc51c01680e6e95b4348051c764f16cb91b4916
Signed-off-by: David Collins <collinsd@codeaurora.org>
2012-02-03 11:07:23 -08:00
Eric W. Biederman
cc1be3611b netns: Fail conspicously if someone uses net_generic at an inappropriate time.
[ Upstream commit 5ee4433efe99b9f39f6eff5052a177bbcfe72cea ]

By definition net_generic should never be called when it can return
NULL.  Fail conspicously with a BUG_ON to make it clear when people mess
up that a NULL return should never happen.

Recently there was a bug in the CAIF subsystem where it was registered
with register_pernet_device instead of register_pernet_subsys.  It was
erroneously concluded that net_generic could validly return NULL and
that net_assign_generic was buggy (when it was just inefficient).
Hopefully this BUG_ON will prevent people to coming to similar erroneous
conclusions in the futrue.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Tested-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-03 09:19:03 -08:00
Thomas Hellstrom
90af660bec drm: Fix authentication kernel crash
commit 598781d71119827b454fd75d46f84755bca6f0c6 upstream.

If the master tries to authenticate a client using drm_authmagic and
that client has already closed its drm file descriptor,
either wilfully or because it was terminated, the
call to drm_authmagic will dereference a stale pointer into kmalloc'ed memory
and corrupt it.

Typically this results in a hard system hang.

This patch fixes that problem by removing any authentication tokens
(struct drm_magic_entry) open for a file descriptor when that file
descriptor is closed.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-03 09:18:52 -08:00
Larry Bassel
cf10e5846d fmem: Add reserved_size to fmem
Due to a limitation in how the video hardware is able
to access memory, fmem needs to be able to allocate a
physically contiguous block of memory that can be split into
two pieces. One piece will be managed by fmem
while the other piece (reserved) will not be handled by fmem.
The hardware limitation requires the reserved part to be at
a lower address than the other piece managed by fmem.

Add a new parameter to fmem that allows platform
data to specify the size of the piece that should not
be managed by fmem.

Change-Id: I910680ca72233de9cef91ac3262a078a36f1b1fd
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2012-02-03 08:58:44 -08:00
Kiran Kumar H N
8f68c594b5 msm: camera: Remove DIS related code from VPE driver.
VPE driver should be abstracted from DIS related
code since the configuration is done in the userspace
library. So remove the code from VPE driver.

Change-Id: Ic320ab903cff502f2a21e1ae66ecc06581e56aa3
Signed-off-by: Ujwal Patel <ujwalp@codeaurora.org>
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
2012-02-02 17:42:04 -08:00
Kiran Kumar H N
c3cb9ea7ca msm: camera: Add MCTL camera node.
Add support for MCTL camera node. This
is a v4l2 device node which will be used
by the camera daemon process to configure
buffers for VFE.

Change-Id: I8415288fb6881376a8c1e78ca03bb12f8f655863
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
Signed-off-by: Ujwal Patel <ujwalp@codeaurora.org>
2012-02-02 16:28:35 -08:00
Kiran Kumar H N
dd12847121 msm: camera: Configure VFE for two output mode.
Configure upto two outputs of VFE desginated
as primary and secondary. Depending on the irq,
only send message type primary and secondary and
allow MCTL to interpret these messages.

Change-Id: I25568cb6bba5792658b0570383f64ddb58e21421
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
Signed-off-by: Ujwal Patel <ujwalp@codeaurora.org>
2012-02-02 16:28:35 -08:00
Deva Ramasubramanian
51cbd0accc [media] v4l: Add frameskip parameter
v4l2_qcom_frameskip is a QCOM specific parameter to be used with
VIDIO_S_PARM to indicate that the driver might take up to
maxframeinterval nanoseconds in providing the next buffer.

Driver supports this parameter if the V4L2_CAP_QCOM_FRAMESKIP capability
is set in VIDIO_G_PARM.

Change-Id: Iebbd012b9cc75395b1e165349e7e2d9d7a77160a
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
2012-02-02 12:21:17 -08:00
Kamil Debski
8b02007a6b [media] v4l: add fourcc definitions for compressed formats
Add fourcc definitions and documentation for the following
compressed formats: H264, H264 without start codes,
MPEG1/2/4 ES, XVID, VC1 Annex G and Annex L compliant.

Change-Id: Ibd87db4f72793310871ebd7a178e9593c4b54d33
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
2012-02-02 12:21:16 -08:00
Kevin Chan
318d7cbd8e msm: camera: Correct the reserve buffer logic in mctl_pp.
When the daemon asks to reserve a free buffer, get the
correct address by using the image mode to get to the
correct camera instance and populating the buffer address.

Change-Id: I23c6e00458562ef2b9880cbffe2d6a100de80ea1
Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
Signed-off-by: Ujwal Patel <ujwalp@codeaurora.org>
2012-02-02 09:49:29 -08:00
Ankush Khandelwal
3fb6bc2ae5 msm: rc: Rename TSOP IR Receiver Driver
Since the driver is a generic gpio based IR Receiver driver,
name of the driver has been changed from tsop-ir to gpio-ir-recv.
Variables of the driver change accordingly.

Change-Id: I2e41c320b3f2f1a9796fc404791024c112a498c1
Signed-off-by: Ankush Khandelwal <akhand@codeaurora.org>
2012-02-02 13:31:57 +05:30
Amy Maloche
83c385a929 input: atmel-mxt-ts: Provide max touch coordinates via platform data
The atmel_mxt_ts driver manipulates the touch coordinates
if they are < 1024. In cases when the display < 1024 and
virtual key area > 1024, there is a problem in reporting
the coordinates for the virtual key area. Add new pdata
variables which can handle this.

Change-Id: Ic31db032a1598c60c01bff31c7b36042f42c9817
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
2012-02-01 14:41:01 -08:00
Linux Build Service Account
98009d81e1 Merge "mfd: pm8xxx-misc: add pm8xxx_usb_id_pullup API" into msm-3.0 2012-02-01 10:37:20 -08:00
Felipe Balbi
3853301374 usb: dwc3: omap: distinguish between SW and HW modes
The OMAP wrapper allows us to either control internal
OTG signals via SW or HW. Different boards might wish
to use one or the other mode of operation. Let's have
have that information passed via platform_data for now.

After DT conversion is finished for OMAP, we can easily
convert this to a DT attribute.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
2012-02-01 17:46:16 +02:00
Shalabh Jain
a755784054 diag: Add tools support for new 8x30 and 8x27 targets
PC tools like QPST/QXDM need a distinct ID for each new target type.
DIAG driver provides this ID and hence adding this support.

Change-Id: I270706440ffdfeb1244a9c96484f26c386cc9cbd
Signed-off-by: Shalabh Jain <shalabhj@codeaurora.org>
2012-02-01 20:25:03 +05:30
Willie Ruan
5db1f24037 mfd: pm8xxx-misc: add pm8xxx_usb_id_pullup API
PM8921 family provides a pullup enable bit to support USB ID.
Add the API for such support.

Change-Id: Id3056af070080c1c12f27720020ae718fc6f34f6
Signed-off-by: Willie Ruan <wruan@codeaurora.org>
2012-02-01 14:11:04 +05:30
Linux Build Service Account
fa94c687e2 Merge "base: genlock: Remove genlock_release_lock and associated ioctl" into msm-3.0 2012-01-31 21:44:00 -08:00
Arve Hjønnevåg
4dc43d7079 Input: evdev - Add ioctl to block suspend while event queue is not empty.
Add an ioctl, EVIOCSSUSPENDBLOCK, to enable a wakelock that will block
suspend while the event queue is not empty. This allows userspace code to
process input events while the device appears to be asleep.

The current code holds the wakelock for up 5 seconds for every input
device and client. This can prevent suspend if sensor with a high data
rate is active, even when that sensor is not capable of waking the
device once it is suspended.

Change-Id: I624d66ef30a0b3abb543685c343382b8419b42b9
Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-01-31 16:00:27 -08:00
Linux Build Service Account
30b801365a Merge "slimbus: Provide separate APIs to connect source and sink ports" into msm-3.0 2012-01-31 13:05:26 -08:00
Willie Ruan
b10be97df4 mfd: pm8xxx-pwm: add pre-divide=6 and update macros
Add pre-divide=6 and update the max period based on new pre-divide.
Also update pre-divide related macros for better readability.

Change-Id: I5298c373c78f8723dab9a735e4d94f89798800d5
Signed-off-by: Willie Ruan <wruan@codeaurora.org>
2012-01-30 11:23:49 -08:00
Linux Build Service Account
516d60e24a Merge "usb: gadget: Add HSIC Peripheral over SPS support" into msm-3.0 2012-01-29 07:55:46 -08:00
Linux Build Service Account
d023140883 Merge "msm: idle_stats: Permit GPU DCVS daemon to configure number of samples" into msm-3.0 2012-01-29 07:55:46 -08:00
Ofir Cohen
010009b830 usb: gadget: Add HSIC Peripheral over SPS support
Add support in HSIC peripheral(device)
over SPS.
Only one USB core can be use - currently HSUSB
is enabled by default.
To enable HSIC core defconfig file should be changed.

Change-Id: I256aecd9e6dfd8bfd71719c32beed8b24225e11c
Signed-off-by: Ofir Cohen <ofirc@codeaurora.org>
2012-01-29 09:03:19 +02:00
Linux Build Service Account
7927d50224 Merge changes I92fff75b,I9d7e536f,I418df8c3,I684da4bd into msm-3.0
* changes:
  Input: atmel_mxt_ts: Add a debugfs attribute to show all objects
  board: 8960: Add config data for mXT1386E touch controller
  input: atmel_mxt_ts: Add support for object PROCI_SHIELDLESS_T56
  input: atmel_mxt_ts: Support runtime selection of config data
2012-01-28 04:49:08 -08:00
Linux Build Service Account
58a3cd78f8 Merge "power: pm8921-charger: Allow setting -ve cool/warm temperature" into msm-3.0 2012-01-27 21:57:57 -08:00
Linux Build Service Account
cf9ddedcce Merge "slimbus: Support more than 1 clients to use a channel" into msm-3.0 2012-01-27 21:57:57 -08:00
Sagar Dharia
29f35f08b9 slimbus: Provide separate APIs to connect source and sink ports
Source and sink ports for a channel may be connected from different
clients.
Multiple sink ports and 1 source port can be connected to a channel.
Ports are freed/zeroed when channel is removed.

Change-Id: I165bb9db4fb43a9a884ea14ffed08f8d11b65c39
Signed-off-by: Sagar Dharia <sdharia@codeaurora.org>
2012-01-27 14:57:41 -07:00
Jordan Crouse
4df70a254d base: genlock: Remove genlock_release_lock and associated ioctl
Allowing a lock to be asynchronously released while a handle
was still active turned out to be too dangerous to use in a
multi-threaded environment and it served no pratical
purpose anyway.  Handles now hold an attached lock until they
are destroyed.

CRs-fixed: 333141
Change-Id: Ic0dedbad8050ff01927ddb165c65a939bf297c10
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2012-01-27 09:44:39 -07:00
Jing Lin
dc4413c370 input: atmel_mxt_ts: Support runtime selection of config data
Add support for dynamic configuration data update if the target can
support more than one Atmel chip. Platform data contains an array of
supported config data along with family ID, variant ID and firmware
version. Driver searches for matching family ID, variant ID and
firmware version, and uses the corresponding config data to program.

Change-Id: I684da4bdef56a3445acab3bb8fe47dd5279bebe5
Signed-off-by: Jing Lin <jinglin@codeaurora.org>
2012-01-27 08:40:53 -08:00
Linux Build Service Account
1484f46cd1 Merge changes I9b4acae8,Ic0e2a529,Ib37f8545 into msm-3.0
* changes:
  ASoC: wcd9310: Use calibrated threshold
  ASoC: wcd9310: Introduce MBHC multi button support
  ALSA: Define more sound jack types
2012-01-27 02:51:38 -08:00
Linux Build Service Account
089eb277bd Merge "ASoC: msm: Add timestamp support for compressed audio" into msm-3.0 2012-01-27 02:51:38 -08:00
Linux Build Service Account
d2064cfab2 Merge "diag: Add support for 9615, 8260A, and 8974 targets" into msm-3.0 2012-01-26 16:02:11 -08:00