OSDN Git Service
Xiaonian Wang [Fri, 15 Apr 2016 11:34:12 +0000 (19:34 +0800)]
input: synaptics_dsx_2.6: not reinit when spontaneous reset is detected
There is no need to reinit device when spontaneous reset is detected,
touch will recover by itself.
Change-Id: Ifb5b134d0fbeb2f55f16af8806abb9c8e51c35e0
Signed-off-by: Xiaonian Wang <xiaonian@codeaurora.org>
Shantanu Jain [Fri, 1 Apr 2016 04:56:24 +0000 (10:26 +0530)]
input: synaptics_dsx_2.6: correct secure_touch_init function
In synaptics_dsx_2.6 touch driver, secure_touch_init tries to get
the QUP clocks for the secure touch functionality. But as these
calls are optional and TZ might get the owenership of these clocks,
this change removes the error return statement, so that the
secure touch can be initialized properly.
Change-Id: I12b5075d484cd397bfb423479589e159a2193f31
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Linux Build Service Account [Mon, 5 Sep 2016 23:21:42 +0000 (16:21 -0700)]
Merge "ASoC: wcd934x: Update codec master clock configuration"
Linux Build Service Account [Mon, 5 Sep 2016 23:21:42 +0000 (16:21 -0700)]
Merge "ASoC: wcd934x: Fix register default for MAD buffer interval"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:54 +0000 (13:52 -0700)]
Merge "msm: mdss: fix adaptive variable refresh and dynamic fps concurrency"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:53 +0000 (13:52 -0700)]
Merge "usb: phy: handle phy related regulators properly"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:49 +0000 (13:52 -0700)]
Merge "input: ft5x06_ts: add sysfs to access touch module info"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:49 +0000 (13:52 -0700)]
Merge "input: ft5x06_ts: remove proximity sensor support"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:48 +0000 (13:52 -0700)]
Merge "qcom-charger: smb138x: update FCC settings in smb_params table"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:48 +0000 (13:52 -0700)]
Merge "qcom-charger: smb2: configure stat pin for parallel charging"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:47 +0000 (13:52 -0700)]
Merge "msm: ipa3: Fix timeout period of IPA resource add dependency"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:46 +0000 (13:52 -0700)]
Merge "Replace %p with %pK to prevent leaking kernel address"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:46 +0000 (13:52 -0700)]
Merge "diag: Do not open glink channel twice"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:45 +0000 (13:52 -0700)]
Merge "msm: ipa3: Fix wrong parameter to xdci release function"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:43 +0000 (13:52 -0700)]
Merge "ARM: dts: msm: Update qusb2 efuse address for msmcobalt-v2"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:42 +0000 (13:52 -0700)]
Merge "usb: phy: qusb: Update tune1 param from efuse register"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:41 +0000 (13:52 -0700)]
Merge "tty: serial: msm: Add runtime PM and system sleep support"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:41 +0000 (13:52 -0700)]
Merge "netfilter: xt_quota2: 3.18 netlink notification fix"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:40 +0000 (13:52 -0700)]
Merge "usb: dwc3: restart usb upon endpoint cmd timeout"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:39 +0000 (13:52 -0700)]
Merge "ipv4/GRO: Make GRO conform to RFC 6864"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:39 +0000 (13:52 -0700)]
Merge "ext4 crypto: simplify interfaces to directory entry insert functions"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:38 +0000 (13:52 -0700)]
Merge "msm: mdss: Initialize pp_sts variable before use"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:37 +0000 (13:52 -0700)]
Merge "qcom-charger: introduce step charging"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:37 +0000 (13:52 -0700)]
Merge "msm: ipa3: fix GSI ring DMA allocation parameters"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:36 +0000 (13:52 -0700)]
Merge "clk: msm: Add support for block reset clocks for msmcobalt"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:35 +0000 (13:52 -0700)]
Merge "ARM: dts: msm: change ebi buswidth for msmhamster"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:34 +0000 (13:52 -0700)]
Merge "nf: xt_qtaguid: fix handling for cases where tunnels are used."
Linux Build Service Account [Fri, 2 Sep 2016 20:52:33 +0000 (13:52 -0700)]
Merge "msm: sde: Fix SMMU fault in SDE rotator for secure playback"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:33 +0000 (13:52 -0700)]
Merge "ARM: dts: msm: add 2 lane support for msmcobalt ufs phy"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:32 +0000 (13:52 -0700)]
Merge "qseecom: improve listener resp processing if app is blocked"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:31 +0000 (13:52 -0700)]
Merge "msm: sde: Fix SDE rotator driver error handling"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:31 +0000 (13:52 -0700)]
Merge "msm: ipa: fix potential race condition ioctls"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:29 +0000 (13:52 -0700)]
Merge "cnss: Reset QCA Card during WLAN SubSystem Recovery"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:29 +0000 (13:52 -0700)]
Merge "scsi: ufs: Initiate crypto before SCSI for UFS fast boot"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:27 +0000 (13:52 -0700)]
Merge "cfg80211: Add option to specify previous BSSID for Connect command"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:26 +0000 (13:52 -0700)]
Merge "cfg80211: Define macro to indicate prev_bssid connect support"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:25 +0000 (13:52 -0700)]
Merge "soc: qcom: glink: Validate ctx before using"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:25 +0000 (13:52 -0700)]
Merge "mutex: Add a delay into the SPIN_ON_OWNER wait loop."
Linux Build Service Account [Fri, 2 Sep 2016 20:52:24 +0000 (13:52 -0700)]
Merge "net: ipc_router: Fix remote port conn_info memory leak"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:23 +0000 (13:52 -0700)]
Merge "host: sdhci-msm: implement get_current_limit() host op"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:23 +0000 (13:52 -0700)]
Merge "diag: Add error handler to free buffers when fwd fails"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:21 +0000 (13:52 -0700)]
Merge "icnss: Shutdown only if probed"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:20 +0000 (13:52 -0700)]
Merge "icnss: Fix NULL pointer dererference"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:19 +0000 (13:52 -0700)]
Merge "defconfig: msmcortex: enable QCOM_TADC driver"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:18 +0000 (13:52 -0700)]
Merge "defconfig: msm: enable common log for msmcobalt"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:17 +0000 (13:52 -0700)]
Merge "msm: camera: secure camera support"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:15 +0000 (13:52 -0700)]
Merge "msm: camera: isp: Use single stream for dual vfe"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:15 +0000 (13:52 -0700)]
Merge "coresight-stm: let runtime PM handle core clock"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:14 +0000 (13:52 -0700)]
Merge "msm: sensor: Add support for querying flash max current"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:13 +0000 (13:52 -0700)]
Merge "msm: mdss: increase mdp hw recovery timeout"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:13 +0000 (13:52 -0700)]
Merge "ARM: dts: msm: change the CX handle in PCIe node on msmcobalt"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:12 +0000 (13:52 -0700)]
Merge "msm: pcie: config core and peripheral memory for PCIe clocks"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:11 +0000 (13:52 -0700)]
Merge "msm: pcie: correct size of local PCIe clock frequency buffer"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:09 +0000 (13:52 -0700)]
Merge "USB: f_accessory: Fix crash if driver failed to initialize"
Linux Build Service Account [Fri, 2 Sep 2016 20:52:09 +0000 (13:52 -0700)]
Merge "USB: f_accessory: set manufacturer and model string to default value"
Prashanth Bhatta [Thu, 1 Sep 2016 16:07:33 +0000 (09:07 -0700)]
icnss: Fix NULL pointer dererference
With commit
a3a3c169dd0d ("icnss: Prevent power collapse during
driver probe/remove"), NULL pointer dereference happens in probe
because of recent changes in the function. Fix the issue by using
right pointer.
CRs-Fixed:
1061279
Change-Id: I464579953fabe1bd42ced50f0bbfdfd3cda0a492
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
Bhalchandra Gajare [Mon, 22 Aug 2016 21:58:54 +0000 (14:58 -0700)]
ASoC: wcd934x: Fix register default for MAD buffer interval
Current register default setting for MAD buffer interval is incorrect
and hence microphone activity detection is not functional. Update the
default value of the MAD buffer interval to 10msec.
CRs-Fixed:
1049012
Change-Id: I1dcdcb566f096bbddad286dc71c5bf980303e4c3
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
Prashanth Bhatta [Wed, 31 Aug 2016 19:45:58 +0000 (12:45 -0700)]
icnss: Shutdown only if probed
With the recovery changes, if modem is brought down without FW
ready but WLAN driver is registered then shutdown call back is
called. This causes stability issue.
Make sure not call the shutdown call back if driver is not
registered. Also listening for PD notifications are enough even
for Subsystem restart so changing the quirks to take care of it.
CRs-fixed:
1061734
Change-Id: Ic5d1a38dfb6ea3e255424af135e2afbe47d1fc18
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
Harry Yang [Tue, 30 Aug 2016 18:30:47 +0000 (11:30 -0700)]
qcom-charger: smb138x: update FCC settings in smb_params table
Fix fcc max and step values per HW specification.
CRs-Fixed:
1060633
Change-Id: Ie4ff10977840d8210482ad6f7bba4f0f0160aa03
Signed-off-by: Harry Yang <harryy@codeaurora.org>
Harry Yang [Mon, 29 Aug 2016 18:46:43 +0000 (11:46 -0700)]
qcom-charger: smb2: configure stat pin for parallel charging
Currently the PMI stat pin is configured to output IRQ and SW
override status. Parallel charging requires the stat pin for
parallel enable status and under the control of HW, and hence
the change.
CRs-Fixed:
1060633
Change-Id: Ie93f874b90b5aed0a66e97186e4f1d69a1275c8b
Signed-off-by: Harry Yang <harryy@codeaurora.org>
Phani Kumar Uppalapati [Tue, 30 Aug 2016 23:55:41 +0000 (16:55 -0700)]
ASoC: wcd934x: Update codec master clock configuration
Update wcd934x codec master clock configuration to
9.6MHz or 12.288MHz based on the device tree setting.
This is done during early codec initialization to prevent
artifacts when audio path is enabled.
CRs-fixed:
1061430
Change-Id: Ic983a524b6fa5bb079c6e61b8fe729974de78eea
Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
Mao Li [Thu, 17 Sep 2015 08:29:57 +0000 (16:29 +0800)]
input: ft5x06_ts: add sysfs to access touch module info
Add sysfs under sys/kernel/ts_info to access touch vendor name,
model number, firmware version.
Change-Id: I531c7fa7db2b7140e5b9c7bb31831d221c734e3e
Signed-off-by: Mao Li <maol@codeaurora.org>
Sudhakar Manapati [Sat, 12 Sep 2015 14:35:50 +0000 (20:05 +0530)]
input: ft5x06_ts: remove proximity sensor support
remove psensor support as the linux/sensors.h file is not yet merged
in msm-3.18 kernel.
Change-Id: I6d46b35938b7420072f9245ffa27bb59f28d5e03
Signed-off-by: Sudhakar Manapati <smanap@codeaurora.org>
Sudhakar Manapati [Thu, 13 Aug 2015 16:38:56 +0000 (22:08 +0530)]
input: sensors: change sensors classdev device's parent to input devices
Sensor HAL takes long time to scan /dev/input to get information
from input subsystem. Change sensors sysfs hierarchy to avoid
the scanning to reduce sensor HAL initialization time.
Change-Id: Ifcd560dacdba2600f2ae5d40a5c3e639ea291274
Signed-off-by: Sudhakar Manapati <smanap@codeaurora.org>
Mao Li [Wed, 24 Dec 2014 02:26:06 +0000 (21:26 -0500)]
input: ft5x06_ts: correct the status of the pocket mode
Do not need to call function to enter pocket mode if the touch
panel is already in pocket mode as well as no need to call function
to leave pocket mode if it is not in pocket mode.
Change-Id: Ic26376bebeba8e7f0dd37ef3bfbbed36c621604b
Signed-off-by: Mao Li <maol@codeaurora.org>
Mao Li [Fri, 19 Dec 2014 02:35:03 +0000 (21:35 -0500)]
input: ft5x06_ts: fix compiling error in FT CTP driver
Change dev_debug to dev_dbg to fix compiling error
if CONFIG_TOUCHSCREEN_FT5X06_PSENSOR is enabled.
Change-Id: Ic228ac8b6dec0bc3e1aaff890dc5b1b7c024bdfc
Signed-off-by: Mao Li <maol@codeaurora.org>
Mao Li [Mon, 15 Dec 2014 08:39:50 +0000 (03:39 -0500)]
input: ft5x06_ts: do not free input_dev after unregister it
Once the input device is successfully registered via
input_register_device(), it has to be unregistered via
input_unregister_device(); input_free_device()
should not be called in this case. input_unregister_device()
frees the input device, hence the call to input_free_device()
is a double free. This is also described in comments of
input_unregister_device().
Reorganize the code to avoid a double free.
Change-Id: I7abee3f1ad6c73e1c38aa64e627ffd73f6f9d3b2
Signed-off-by: Mao Li <maol@codeaurora.org>
Mao Li [Thu, 27 Nov 2014 08:43:00 +0000 (03:43 -0500)]
input: ft5x06_ts: add gesture feature support
Focaltech touch controller FT6436 support new feature Screen-off-Gesture.
It is able to turn on the screen by drawing gestures on the touch screen
when the screen is during off status. Enable the FT CTP driver to support
the screen off gesture recognization.
This patch is propagated from msm-3.18 kernel.
'commit
5cc0bff80d65 ("input: ft5x06_ts: add gesture feature support")'
Also cleared the following checkpatch warnings.
- Missing a blank line after declarations
- Missing a blank line after declarations
- Comparisons should place the constant on the right side of the test.
Change-Id: I77d111d3ef800b636a337221d7e605f746a113dd
Signed-off-by: Mao Li <maol@codeaurora.org>
Signed-off-by: Sudhakar Manapati <smanap@codeaurora.org>
Mao Li [Thu, 27 Nov 2014 06:02:04 +0000 (01:02 -0500)]
ARM: dts: msm: correct Focaltech CTP irq flag configuration
Fixed below irq flag issues of Focaltech CTP:
Focaltech CTP firmware generates edge interrupt to MSM, but the
interrupt type in DTSI is level, which will cause CTP interrupt
cannot wake up MSM when system is in deep sleep. Fix this by
setting edge irq flag in DTSI.
For GPIO irq, the irq flag should be specified in "interrupts"
node. Msm_gpio module will only use the lower 8-bit of
"interrupts" node and discards the upper bits. If we specify
0x2002 in "interrupts" node, the upper bits(0x2000) is not used
by msm_gpio, only lower bits(0x2) is used, that means only
lower bits(0x2) should be set in "interrupts" node.
"focaltech,irq-gpio" node is used to specify gpio property,
rather than irq flag. Remove the irq flag setting in this node.
In driver code, specify only "IRQF_ONESHOT". The irq trigger type
is specified by DTSI "interrupts" node. See above.
Change-Id: I4cd8596fb4538b701317f01a6cafaa771041ffdd
Signed-off-by: Mao Li <maol@codeaurora.org>
Hemant Kumar [Tue, 30 Aug 2016 23:54:19 +0000 (16:54 -0700)]
usb: phy: handle phy related regulators properly
Currently driver is enabling all the regulators in probe
even if usb cable is not connected which has power impact.
Hence enable regulators before the phy initialization sequence
and move regulator_set_voltage & enable/disable API for vdd supply
in msm_ssusb_qmp_ldo_enable() to handle all the regulators from one
place.
Change-Id: Ibc4cf8328c209dbf968b7d6c498e1462397be351
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
Prashanth Bhatta [Tue, 30 Aug 2016 22:14:31 +0000 (15:14 -0700)]
icnss: Prevent power collapse during driver probe/remove
Race condition observed during driver probe/remove and
suspend/resume because suspend/resume is not serialized
to work queue. Fix this problem by holding a wake lock
during wlan driver probe/remove to prevent system
suspend/resume.
CRs-Fixed:
1061279
Change-Id: Iad1c9abbdbaea21d4c55d64a6c120d3bcf0df1eb
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
Prashanth Bhatta [Tue, 30 Aug 2016 21:47:59 +0000 (14:47 -0700)]
icnss: Fix logic to wait for WCSS out of retention
WCSS may take upto 400us to get out of retention. Fix the polling
logic to wait for more than 400us before proceeding with the
reset sequence.
Also do not send mode request to firmware during recovery.
CRs-fixed:
1060725
Change-Id: Id19518a12fe8a0acffd725b25dbcb0240bdbf446
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
Sreelakshmi Gownipalli [Tue, 30 Aug 2016 18:08:38 +0000 (11:08 -0700)]
diag: Do not open glink channel twice
When diag receives two link state notifications it tries to
open the glink channel which is already open. Add a check to
not open the channel if the channel is already open.
Change-Id: I5818d2731b53af37d796d421c5ae9a4b7fa52405
Signed-off-by: Sreelakshmi Gownipalli <sgownipa@codeaurora.org>
Bryse Flowers [Fri, 27 May 2016 22:48:38 +0000 (15:48 -0700)]
netfilter: xt_quota2: 3.18 netlink notification fix
Create a virtual device inside of sysfs. Use the created
kobject to notify userspace of counter transitions.
Bug:
24140541
CRs-Fixed:
1008025
Change-Id: I06a02a3e6c70160083e17291cf08f1e9b375a26f
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
Pramod Gurav [Thu, 19 May 2016 13:47:26 +0000 (19:17 +0530)]
tty: serial: msm: Add runtime PM and system sleep support
Add runtime pm and suspend/resume callback support to serial msm
driver so that clock resources are managed runtime to save power.
CRs-Fixed:
1061290
Change-Id: If2004dcf19649f68cc8fbe0506799d3c700293ff
Signed-off-by: Pramod Gurav <gpramod@codeaurora.org>
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
Vamsi Krishna Samavedam [Fri, 26 Aug 2016 17:37:14 +0000 (10:37 -0700)]
ARM: dts: msm: Update qusb2 efuse address for msmcobalt-v2
Efuse parameters are used to update qusb analog tuning values.
Change-Id: I4bc919ba7cf24d73cbc6cac392e00f81005bf64c
Signed-off-by: Vamsi Krishna Samavedam <vskrishn@codeaurora.org>
Vamsi Krishna Samavedam [Thu, 25 Aug 2016 20:57:21 +0000 (13:57 -0700)]
usb: phy: qusb: Update tune1 param from efuse register
Tune1 HSTX_TRIM parameter varies from part to part and needs to
be programmed using fused values. Update the code to read
the efuse register and update tune1 parameter. On previous
platforms this used to be tune2.
Change-Id: I7a2efa3c2409ba5dbb1ae9581738518b9457a971
Signed-off-by: Vamsi Krishna Samavedam <vskrishn@codeaurora.org>
Vamsi Krishna Samavedam [Thu, 25 Aug 2016 06:21:28 +0000 (23:21 -0700)]
ARM: dts: msm: Update qusb2 phy init sequence for msmcobalt v2
Update the sequence to include tune1 and tune2 parameters. While
at it update the comments to include register names.
Change-Id: Ib8ff42a6e05c0065b19e977eb56f6b96a78fcf39
Signed-off-by: Vamsi Krishna Samavedam <vskrishn@codeaurora.org>
Vamsi Krishna Samavedam [Tue, 9 Aug 2016 01:59:34 +0000 (18:59 -0700)]
ARM: dts: msm: Update tcsr_clmap signal for msmcobalt
Update the tcsr_clamp_dig_n signal and phy init sequence
to reduce the random leakage from qusb2 phy. Random leakage
can result from turning on/off analog power rails
before/after digital power rails.
Change-Id: Id51a2d34f61c0a41891551d15b706872abf13809
Signed-off-by: Vamsi Krishna Samavedam <vskrishn@codeaurora.org>
Mohamad Ayyash [Wed, 11 May 2016 20:18:35 +0000 (13:18 -0700)]
Replace %p with %pK to prevent leaking kernel address
BUG:
27532522
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
Git-commit:
066b75616cf93e7c3caa323a372bc22058791bd0
Git-repo: https://android.googlesource.com/kernel/msm
(cherry picked from commit
1ff4ea16e6df22383a7386d3937019deb63c5fdc)
Change-Id: I493d3b27cfeaaf63e3cf584c7048514d4d38905d
Signed-off-by: Ravi Kumar Siddojigari <rsiddoji@codeaurora.org>
Vamsi Krishna Samavedam [Tue, 9 Aug 2016 00:53:48 +0000 (17:53 -0700)]
usb: phy: qusb: Set clamp_dig_n signal based on usb status
Analog and digital power rails connected to the phy can be turned
on/off in any order. This may result in random leakage in the phy
as it expects certain power rails to be on/off in certain order.
Avoid random leakage on qusb2 phy by
1. Disable pll when phy is suspended/disconnected.
2. Reset and assert clamp dig_n signal to put dp/dm lines in high
impedance state.
Change-Id: I1bafa7f824af8bbb3f67a71b81bf23b0a9c7164e
Signed-off-by: Vamsi Krishna Samavedam <vskrishn@codeaurora.org>
Ghanim Fodi [Tue, 30 Aug 2016 16:04:31 +0000 (19:04 +0300)]
msm: ipa3: Fix wrong parameter to xdci release function
xdci release function is called during xdci connect
failure cleanup. A bug passing the tethering protocol
to the function instead of the tethering type caused
it to fail and cease the cleanup operations.
Change-Id: I6337f93c13678c9256dfd46825f9a317cdaa0a1b
CRs-fixed:
1057013
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
Linux Build Service Account [Tue, 30 Aug 2016 12:43:46 +0000 (05:43 -0700)]
Merge "msm: mdss: Fix to validate data copied from user space"
Linux Build Service Account [Tue, 30 Aug 2016 12:43:45 +0000 (05:43 -0700)]
Merge "msm: vidc: Compare ion_handles rather than fds"
Linux Build Service Account [Tue, 30 Aug 2016 12:43:44 +0000 (05:43 -0700)]
Merge "msm: vidc: Amend DCVS condition"
Linux Build Service Account [Tue, 30 Aug 2016 12:43:43 +0000 (05:43 -0700)]
Merge "msm: ipa: WDI2.0: hotspot offload using WDI 2.0 interface"
Linux Build Service Account [Tue, 30 Aug 2016 12:43:43 +0000 (05:43 -0700)]
Merge "msm: kgsl: Change %p to %pK in debug messages"
Ghanim Fodi [Tue, 30 Aug 2016 11:23:08 +0000 (14:23 +0300)]
msm: ipa3: Fix timeout period of IPA resource add dependency
Currently the timeout period of IPA resource add dependency
is HZ jiffies (1 second). We have seen situations
where this timeout period is too small especially on heavy
loaded system with debug log enabled.
Enlarge the period to 5 HZ jiffies.
Change-Id: Ia678276ed1c3c223b1cedd1e6e8713ca06aefd14
CRs-fixed:
1057013
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
Komal Seelam [Tue, 26 Jul 2016 11:28:01 +0000 (16:58 +0530)]
cnss: Reset QCA Card during WLAN SubSystem Recovery
During SSR, we observe cases where card enter bad state
and does not responding to any I/O commands. Fix it by
powering off and on the card.
Change-Id: Ia3ab2781c93d1cfe7427e2b1c2644f6628f6465f
CRs-Fixed:
1058794
Signed-off-by: Komal Seelam <kseelam@codeaurora.org>
Ghanim Fodi [Sun, 28 Aug 2016 18:50:15 +0000 (21:50 +0300)]
msm: ipa3: fix GSI ring DMA allocation parameters
DMA coherent allocation was done with inappropriate
flags causing memory allocation to fail occasionally.
Use GFP_KERNEL flag as well as fix up some cleanup
actions.
CRs-Fixed:
1060305
Change-Id: I93c9340439dd65c50764dd078071bf66f65a9464
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
Harry Yang [Wed, 10 Aug 2016 19:27:28 +0000 (12:27 -0700)]
qcom-charger: introduce step charging
This algorithm allows for programmable charge current values
based on programmable thresholds on state-of-charge (SoC).
Adjusting battery charge current based on the battery SoC
may lead to extended battery capacity over number of charge
cycles.
Charging profile to be used relies on battery characterization
data from battery cell manufacurers.
CRs-Fixed:
1052854
Change-Id: I8844a3e8428b045514863d72c08f6c6b2b2ac2a4
Signed-off-by: Harry Yang <harryy@codeaurora.org>
Linux Build Service Account [Tue, 30 Aug 2016 02:14:23 +0000 (19:14 -0700)]
Merge "scsi: ufs-qcom: skip svs2 configuration for newer controllers"
Linux Build Service Account [Tue, 30 Aug 2016 02:14:22 +0000 (19:14 -0700)]
Merge "mfd: qcom-i2c-pmic: prepare for shared interrupt"
Linux Build Service Account [Tue, 30 Aug 2016 02:14:21 +0000 (19:14 -0700)]
Merge "defconfig: arm64: Add coresight abort support for msmcobalt"
Linux Build Service Account [Tue, 30 Aug 2016 02:14:20 +0000 (19:14 -0700)]
Merge "ARM: dts: msm: add audio codec as child of MSM External display"
Linux Build Service Account [Tue, 30 Aug 2016 02:14:19 +0000 (19:14 -0700)]
Merge "msm: qpnp-haptic: Update function declarations"
David Dai [Fri, 19 Aug 2016 23:17:01 +0000 (16:17 -0700)]
ARM: dts: msm: change ebi buswidth for msmhamster
Change the ddr width from 8 to 4 for msmhamster, due to
ddr width being halved in hardware.
Change-Id: I40f5972be54393813ad04b07c032f494888ad5e8
Signed-off-by: David Dai <daidavid1@codeaurora.org>
JP Abgrall [Sat, 21 Dec 2013 00:51:11 +0000 (16:51 -0800)]
nf: xt_qtaguid: fix handling for cases where tunnels are used.
* fix skb->dev vs par->in/out
When there is some forwarding going on, it introduces extra state
around devs associated with xt_action_param->in/out and sk_buff->dev.
E.g.
par->in and par->out are both set, or
skb->dev and par->out are both set (and different)
This would lead qtaguid to make the wrong assumption about the
direction and update the wrong device stats.
Now we rely more on par->in/out.
* Fix handling when qtaguid is used as "owner"
When qtaguid is used as an owner module, and sk_socket->file is
not there (happens when tunnels are involved), it would
incorrectly do a tag stats update.
* Correct debug messages.
Bug:
11687690
Change-Id: I2b1ff8bd7131969ce9e25f8291d83a6280b3ba7f
CRs-Fixed: 747810
Signed-off-by: JP Abgrall <jpa@google.com>
Git-commit:
2b71479d6f5fe8f33b335f713380f72037244395
Git-repo: https://www.codeaurora.org/cgit/quic/la/kernel/mediatek
[imaund@codeaurora.org: Resolved trivial context conflicts.]
Signed-off-by: Ian Maund <imaund@codeaurora.org>
[bflowers@codeaurora.org: Resolved merge conflicts]
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
Benjamin Chan [Mon, 29 Aug 2016 14:04:22 +0000 (10:04 -0400)]
msm: sde: Fix SMMU fault in SDE rotator for secure playback
When playing secure content, framebuffer is setup as secure in the
rotator. But the sw timestamp is not going through the secure
route, and must clear out the secure setting, otherwise a smmu fault
will be issued. This fix make sure the secure buffer status is
cleared during the sw timestamp submission.
CRs-Fixed:
1059620
Change-Id: Ifb0f9928fa1d948351e6fc1ad925a070a7f50a96
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>
Benjamin Chan [Fri, 19 Aug 2016 03:55:21 +0000 (23:55 -0400)]
msm: sde: Fix SDE rotator driver error handling
Initialize some local variables before using them and safely return an
error code when encounter error cases in the SDE rotator driver.
CRs-Fixed:
1060558
Change-Id: I25406b13ac2007f1789d8d32e428c39dac4c29cf
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>