OSDN Git Service
Linux Build Service Account [Tue, 16 May 2017 13:49:25 +0000 (06:49 -0700)]
Merge "msm: ADSPRPC: verify and initialize some variables"
Linux Build Service Account [Tue, 16 May 2017 13:49:24 +0000 (06:49 -0700)]
Merge "ASoC: wcd: Depend on right config option"
Linux Build Service Account [Tue, 16 May 2017 13:49:24 +0000 (06:49 -0700)]
Merge "memshare: Update the free memory count after allocation"
Linux Build Service Account [Tue, 16 May 2017 13:49:22 +0000 (06:49 -0700)]
Merge "PM/devfreq: bw_hwmon: add mutex lock in polling interval case"
Linux Build Service Account [Tue, 16 May 2017 13:49:21 +0000 (06:49 -0700)]
Merge "qseecom: add bus scaling support for GP operations"
Linux Build Service Account [Tue, 16 May 2017 13:49:19 +0000 (06:49 -0700)]
Merge "ARM: dts: msm: move tdm common prop to parent node"
Linux Build Service Account [Tue, 16 May 2017 13:49:18 +0000 (06:49 -0700)]
Merge "ASoC: msm: qdsp6v2: Add TDM master slave select setting"
Linux Build Service Account [Mon, 15 May 2017 10:51:25 +0000 (03:51 -0700)]
Merge "ARM: dts: msm: Update charging ESR timer value to 96 for PM660 FG"
Linux Build Service Account [Mon, 15 May 2017 10:51:25 +0000 (03:51 -0700)]
Merge "scsi: ufs: Initialize cmd_id and check lrbp->cmd NULL"
Linux Build Service Account [Mon, 15 May 2017 10:51:23 +0000 (03:51 -0700)]
Merge "mmc: mmc: Fix mmc_partial_init for HS400 mode"
Linux Build Service Account [Mon, 15 May 2017 10:51:23 +0000 (03:51 -0700)]
Merge "defconfig: msm: remove dcc config for perf on sdm660"
Linux Build Service Account [Mon, 15 May 2017 10:51:22 +0000 (03:51 -0700)]
Merge "sound: usb: Add default branches for BADD 3.0 devices"
Linux Build Service Account [Mon, 15 May 2017 10:51:21 +0000 (03:51 -0700)]
Merge "media: dvb-core: Fix coding errors in broadcast drivers"
Linux Build Service Account [Mon, 15 May 2017 10:51:20 +0000 (03:51 -0700)]
Merge "defconfig: msmcortex: Cleanup"
Linux Build Service Account [Mon, 15 May 2017 10:51:19 +0000 (03:51 -0700)]
Merge "qpnp-smb2: Add software based glitch filter for OTG detection"
Linux Build Service Account [Mon, 15 May 2017 10:51:18 +0000 (03:51 -0700)]
Merge "dma-mapping: Always remap on dma buffer free"
Linux Build Service Account [Mon, 15 May 2017 10:51:18 +0000 (03:51 -0700)]
Merge "ARM: dts: msm: Update the virtual corner for SDM630"
Linux Build Service Account [Mon, 15 May 2017 10:51:17 +0000 (03:51 -0700)]
Merge "clk: Move vdd voting before set rate and parent"
Linux Build Service Account [Mon, 15 May 2017 10:51:16 +0000 (03:51 -0700)]
Merge "usb: gadget: f_cdev: Increase number of driver instances to 3"
Linux Build Service Account [Mon, 15 May 2017 10:51:15 +0000 (03:51 -0700)]
Merge "msm: camera: isp: Fix excessive logging in w+t"
Anirudh Ghayal [Mon, 15 May 2017 02:52:32 +0000 (08:22 +0530)]
ARM: dts: msm: Update charging ESR timer value to 96 for PM660 FG
Use the same FG ESR timer value (96) for charging and
discharging. This is to avoid the frequent periodic spur
seen in the RF performance with charger connected.
CRs-Fixed:
2046553
Change-Id: I9d1ad61f75f553bf527906715699817236f44b01
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
Udaya Bhaskara Reddy Mallavarapu [Sat, 6 May 2017 13:47:16 +0000 (19:17 +0530)]
media: dvb-core: Fix coding errors in broadcast drivers
Added Check to verify TSPP channel input source is valid.
Initialize return variables to return correct values in fail conditions.
Move deferencing of input pointer arguments after NULL checking.
CR's-Fixed:
2043689
Change-Id: I7febdb0e0f499846cfcf8836ea35c8547a5074fb
Signed-off-by: Udaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org>
Linux Build Service Account [Sat, 13 May 2017 23:25:55 +0000 (16:25 -0700)]
Merge "drm/msm: make msm_drm.h uapi header safe for C++"
Olav Haugan [Wed, 10 May 2017 23:26:38 +0000 (16:26 -0700)]
defconfig: msmcortex: Cleanup
Sync defconfig with make menuconfig output.
Change-Id: Ieefef23fe14676007580c524268ef2a228d38059
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
Stephen Boyd [Thu, 11 May 2017 21:44:43 +0000 (14:44 -0700)]
ASoC: wcd: Depend on right config option
Kconfig doesn't have the CONFIG_ part of the option, so don't use
it here. This fixes a kconfig warning about missing a dependency
for "CONFIG_SPI" which doesn't exist because it's supposed to be
"SPI".
Change-Id: Ie449ff250dd87b0a445d34ee079082c6e91f147c
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Ashay Jaiswal [Wed, 3 May 2017 09:40:25 +0000 (15:10 +0530)]
qpnp-smb2: Add software based glitch filter for OTG detection
When the USB_ID line is pulled low for a very short time there is a
possibility that the SW misses rising edge(removal) event. This may
lead to the state where charger is stuck in the boost-mode forever.
Fix this my adding a SW based glitch logic which checks for the
USB_ID after a SW debounce time and then notifies its presence/removal to
the USB driver.
CRs-Fixed:
2044958
Change-Id: I31974f7d68b435bbef329278cedbd726ada02e3f
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Saranya Chidura [Fri, 12 May 2017 09:55:10 +0000 (15:25 +0530)]
defconfig: msm: remove dcc config for perf on sdm660
remove the DCC_CONFIG option in perf defconfig for SDM660
target.
Change-Id: Id1b019a5eb1c6a71d4b5e6e854e642411714a900
Signed-off-by: Saranya Chidura <schidura@codeaurora.org>
Ritesh Harjani [Mon, 20 Feb 2017 08:20:58 +0000 (13:50 +0530)]
mmc: mmc: Fix mmc_partial_init for HS400 mode
In case of emmc5.0 cards where HS400 mode and CMD5(awake) partial
init is enabled -> mmc_partial_init is broken and gives below errors.
Fix this by adding calibration logic in case of HS400 mode.
NOTE: In HS400 mode tuning is only performed once during bootup (in
HS200 mode).
Post to that it is always DLL calibration which is performed (in
system/runtime resume).
So even for below issue since timing is already changed using
cached_ios, then do the calibration using ->execute_tuning.
<dmesg errors w/o patch>
root@msm8996:/ # [ 76.011036] mmc0: mmc_runtime_suspend:
[ 77.315903] mmc0: mmc_runtime_resume:
[ 77.367866] mmc0: mmc_partial_init: starting partial init
[ 77.376225] mmc0: mmc_test_awake_ext_csd: mmc_get_ext_csd failed
(-110)
[ 77.382190] mmc0: mmc_partial_init: done partial init (-110)
[ 77.387536] mmc0: _mmc_resume: awake failed (-110), fallback to full
init
[ 77.394405] mmc0: mmc_init_card:
[ 77.402762] mmc0: mmc_init_card: mmc_send_op_cond() fails -110
[ 77.407573] mmc0: MMC card re-init failed rc = -110 (retries = 3)
[ 77.507261] mmc0: _mmc_resume: awake failed (-110), fallback to full
init
[ 77.513293] mmc0: mmc_init_card:
<dmesg with patch>
[ 74.002624] mmc0: mmc_runtime_resume:
[ 74.056089] mmc0: mmc_partial_init: starting partial init
[ 74.067143] mmc0: mmc_partial_init: done partial init (0)
Change-Id: I0e55efb7863b75bd584843c3fc920c845996eb5c
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
Ajay Agarwal [Fri, 12 May 2017 06:10:00 +0000 (11:40 +0530)]
sound: usb: Add default branches for BADD 3.0 devices
For a BADD 3.0 device, the Data Endpoint wMaxPacketSize
of an Alt Setting must be one of the values mentioned in
the specifications. Similarly, the unit IDs of the source
units of any entity is prescribed by the specs. Add
support for checking the error(default) branches in the
relevant switch cases and accordingly handle them.
Change-Id: Ib88eee21df012089d41c4e78a161ddc6767e1bd4
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Tharun Kumar Merugu [Fri, 12 May 2017 06:35:11 +0000 (12:05 +0530)]
msm: ADSPRPC: verify and initialize some variables
Verify cid variable before accessing it and
initialize invoket variable before bailing out.
Change-Id: Idec133bf8ba1a000b83f92bb567f0b75bbdab340
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
Manoj Prabhu B [Wed, 10 May 2017 05:31:37 +0000 (11:01 +0530)]
memshare: Update the free memory count after allocation
The patch updates the client's free memory
count variable after the successful allocation.
CRs-Fixed:
2046258
Change-Id: Ibae317596557e23d2b2278daf433bd293a8bd0be
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
Santosh Mardi [Tue, 9 May 2017 05:54:04 +0000 (11:24 +0530)]
PM/devfreq: bw_hwmon: add mutex lock in polling interval case
Protect polling interval update event in the governor
with mutex lock.
This will avoid parallel execution of update interval event
on different cores, resulting in memory poison overwritten.
CRs-Fixed:
2035633
Change-Id: Ib919d9774317bc01e3cf581c169c5d18555f484f
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
Taniya Das [Wed, 10 May 2017 09:53:22 +0000 (15:23 +0530)]
clk: Move vdd voting before set rate and parent
There could be clocks where the clock operations of set_rate_and_parent
would be defined to take care of setting rate and updating parent.
Move the vdd voting logic to ensure the vdd levels are voted prior to
updating rate and parent.
Change-Id: I57f903f95f290627d676afd567a6e6d21decf4a3
Signed-off-by: Taniya Das <tdas@codeaurora.org>
Can Guo [Thu, 11 May 2017 00:46:03 +0000 (08:46 +0800)]
scsi: ufs: Initialize cmd_id and check lrbp->cmd NULL
In commit
d70b0a18f6e5 ("scsi: ufs: add command
logging infrastructure"), cmd_id is not initialized
and lrbp->cmd is explicitly dereferenced without
checking NULL. Fix them by initializing cmd_id with
an initial value 0 and checking NULL for lrbp->cmd.
Change-Id: I6f66066adc8d53e3615df50ac49dd313f6d7ea8e
Signed-off-by: Can Guo <cang@codeaurora.org>
Zhen Kong [Fri, 28 Apr 2017 20:32:32 +0000 (13:32 -0700)]
qseecom: add bus scaling support for GP operations
When a GP application is loaded and the crypto engine is accessed,
a NOC error will happen if CE clock is not enabled. Thus, add bus
scaling support for GP operations.
Change-Id: I59d63be9e08b2c135edc6ec224ec1a355434e1ec
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Linux Build Service Account [Thu, 11 May 2017 18:48:48 +0000 (11:48 -0700)]
Merge "Merge branch 'android-4.4@
9796ea8' into branch 'msm-4.4'"
Linux Build Service Account [Thu, 11 May 2017 18:48:47 +0000 (11:48 -0700)]
Merge "drm/msm: add extern C guard for the UAPI header"
Linux Build Service Account [Thu, 11 May 2017 18:48:46 +0000 (11:48 -0700)]
Merge "input: misc: fix error path for hbtp touch driver"
Linux Build Service Account [Thu, 11 May 2017 18:48:45 +0000 (11:48 -0700)]
Merge "ARM: dts: msm: Add SMB1381 device node for QRD SDM660"
Linux Build Service Account [Thu, 11 May 2017 18:48:44 +0000 (11:48 -0700)]
Merge "diag: Validate proper mdlog session for a PD"
Linux Build Service Account [Thu, 11 May 2017 18:48:43 +0000 (11:48 -0700)]
Merge "ota_crypto: Add NULL pointer check for new_req variable"
Linux Build Service Account [Thu, 11 May 2017 18:48:42 +0000 (11:48 -0700)]
Merge "USB: f_qdss: Fix crash issue during connect_work"
Linux Build Service Account [Thu, 11 May 2017 18:48:41 +0000 (11:48 -0700)]
Merge "soc: qcom: qpnp-haptic: add support for auto mode"
Linux Build Service Account [Thu, 11 May 2017 18:48:40 +0000 (11:48 -0700)]
Merge "scsi: ufs: ufs-qcom-ice: Initialize local variable in ice_cfg_start()"
Linux Build Service Account [Thu, 11 May 2017 18:48:39 +0000 (11:48 -0700)]
Merge "mmc: core: Replacing sprintf() with snprintf()"
Linux Build Service Account [Thu, 11 May 2017 18:48:38 +0000 (11:48 -0700)]
Merge "sound: usb: Fix format desc usage for BADD 3.0 devices"
Linux Build Service Account [Thu, 11 May 2017 18:48:35 +0000 (11:48 -0700)]
Merge "drm/msm: Allocate secure buffer objects"
Hemant Kumar [Tue, 9 May 2017 21:28:59 +0000 (14:28 -0700)]
usb: gadget: f_cdev: Increase number of driver instances to 3
This allows to instantiate two dial up network interfaces and
one NMEA interface.
Change-Id: I59f5d93a5e9360628d8004508162dcdb42f6520d
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
Shiraz Hashim [Thu, 11 May 2017 17:32:47 +0000 (23:02 +0530)]
dma-mapping: Always remap on dma buffer free
DMA clients may opt to clear cpu virtual address mapping
on alloc. On free when dma buffer is given back to cpu,
ensure that it is always remapped in cpu address space.
Change-Id: I67f9616d9bee8cf07cbe81468ebf174d2599f4c5
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
Linux Build Service Account [Thu, 11 May 2017 13:48:13 +0000 (06:48 -0700)]
Merge "mmc: host: sdhci-msm-ice: Initialize local variable in ice_cmdq_cfg()"
Linux Build Service Account [Thu, 11 May 2017 13:48:12 +0000 (06:48 -0700)]
Merge "ath10k: cancel the event work in wlan snoc driver module remove"
Linux Build Service Account [Thu, 11 May 2017 13:48:11 +0000 (06:48 -0700)]
Merge "qseecom: Initialize the hlos_ce_hw_instance array"
Linux Build Service Account [Thu, 11 May 2017 13:48:10 +0000 (06:48 -0700)]
Merge "btfm: Fix coding error with uninitialized variables"
Linux Build Service Account [Thu, 11 May 2017 13:48:08 +0000 (06:48 -0700)]
Merge "input: stm: Fix NULL dereference in laser driver"
Linux Build Service Account [Thu, 11 May 2017 13:48:07 +0000 (06:48 -0700)]
Merge "msm: camera: Fixing NULL dereference in sensor code"
Linux Build Service Account [Thu, 11 May 2017 13:48:06 +0000 (06:48 -0700)]
Merge "ARM: dts: msm: Add support for camss throttle clock on SDM660"
Linux Build Service Account [Thu, 11 May 2017 13:48:05 +0000 (06:48 -0700)]
Merge "msm: isp: Fix pdaf buffer drop"
Linux Build Service Account [Thu, 11 May 2017 13:48:03 +0000 (06:48 -0700)]
Merge "msm: camera: Do not pass kptr in copy_from_user"
Linux Build Service Account [Thu, 11 May 2017 13:48:02 +0000 (06:48 -0700)]
Merge "msm: isp: Fix isp recovery mechanism"
Linux Build Service Account [Thu, 11 May 2017 13:48:01 +0000 (06:48 -0700)]
Merge "msm: isp: Correct UB size for RDI"
Linux Build Service Account [Thu, 11 May 2017 13:48:00 +0000 (06:48 -0700)]
Merge "msm: camera: isp: Vote for bandwidth to avoid race condition"
Linux Build Service Account [Thu, 11 May 2017 13:47:58 +0000 (06:47 -0700)]
Merge "ARM: dts: msm: Add iris support on msm8998 and sdm660"
Linux Build Service Account [Thu, 11 May 2017 13:47:56 +0000 (06:47 -0700)]
Merge "drivers: nfc: make nq-nci probe as async probe"
Linux Build Service Account [Thu, 11 May 2017 13:47:55 +0000 (06:47 -0700)]
Merge "ASoC: wsa881x-analog: make probe as async probes"
Linux Build Service Account [Thu, 11 May 2017 13:47:53 +0000 (06:47 -0700)]
Merge "ASoC: wsa881x-analog: fix overwrite of client->dev->driver_data"
Linux Build Service Account [Thu, 11 May 2017 13:47:51 +0000 (06:47 -0700)]
Merge "mmc: sdhci-msm: make probe as async probe"
Shantanu Jain [Wed, 10 May 2017 09:32:58 +0000 (15:02 +0530)]
input: misc: fix error path for hbtp touch driver
Fix error path for hbtp touch driver where error
variable is not given proper error code while bailing
out from the function.
Change-Id: I56e2654ecffb021a60dd07ea5b5afe45a70a1c85
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Taniya Das [Thu, 11 May 2017 10:29:44 +0000 (15:59 +0530)]
ARM: dts: msm: Update the virtual corner for SDM630
The virtual corner mapping for 2.15GHz for speed-bin-1 was incorrectly
mapped. Update the mapping to reflect the correct corner.
Change-Id: I73b11f7a3a4346fc0118a51032148fad75db40eb
Signed-off-by: Taniya Das <tdas@codeaurora.org>
Manoj Prabhu B [Wed, 10 May 2017 11:06:52 +0000 (16:36 +0530)]
diag: Validate proper mdlog session for a PD
The patch updates the mdlog session to be checked
based on the active user PD logging session.
CRs-Fixed:
2045080
Change-Id: Ieac3301545970aac91efa5a6f66c44530ff251f3
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
Brahmaji K [Fri, 5 May 2017 11:28:52 +0000 (16:58 +0530)]
ota_crypto: Add NULL pointer check for new_req variable
Add NULL pointer check before accessing the new_req
variable.
Change-Id: I8460115ccb16a2c43c45394275e9519ed3c6b045
Signed-off-by: Brahmaji K <bkomma@codeaurora.org>
Linux Build Service Account [Thu, 11 May 2017 06:04:06 +0000 (23:04 -0700)]
Merge "drm/msm/sde: avoid adding plane states in crtc atomic check"
Linux Build Service Account [Thu, 11 May 2017 06:04:06 +0000 (23:04 -0700)]
Merge "defconfig: msmcortex: Disable CONFIG_FORCE_ALLOC_FROM_DMA_ZONE"
Linux Build Service Account [Thu, 11 May 2017 06:04:05 +0000 (23:04 -0700)]
Merge "icnss_utils: replace mutex lock by spinlock"
Linux Build Service Account [Thu, 11 May 2017 06:04:03 +0000 (23:04 -0700)]
Merge "drm: add extern C guard for the UAPI headers"
Linux Build Service Account [Thu, 11 May 2017 06:04:02 +0000 (23:04 -0700)]
Merge "msm: ipa: support aggregated ipa stats query"
Linux Build Service Account [Thu, 11 May 2017 06:04:01 +0000 (23:04 -0700)]
Merge "msm: ADSPRPC: close glink channel before opening again"
Linux Build Service Account [Thu, 11 May 2017 06:04:00 +0000 (23:04 -0700)]
Merge "usb: gadget: f_mtp: Handle OS descriptors properly"
Linux Build Service Account [Thu, 11 May 2017 06:03:59 +0000 (23:03 -0700)]
Merge "drm/msm/sde: move topology name reset to release resources"
Linux Build Service Account [Thu, 11 May 2017 06:03:58 +0000 (23:03 -0700)]
Merge "ASoC: msm: qdsp6v2: Add TrueHD to compressed open"
Linux Build Service Account [Thu, 11 May 2017 06:03:57 +0000 (23:03 -0700)]
Merge "drm/msm: notify hpd status when audio codec is ready"
Linux Build Service Account [Thu, 11 May 2017 06:03:55 +0000 (23:03 -0700)]
Merge "defconfig: msm: Enable CNSS_ASYNC for auto platform"
Linux Build Service Account [Thu, 11 May 2017 06:03:54 +0000 (23:03 -0700)]
Merge "msm: mdss: fix null pointer dereferencing"
Linux Build Service Account [Thu, 11 May 2017 06:03:53 +0000 (23:03 -0700)]
Merge "msm: mdss: set HDMI max TMDS clock rate"
Linux Build Service Account [Thu, 11 May 2017 06:03:52 +0000 (23:03 -0700)]
Merge "ARM64: config: msm: Adding perf defconfig for mediabox"
Linux Build Service Account [Thu, 11 May 2017 06:03:51 +0000 (23:03 -0700)]
Merge "net: wireless: Fix regdb for 60G band"
Linux Build Service Account [Thu, 11 May 2017 06:03:50 +0000 (23:03 -0700)]
Merge "defconfig: msm: Enable OnSemi regulator driver for msm8996-auto"
Linux Build Service Account [Thu, 11 May 2017 06:03:47 +0000 (23:03 -0700)]
Merge "wil6210: fix array out of bounds access in pmc"
Linux Build Service Account [Thu, 11 May 2017 06:03:47 +0000 (23:03 -0700)]
Merge "wil6210: fix check for sparrow D0 FW file"
Linux Build Service Account [Thu, 11 May 2017 06:03:46 +0000 (23:03 -0700)]
Merge "wil6210: support 8KB RX buffers"
Linux Build Service Account [Thu, 11 May 2017 06:03:45 +0000 (23:03 -0700)]
Merge "scsi: ufs: Add states to debug abnormal clocks turn off"
Linux Build Service Account [Thu, 11 May 2017 06:03:44 +0000 (23:03 -0700)]
Merge "input: misc: fix error path for hbtp touch screen driver"
Linux Build Service Account [Thu, 11 May 2017 06:03:43 +0000 (23:03 -0700)]
Merge "power: qpnp-fg-gen3: Disable ESR pulldown for debug battery id"
Linux Build Service Account [Thu, 11 May 2017 06:03:42 +0000 (23:03 -0700)]
Merge "msm: ipa: apply reset wa to GPI channels"
Linux Build Service Account [Thu, 11 May 2017 06:03:41 +0000 (23:03 -0700)]
Merge "memshare: Add guard bytes to avoid access issues"
Linux Build Service Account [Thu, 11 May 2017 06:03:40 +0000 (23:03 -0700)]
Merge "diag: dci: Add protection while querying event status"
Linux Build Service Account [Thu, 11 May 2017 06:03:39 +0000 (23:03 -0700)]
Merge "ASoC: msm: qdsp6v2: clear address on error"
Linux Build Service Account [Thu, 11 May 2017 06:03:37 +0000 (23:03 -0700)]
Merge "ASoC: msm: enhance ADSP Stream Callback"
Linux Build Service Account [Thu, 11 May 2017 06:03:35 +0000 (23:03 -0700)]
Merge "ASoC: msm: qdspv2: Add mixer controls for drift query"
Linux Build Service Account [Thu, 11 May 2017 06:03:34 +0000 (23:03 -0700)]
Merge "ARM: dts: msm: Add GPU speed bin 2 support for MSM8996Pro"
Linux Build Service Account [Thu, 11 May 2017 06:03:33 +0000 (23:03 -0700)]
Merge "Merge branch 'android-4.4@
24ac44d' into branch 'msm-4.4'"