Commit graph

581619 commits

Author SHA1 Message Date
Linux Build Service Account
29226dcba2 Merge "cfg80211: Add feature flag for Fast Initial Link Setup (FILS) as STA" 2017-01-28 00:46:57 -08:00
Linux Build Service Account
8e5d555ab3 Merge "ARM: dts: msm: Resolve TSIF GPIO conflicts for APQ8098" 2017-01-28 00:46:56 -08:00
Linux Build Service Account
b8f01f9bbb Merge "wil6210: bus_request platform operation refinement" 2017-01-28 00:46:55 -08:00
Linux Build Service Account
09d8fbf4fc Merge "msm_11ad: basic support for CPU boost" 2017-01-28 00:46:55 -08:00
Linux Build Service Account
32839a79ed Merge "ARM: dts: msm: Enable home key for qrd sdm660" 2017-01-28 00:46:54 -08:00
Linux Build Service Account
d3ec5fa6cf Merge "defconfig: sdm660: Enable CDSP loader driver" 2017-01-28 00:46:52 -08:00
Linux Build Service Account
c6eacb9bdb Merge "mmc: card: use blk_cleanup_queue() during shutdown/reboot" 2017-01-28 00:46:51 -08:00
Linux Build Service Account
b267f1a21a Merge "defconfig: msm: Enable SCHED_AUTOGROUP for sdm660" 2017-01-28 00:46:50 -08:00
Linux Build Service Account
e30aabb3fc Merge "ARM: dts: msm: Add LAB-IBB/OLEDB support for PM660A" 2017-01-28 00:46:49 -08:00
Linux Build Service Account
f11f069c5f Merge "usb: gadget: f_diag: allocate diag USB channel when not found" 2017-01-28 00:46:48 -08:00
Linux Build Service Account
4e57248b74 Merge "soc: qcom: glink_smem_native_xprt: Do not defer commands indefinitely" 2017-01-28 00:46:47 -08:00
Linux Build Service Account
bc1a162e39 Merge "msm: mdss: fix autorefresh disable sequence" 2017-01-28 00:46:46 -08:00
Linux Build Service Account
36531e80af Merge "msm: mdss: fix secure session validation" 2017-01-28 00:46:45 -08:00
Linux Build Service Account
46b116edc8 Merge "clk: qcom: mdss: add support for MDSS DP PLL for SDM660" 2017-01-28 00:46:32 -08:00
Linux Build Service Account
252a3a5bb6 Merge "msm: mdss: dp: fix HBR2 pattern generation" 2017-01-28 00:46:32 -08:00
Linux Build Service Account
f443e6b380 Merge "msm: mdss: Choose the correct PPB for right only update in non-DSC mode" 2017-01-28 00:46:31 -08:00
Linux Build Service Account
c8ec64b1cd Merge "msm: mdss: fix check for igc read" 2017-01-28 00:46:30 -08:00
Linux Build Service Account
4bab93cb6e Merge "smb-lib: report discharging when charger is absent" 2017-01-28 00:46:29 -08:00
Linux Build Service Account
5b8299671d Merge "msm: ipa3: fix prod drain for WDI 2.0" 2017-01-28 00:46:29 -08:00
Linux Build Service Account
d1fadc9b7d Merge "regulator: qpnp-labibb: fix an out of bounds access" 2017-01-28 00:46:27 -08:00
Linux Build Service Account
fb7f86c7e7 Merge "ARM: dts: msm: Enable camera for sdm630" 2017-01-28 00:46:26 -08:00
Linux Build Service Account
c54d6919bf Merge "ARM: dts: msm: Update the pmic sensor name for MSM8998" 2017-01-28 00:46:25 -08:00
Linux Build Service Account
77bb82db73 Merge "ARM: dts: msm: Csiphy clk muxer changes for SDM660" 2017-01-28 00:46:25 -08:00
Linux Build Service Account
2af6cac21a Merge "msm: camera: isp: Do not halt vfe from tasklet" 2017-01-28 00:46:24 -08:00
Linux Build Service Account
1508c1c08b Merge "msm: camera: fix init pinctrl fail in actuator probe" 2017-01-28 00:46:22 -08:00
Linux Build Service Account
be6930bffd Merge "net: rmnet_data: Disable generic receive offload by default" 2017-01-28 00:46:21 -08:00
Narendra Muppalla
834dfac403 Revert "drm/msm: remove clock framework dependency"
This reverts 'commit 1a35b11b4a ("drm/msm: remove
clock framework dependency")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: I2a1fd46a36613a74ebd4c0471de47ad2c9524d5a
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:54:38 -08:00
Narendra Muppalla
175ad7861a Revert "drm/msm/dsi-staging: add dsi definitions for new dsi driver"
This reverts 'commit 3d589da976 ("drm/msm/dsi-staging:
add dsi definitions for new dsi driver")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: Icd478a54a07f9689dc0110382fd8b5de5c241a49
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:52:37 -08:00
Narendra Muppalla
04fe883b46 Revert "drm/msm/dsi-staging: add hardware driver for dsi phy"
This reverts 'commit 4843e1948f ("drm/msm/dsi-staging:
add hardware driver for dsi phy")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: Ifb18bac24f47a359394fc4d253803a2dd4720de3
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:50:33 -08:00
Narendra Muppalla
17cf4870e3 Revert "drm/msm/dsi-staging: add hardware driver for dsi controller"
This reverts 'commit a47691f8c9 ("drm/msm/dsi-staging:
add hardware driver for dsi controller")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: I8d8f93eef70c9028eb5e31b6b9e280b30a26ad13
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:47:01 -08:00
Narendra Muppalla
df58f3d48c Revert "drm/msm/dsi-staging: add catalog for dsi driver"
This reverts 'commit af5a0d5df1 ("drm/msm/dsi-staging: add
catalog for dsi driver")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: I2069e0f10df0b5f0b89c9d736c9176370b6b9e00
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:45:44 -08:00
Narendra Muppalla
7401b2226b Revert "drm/msm/sde: add driver for sde support"
This reverts 'commit 54a4a3fb41 ("drm/msm/sde: add
driver for sde support")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: Iea6b08608a30979232826efba8fbb2a631d93f83
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:44:38 -08:00
Narendra Muppalla
df131b2a71 Revert "drm/msm: add smmu handler"
This reverts 'commit 29e061e200 ("drm/msm: add smmu handler")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: I65034605b1caefe435a37c6fde78d4c52f3439c3
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:43:29 -08:00
Narendra Muppalla
72e48fcbf8 Revert "drm/msm/sde: add basic sde object enumeration"
This reverts 'commit 815cfffb81 ("drm/msm/sde: add
basic sde object enumeration")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: I5d58276f207485ac8ae80d8619282d2b62c0a695
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:41:26 -08:00
Narendra Muppalla
e62b597893 Revert "drm/msm/sde: add controller instance to INTF block in catalog"
This reverts 'commit 1cab338540 ("drm/msm/sde: add
controller instance to INTF block in catalog")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: Id950e4f131b9330908f65c431fca34cddf96b5ee
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:39:25 -08:00
Narendra Muppalla
ab0bad483d Revert "drm/msm/sde: sde encoder virtualization"
This reverts 'commit a142ec80ca ("drm/msm/sde: sde
encoder virtualization")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: Ida1e127788961e1c9484b0a69695d0ad5391cf88
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:37:43 -08:00
Narendra Muppalla
d85ef1552e Revert "drm/msm/sde: programmable pre-fetch support for video encoders"
This reverts 'commit fe03524bee ("drm/msm/sde: programmable
pre-fetch support for video encoders")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: I978b0248f5e011abbb8cede98a56b3cb558f2d87
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:34:24 -08:00
Narendra Muppalla
036dde397c Revert "drm/msm/sde: move sde encoder to new display interface"
This reverts 'commit 0190e3c975 ("drm/msm/sde: move sde
encoder to new display interface")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: I810da6da7df48bba1df68c81e2843f6597e4ca27
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:32:21 -08:00
Narendra Muppalla
31aa8c6938 Revert "drm/msm/sde: simplify encoder display probe logic"
This reverts 'commit 643f961532 ("drm/msm/sde: simplify
encoder display probe logic")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: I8df181f1e9a7d998aa9f35fbd5154a022d8563db
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:29:44 -08:00
Narendra Muppalla
4267a3a346 Revert "drm/msm/sde: sde hw interrupt handling"
This reverts 'commit d199f38207 ("drm/msm/sde: sde
hw interrupt handling")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: I7235fa269888d72247a3a5aee31b5fde3fb3b8e3
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:27:20 -08:00
Narendra Muppalla
bd3f0788f1 Revert "drm/msm/sde: adding implementation for mdp_top in hw driver"
This reverts 'commit f8846e9345 ("drm/msm/sde: adding
implementation for mdp_top in hw driver")'
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: I39fbad9b113cac96bb523876673787eed121172d
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:24:39 -08:00
Narendra Muppalla
6aeb68e3f4 Revert "drm/msm/sde: add resource manager to enable dual dsi"
This reverts 'commit e14b3005bd ("drm/msm/sde: add
resource manager to enable dual dsi")'.
This is partial change for display drm driver,
that will break drm/sde merge commit.

Change-Id: I2d4f915aa5d3382ce22aa1b4d6e02183ab2f7c5c
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-01-25 17:09:21 -08:00
Rajeev Kumar Sirasanagandla
2700547986 Revert "cfg80211: remove enum ieee80211_band"
This reverts commit ee6143827c ("cfg80211: remove enum ieee80211_band")
which is incomplete cherry-pick of commit 57fbcce37be7
("cfg80211: remove enum ieee80211_band") from
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
and due to which compilation of ath10k module is broken.

Incomplete cherry-pick means not all files of corresponding commit from
opensource repo are pulled.

Conflicts were resolved in drivers/net/wireless/ath/ath10k/htt_rx.c

CRs-Fixed: 1113043
Change-Id: Ie2f95b1524777e8eaf1436ba3e4ab3f9e6b2822e
Signed-off-by: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
2017-01-25 05:12:07 -08:00
Laxminath Kasam
01a680eb49 ARM: dts: msm: Add audio fixes for SDM660
Update internal codec settings for RX/TX devices.
Disable lpass notifier in analog codec driver.
Handle 44.1K support in machine driver to
disable MCLK before request for change in
MCLK frequency.

Change-Id: I5f78f07da46dee0c66e4e374da600e2e5c5d8e21
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-01-25 17:42:05 +05:30
Padmanabhan Komanduru
e2d34afade clk: qcom: mdss: add support for MDSS DP PLL for SDM660
Model and configure MDSS Display Port PLL for SDM660 target.
Add changes to define and register DP VCO, divider and mux clocks
as per common clock infrastructure.

Change-Id: Ice83e21323087e81e2f30998260be85120e41fa8
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
2017-01-25 14:45:26 +05:30
Padmanabhan Komanduru
0ffede8816 clk: qcom: update the clock structures for DP clocks for SDM660
Update the clock names for parents of MDSS display port source
clocks for SDM660. The clock frequencies of DP clocks are
requested by the MDSS display port driver in order of KHz to
avoid integer overflow issues on 32-bit builds. Update the same
for DP clock structures in clock driver.

Change-Id: Ibfdade6f2db5c9ec7a7ff53ba76e6db53e4e605e
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
2017-01-25 14:40:40 +05:30
Santosh Mardi
3d3e9e5885 cpufreq: restore policy min and max freq after hotplug
After hotplug policy max and min should be restored
to the user defined values.

Update to restore the policy min and max values defined
by user before going into hotplug.

Change-Id: I6a87fb7e84fae647e76e65734c7e1e9b498f82e3
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2017-01-25 10:29:47 +05:30
Subbaraman Narayanamurthy
7189487770 ARM: dts: msm: update battery profiles for GEN3 FG
Update the battery profiles for ascent, itech and st1031ga
batteries that are used with 8998 platforms as per the recent
characterized profile data.

Change-Id: I8dda10320f216e8fe40fda405817c1afc3b436de
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-01-24 20:46:54 -08:00
Subbaraman Narayanamurthy
7d937eff0e ARM: dts: msm: add batterydata to pmi8998 FG for msm8998 MTP and QRD
Add batterydata phandle to pmi8998 FG device so that it can be
used for obtaining the battery profiles that is required for
msm8998 MTP and QRD platforms.

Change-Id: I2255cd6475f3e49394cbdf3dd4594cb96fd70c31
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-01-24 20:46:53 -08:00
Taniya Das
807c806fa8 clk: qcom: Fix uninitialized variable and null pointer exception
Initialize the variables before their usage and add null pointer checks
before dereferencing pointers.

Change-Id: Ibe4140c6e0aa25c37583e6e5e6e2331d86f389aa
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2017-01-25 10:00:36 +05:30