Commit graph

590391 commits

Author SHA1 Message Date
Linux Build Service Account
61a82b2a3f Merge "msm: cec: Use CEC notifier framework in adapter driver" 2017-06-06 21:33:09 -07:00
Linux Build Service Account
fc6bb14548 Merge "fbdev: core: Initialise structure to prevent kernel information leak" 2017-06-06 21:33:08 -07:00
Linux Build Service Account
fb0ac8cd2b Merge "hrtimer: Don't drop the base lock when migration during isolation" 2017-06-06 21:33:06 -07:00
Linux Build Service Account
ccf240d7b7 Merge "msm: camera: isp: Disable SMMU stall upon VFE page fault" 2017-06-06 21:33:05 -07:00
Linux Build Service Account
c588e27b98 Merge "msm: camera: Prevent info leak in kernel driver." 2017-06-06 21:33:04 -07:00
Linux Build Service Account
412bca522f Merge "msm: camera: isp: Avoid information leak in ISPIF" 2017-06-06 21:33:04 -07:00
Linux Build Service Account
e5f02a0e83 Merge "ARM: dts: msm: Add cpp micro reset flag for SDM630" 2017-06-06 21:33:02 -07:00
Linux Build Service Account
ccde34ffb3 Merge "spcom: move SPCOM_MAX_CHANNELS define to uapi/linux/spcom.h" 2017-06-06 13:21:57 -07:00
Linux Build Service Account
f96ac4e094 Merge "mmc: debugfs: fix unclocked register access by force_error" 2017-06-06 13:21:57 -07:00
Linux Build Service Account
952a3f35ab Merge "ASoC: msm8998: fix clock refcount for MI2S/AUXPCM shutdown" 2017-06-06 13:21:54 -07:00
Linux Build Service Account
f7346af205 Merge "ASoC: msm: return the latest app type cfg data set when get is called" 2017-06-06 13:21:53 -07:00
Linux Build Service Account
9a3e66cffb Merge "Revert "ASoC: wcd9335: enable APC in Tx path"" 2017-06-06 13:21:51 -07:00
Linux Build Service Account
43f1e336c2 Merge "smb-lib: clear EXIT_SNK_BASED_ON_CC BIT after cable removal" 2017-06-06 13:21:50 -07:00
Linux Build Service Account
1d5844ba9d Merge "sched: hmp: Optimize cycle counter reads" 2017-06-06 13:21:50 -07:00
Linux Build Service Account
2d08b001ac Merge "battery: remove 20ms delay for running AICL" 2017-06-06 13:21:49 -07:00
Linux Build Service Account
6ed51e0bab Merge "sched: Don't active migrate tasks to CPUs in the same cluster" 2017-06-06 13:21:48 -07:00
Linux Build Service Account
e227c0d7c3 Merge "smb-lib: change debounce time to 20mS while in pr_swap" 2017-06-06 13:21:47 -07:00
Linux Build Service Account
dbc81522c3 Merge "power: qcom: smb-lib: check for USB removal after legacy WA" 2017-06-06 13:21:46 -07:00
Linux Build Service Account
56f84db22e Merge "mhi: core: Using usleep_range instead of msleep for sleep" 2017-06-06 13:21:45 -07:00
Linux Build Service Account
6ce38a9691 Merge "drm/msm: Separate locking of buffer resources from struct_mutex" 2017-06-06 13:21:43 -07:00
Linux Build Service Account
7ceaecca8a Merge "qseecom: fix listener unregistration issue" 2017-06-06 13:21:42 -07:00
Linux Build Service Account
3109a13038 Merge "ARM: dts: msm: Fix panel roi alignment on msm8998" 2017-06-06 13:21:41 -07:00
Linux Build Service Account
be68a3874e Merge "phy: qcom-ufs-qmp-v3: fix UFS NOP Timeout" 2017-06-06 13:21:40 -07:00
Linux Build Service Account
0d1b465cb8 Merge "sched: Fix load tracking bug to avoid adding phantom task demand" 2017-06-06 13:21:39 -07:00
Linux Build Service Account
1d0af2abf0 Merge "wil6210: support devices with different PCIe bar size" 2017-06-06 13:21:38 -07:00
Linux Build Service Account
3eb3dbc346 Merge "ARM: dts: msm: Enable DRD mode for 2nd USB controller on MSM8996 Auto" 2017-06-06 13:21:37 -07:00
Linux Build Service Account
37bca2d337 Merge "msm: camera: isp: Add bound check for an array" 2017-06-06 13:21:36 -07:00
Linux Build Service Account
f846530324 Merge "Revert "defconfig: msmcortex_mediabox: Disable MODULE_SIG"" 2017-06-06 13:21:35 -07:00
Amir Samuelov
5b99a712e5 spcom: move SPCOM_MAX_CHANNELS define to uapi/linux/spcom.h
Move SPCOM_MAX_CHANNELS to common H file to make sure that kernel spcom
driver and user space spcomlib library are synced.

Change-Id: I5e19f8def7de755fa89b6a5c67e9d3372f8433f1
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
2017-06-06 00:49:08 -07:00
Ray Zhang
806fdaa479 msm: cec: Use CEC notifier framework in adapter driver
Enable CEC notifier support in CEC adapter driver, so the
adapter could get notification whenever physical address
is available. This removes the requirement for userspace
to manually set physical address.

CRs-Fixed: 2041335
Change-Id: I337c189d625922391374d3cdeb1f2840ad829cd7
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-06-06 09:54:25 +08:00
Can Guo
20e817d30c mmc: debugfs: fix unclocked register access by force_error
When echo values to debugfs entry force_error, unclocked
register access error would be detected. This change fixes
it by making sure the host is powered up and host clock is
ticking before access force event register for error
interrupt status.

Change-Id: I995523d64de36cd4872209db4a558aa83103fbb3
Signed-off-by: Can Guo <cang@codeaurora.org>
2017-06-06 09:39:30 +08:00
Abhijeet Dharmapurikar
f59ca29be6 smb-lib: clear EXIT_SNK_BASED_ON_CC BIT after cable removal
EXIT_SNK_BASED_ON_CC bit is only to be used while we are in hard
reset. There is a possibility for that bit to remain set if
cable were removed while a hard reset was in progress.

Clear that bit in removal path

Change-Id: I5e0776de9322a8015f851312df51a202e35c7a78
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-06-05 17:33:35 -07:00
Ray Zhang
dd943e28df drm/msm: add CEC notifier support for HDMI driver
Add CEC notifier support which allows HDMI driver to
inform CEC driver with the new physical address. With
this information the CEC adapter driver does not need
to manually set the physical address from userspace.

CRs-Fixed: 2041335
Change-Id: I5b5707ad40ee381b5cd67f1e89f0d2397a9a7bb2
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-06-05 05:46:30 -07:00
Hans Verkuil
6baa8d9364 [media] cec: integrate CEC notifier support
Support the CEC notifier framework, simplifying drivers that
depend on this.

Change-Id: I911181db4dc082befa625ce0acc3993ff6f3a1a3
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Git-commit: e3a93adcc4f6c3b538f3d617fc48a87979d4548b
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-06-05 05:46:11 -07:00
Hans Verkuil
e1dd2d127f [media] media: add CEC notifier support
Add support for CEC notifiers, which is used to convey CEC physical address
information from video drivers to their CEC counterpart driver(s).

Based on an earlier version from Russell King:

https://patchwork.kernel.org/patch/9277043/

The cec_notifier is a reference counted object containing the CEC physical address
state of a video device.

When a new notifier is registered the current state will be reported to
that notifier at registration time.

Change-Id: I00697db780b127a52512a6e55cabac745d8ebfa3
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Git-commit: 6917a7b774133d60e0cfd8f9ac8bb62ae6ba10aa
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
[rayz@codeaurora.org: resolve merge conflicts by discarding the MAINTAINERS
 change.]
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-06-05 05:45:08 -07:00
Ray Zhang
4c217da22e defconfig: enable cec adapter driver in mediabox
Enable CEC adapter driver in mediabox config. This is required
to support HDMI CEC functionality.

CRs-Fixed: 2041335
Change-Id: I006ccd85a6467841c32343372d83771482d0efcd
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-06-05 20:39:31 +08:00
Linux Build Service Account
2bfc0eda7e Merge "iommu/arm-smmu: Add support for regulator deferred disable" 2017-06-05 04:34:46 -07:00
Linux Build Service Account
cf5733cad6 Merge "msm: vidc: Copy user buffers to kernel memory before access" 2017-06-05 04:34:45 -07:00
Linux Build Service Account
5b46d743ad Merge "msm: vidc: Add state checks for start streaming" 2017-06-05 04:34:44 -07:00
Linux Build Service Account
b22aa20214 Merge "msm: vidc: Update matrix coefficient values" 2017-06-05 04:34:43 -07:00
Linux Build Service Account
059fd2cf8c Merge "msm: vidc: Update VB2 buffer state during stream_on failure" 2017-06-05 04:34:41 -07:00
Linux Build Service Account
fdc3087c00 Merge "msm: vidc: Call vb2_queue_release before destroying reg_buf lock" 2017-06-05 04:34:40 -07:00
Linux Build Service Account
03e51c169a Merge "msm: vidc: Check presence of property before calling cx register" 2017-06-05 04:34:39 -07:00
Linux Build Service Account
53a8c2aba3 Merge "msm: cec: Add CEC adapter driver for SDE hardware" 2017-06-05 04:34:38 -07:00
Linux Build Service Account
21852febc3 Merge "mhi: mhi_uci: Create char dev only after PCIe device ID is known" 2017-06-05 04:34:36 -07:00
Linux Build Service Account
1ef397af3d Merge "mhi: core: Bind devices with variable PCIe device IDs with same device node" 2017-06-05 04:34:35 -07:00
Linux Build Service Account
3ae760a4bb Merge "ARM: dts: msm: Disable neutrino reset GPIO at bootup on msm8996" 2017-06-05 04:34:35 -07:00
Linux Build Service Account
c403d314f9 Merge "msm: ipa3: Fix to add check for dma_map_single return values" 2017-06-05 04:34:33 -07:00
Linux Build Service Account
bf0ca14023 Merge "regulator: qpnp: check min/max voltages against HW configuration" 2017-06-05 04:34:32 -07:00
Animesh Kishore
f46a723774 ARM: dts: msm: Fix panel roi alignment on msm8998
Align partial update roi start and height to 256 pixels
for nt35597 panel.

Change-Id: I56e78d1adab769c4d226d88cfb5badcfe7eb6dc2
Signed-off-by: Animesh Kishore <animeshk@codeaurora.org>
2017-06-05 16:50:47 +05:30