OSDN Git Service
Subash Abhinov Kasiviswanathan [Wed, 20 Jul 2016 23:25:30 +0000 (17:25 -0600)]
net: Revert upstream changes which break routing in tunnel scenarios
This reverts the following -
commit
f1900fb5eca2cf9 ("net: Really fix vti6 with oif in dst
lookups")
'commit
4148987a5111b0c ("net: Fix vti use case with oif in dst
lookups for IPv6")
commit
42a7b32b73d6bf2 ("xfrm: Add oif to dst lookups")
Routing in tunneled scenarios are completely broken due to these
upstream commits. Revert these changes as a workaround till a
solution is determined internally and is accepted upstream.
CRs-Fixed:
1039009
Change-Id: I4e02573bc6dadf8d1a2ce50313e6d0c6e6a0e599
Acked-by: Abhinav Kannan <kannana@qti.qualcomm.com>
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Linux Build Service Account [Wed, 20 Jul 2016 15:07:33 +0000 (08:07 -0700)]
Merge "soc: qcom: code cleanup for service-locator"
Linux Build Service Account [Wed, 20 Jul 2016 15:07:32 +0000 (08:07 -0700)]
Merge "msm: vidc: Increase output port buffer size for VP9 decode"
Linux Build Service Account [Wed, 20 Jul 2016 15:07:31 +0000 (08:07 -0700)]
Merge "wcnss: Avoid user buffer overloading for write cal data"
Linux Build Service Account [Wed, 20 Jul 2016 15:07:30 +0000 (08:07 -0700)]
Merge "ARM: dts: msm: add gpio controller node for msmcobalt"
Linux Build Service Account [Wed, 20 Jul 2016 15:07:27 +0000 (08:07 -0700)]
Merge "qcom-charger: smb138x-charger: change power supply type to usb parallel"
Linux Build Service Account [Wed, 20 Jul 2016 15:07:26 +0000 (08:07 -0700)]
Merge "ARM: dts: msm: update min voltage for pmcobalt s5 and s7"
Linux Build Service Account [Wed, 20 Jul 2016 15:07:25 +0000 (08:07 -0700)]
Merge "ARM: dts: msm: add ion heaps for msmfalcon"
Linux Build Service Account [Wed, 20 Jul 2016 15:07:25 +0000 (08:07 -0700)]
Merge "ARM: dts: msm: Add initial memory map for msmfalcon"
Anand Kumar [Tue, 21 Jun 2016 12:06:05 +0000 (17:36 +0530)]
wcnss: Avoid user buffer overloading for write cal data
compare size of allocated cal data buffer from heap
and count bytes provided to write by user to avoid
heap overflow for write cal data.
Change-Id: Id70c3230f761385489e5e94c613f4519239dfb1f
CRs-Fixed:
1032174
Signed-off-by: Anand Kumar <anandkumar@codeaurora.org>
Yeleswarapu Nagaradhesh [Tue, 21 Jun 2016 22:34:54 +0000 (04:04 +0530)]
ARM: dts: msm: add gpio controller node for msmcobalt
WCD934X audio codec has GPIO controller and hence add
pinctrl node for WCD934X pinctrl driver. Change WSA GPIO's
to codec GPIO's.
CRs-Fixed:
1041199
Change-Id: I0f04c08587f080eb2df7341d41344ce2079de21b
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
Yeleswarapu Nagaradhesh [Tue, 19 Jul 2016 18:16:34 +0000 (23:46 +0530)]
ASoC: wcd9335: add all child devices of codec
New codec child nodes are added to handle wsa881x
enable pin. Add all the child devices of codec.
CRs-Fixed:
1041199
Change-Id: I889922a0c36ec80ee6ede95b2f19f80791323332
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
Linux Build Service Account [Wed, 20 Jul 2016 01:48:00 +0000 (18:48 -0700)]
Merge "msm: vidc: Add support for setting packed QP range"
Linux Build Service Account [Wed, 20 Jul 2016 01:47:59 +0000 (18:47 -0700)]
Merge "qcom: wcd934x: add pinctrl driver for wcd934x"
Linux Build Service Account [Wed, 20 Jul 2016 01:47:58 +0000 (18:47 -0700)]
Merge "NFC: Fix crash due to invalid use of ese gpio"
Linux Build Service Account [Wed, 20 Jul 2016 01:47:58 +0000 (18:47 -0700)]
Merge "msm: vidc: check for venus_hfi_device state in resume"
Linux Build Service Account [Wed, 20 Jul 2016 01:47:57 +0000 (18:47 -0700)]
Merge "msm: camera: ispif: RDI Pack mode support"
Linux Build Service Account [Wed, 20 Jul 2016 01:47:56 +0000 (18:47 -0700)]
Merge "sched/core: Fix uninitialized variable used for tracepoint"
Linux Build Service Account [Wed, 20 Jul 2016 01:47:55 +0000 (18:47 -0700)]
Merge "sched/core: Fix null-pointer dereference"
Linux Build Service Account [Wed, 20 Jul 2016 01:47:54 +0000 (18:47 -0700)]
Merge "ARM: dts: msm: Remove SMD device for DSPS edge for MSMCOBALT"
Linux Build Service Account [Wed, 20 Jul 2016 01:47:54 +0000 (18:47 -0700)]
Merge "ARM: dts: msm: Remove SMD device for ADSP edge for MSMCOBALT"
Linux Build Service Account [Wed, 20 Jul 2016 01:47:53 +0000 (18:47 -0700)]
Merge "ARM: dts: msm: Remove SMD device for Modem edge for MSMCOBALT"
Linux Build Service Account [Wed, 20 Jul 2016 01:47:51 +0000 (18:47 -0700)]
Merge "WLAN subsystem: Sysctl support for key TCP/IP parameters"
Puja Gupta [Wed, 22 Jun 2016 00:20:36 +0000 (17:20 -0700)]
soc: qcom: code cleanup for service-locator
Module parameter already exists to control enabling service-locator,
which is enabled by default using kernel command line. Hence removing
sysfs entry 'service_locator_status'.
CRs-Fixed:
1025447
Change-Id: Ie302e79ff838837f214ac50ebfaa6e11f0055915
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
Nicholas Troast [Tue, 19 Jul 2016 16:09:12 +0000 (09:09 -0700)]
qcom-charger: smb138x-charger: change power supply type to usb parallel
Currently the type of the parallel power supply is
POWER_SUPPLY_TYPE_BATTERY. Change it to POWER_SUPPLY_TYPE_USB_PARALLEL.
Change-Id: Ic7652e43781f39d3137fb55f2fec2423e457fac4
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Nicholas Troast [Mon, 11 Jul 2016 16:05:26 +0000 (09:05 -0700)]
ARM: dts: msm: update min voltage for pmcobalt s5 and s7
PMCOBALT S5 is an always on regulator that sources the internal
infrastructure for XO. It's minimum operating voltage is 1904 mV.
PMCOBALT S7 has a 900 mV minimum operating voltage.
Update the minimum voltage for PMCOBALT S5 and S7.
Change-Id: I4ec609b45f5313d7c19ff6201742b0c5daf54174
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Linux Build Service Account [Tue, 19 Jul 2016 10:39:58 +0000 (03:39 -0700)]
Merge "ASoC: msm: Add support for 192KHZ sampling rate on mi2s rx ports"
Linux Build Service Account [Tue, 19 Jul 2016 10:39:57 +0000 (03:39 -0700)]
Merge "ASoC: msm: Implementing Tx mute in ASM loopback"
Deepak Kushwah [Tue, 28 Jun 2016 06:15:39 +0000 (11:45 +0530)]
msm: vidc: Add support for setting packed QP range
Add support for setting packed QP range for clients
to set different QP Range for I, P, B frames.
CRs-Fixed:
1043369
Change-Id: I3765506f1d703f47e481719296ab890b1f3dc106
Signed-off-by: Deepak Kushwah <dkushwah@codeaurora.org>
Deepak Kushwah [Wed, 29 Jun 2016 07:23:58 +0000 (12:53 +0530)]
msm: vidc: add support for maximum bitrate rate control mode
Add support for maximum bitrate rate control mode which will be
enabled by low bitrate applications to get better Video quality.
CRs-Fixed:
1043369
Change-Id: I20253a0f0762982fe7d7cb0bde9f64f58a8068fb
Signed-off-by: Deepak Kushwah <dkushwah@codeaurora.org>
Yeleswarapu Nagaradhesh [Tue, 19 Jul 2016 00:27:18 +0000 (05:57 +0530)]
qcom: wcd934x: add pinctrl driver for wcd934x
WCD934X audio codec has a GPIO controller which can support
5 GPIO's, add pinctrl driver to handle GPIO's of wcd934x.
CRs-Fixed:
1041199
Change-Id: I0489f9149cfd6ec7af056d074cb1869a705f9eff
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
Yeleswarapu Nagaradhesh [Tue, 21 Jun 2016 19:20:34 +0000 (00:50 +0530)]
ARM: dts: msm: add sound node for msmcobalt
Add sound node and lnbbclk2 node for msmcobalt
to enable audio functionality.
CRs-Fixed:
1041199
Change-Id: If6066a42b8aa5a820263a88627e2405df5e227b7
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
Abdulla Anam [Mon, 11 Jul 2016 15:05:09 +0000 (20:35 +0530)]
msm: vidc: check for venus_hfi_device state in resume
Now since resume is called to ensure venus is in power on state
during scale clocks, an issue is seen when client responds to an
error notification with stream_off. This causes scale clocks to
be called which powers_on venus and enable regulators. But an
earlier sys_error deinited all resources and hence a null pointer
exception is seen causing kernel panic.
CRs-Fixed:
1040026
Change-Id: Ibb660397f8e7e3e0cd0a5e672924925e605b2eb7
Signed-off-by: Abdulla Anam <abdullahanam@codeaurora.org>
Chinmay Sawarkar [Thu, 31 Mar 2016 23:10:38 +0000 (16:10 -0700)]
msm: vidc: Increase output port buffer size for VP9 decode
For some VP9 Decode bitstreams, current buffer size is not
sufficient. Hence increasing to the full YUV size supported
by HW.
CRs-Fixed: 986311
Change-Id: Ie7720001edbbaed8b202655445707b2b49a69cb1
Signed-off-by: Chinmay Sawarkar <chinmays@codeaurora.org>
Linux Build Service Account [Mon, 18 Jul 2016 20:05:23 +0000 (13:05 -0700)]
Merge "ASoC: aud-ext-clk: enable lnbbclk2 for tavil"
Linux Build Service Account [Mon, 18 Jul 2016 20:05:20 +0000 (13:05 -0700)]
Merge "ASoC: wcd934x: enable recording for wcd934x audio codec"
Linux Build Service Account [Mon, 18 Jul 2016 20:05:19 +0000 (13:05 -0700)]
Merge "ASoC: wcd934x: add wcd934x audio codec driver"
Linux Build Service Account [Mon, 18 Jul 2016 15:07:53 +0000 (08:07 -0700)]
Merge "clk: msm: Add MSM clock config for MSM clock controller"
Shiraz Hashim [Wed, 13 Jul 2016 07:18:44 +0000 (12:48 +0530)]
ARM: dts: msm: add ion heaps for msmfalcon
Add device tree configuration corresponding to all
supported ion heaps for msmfalcon.
Change-Id: I639e8bfb1275a1b8c8fa5bff3a46f9b34fe49ffe
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
Shiraz Hashim [Fri, 8 Jul 2016 04:41:40 +0000 (10:11 +0530)]
ARM: dts: msm: Add initial memory map for msmfalcon
Add carve-outs, firmware regions and other cma areas as
part of initial memory map configuration for msmfalcon.
Change-Id: I2b0d35bf90b92f7fbd4256f339c1567d539e17b2
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
Yeleswarapu Nagaradhesh [Tue, 12 Jul 2016 01:43:27 +0000 (07:13 +0530)]
ASoC: wcd934x: enable recording for wcd934x audio codec
Add support for Analog MIC and Digital MIC recording
for wcd934x codec.
CRs-Fixed:
1041199
Change-Id: I79e07682661fea99baaa29f8807eaf2f684f65be
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
Linux Build Service Account [Sat, 16 Jul 2016 23:26:57 +0000 (16:26 -0700)]
Merge "clk: msm: clock-gcc-cobalt: Remove support for gcc_bimc_hmss_axi_clk"
Linux Build Service Account [Sat, 16 Jul 2016 23:26:56 +0000 (16:26 -0700)]
Merge "qcom-charger: update parallel charging states after boot"
Olav Haugan [Sat, 16 Jul 2016 18:31:24 +0000 (11:31 -0700)]
sched/core: Fix uninitialized variable used for tracepoint
When predictive dcvs is enabled a tracepoint will log a value that is
garbage due to being uninitialized. Fix this.
CRs-fixed:
1042660
Change-Id: I2b94e78f2470dbc2fd469b5cab287d643e8f3227
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
Olav Haugan [Sat, 16 Jul 2016 17:39:06 +0000 (10:39 -0700)]
sched/core: Fix null-pointer dereference
Turning on sched_use_pelt causes a null-pointer dereference in
scheduler. Add correct checking of varable.
CRs-fixed:
1042656
Change-Id: I6e6a57e24b41e4b3d049bfcf694b9ad7e2144dd5
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
Linux Build Service Account [Sat, 16 Jul 2016 14:34:17 +0000 (07:34 -0700)]
Merge "ASoC: msm: qdsp6v2: Increase PCM capture period size"
Linux Build Service Account [Sat, 16 Jul 2016 14:34:16 +0000 (07:34 -0700)]
Merge "ARM: dts: msm: Add Temperature sensor support for msmfalcon"
Linux Build Service Account [Sat, 16 Jul 2016 14:34:16 +0000 (07:34 -0700)]
Merge "thermal: tsens: Enable TSENS for msmfalcon"
Linux Build Service Account [Sat, 16 Jul 2016 14:34:15 +0000 (07:34 -0700)]
Merge "drivers: mfd: do not modify reset gpio if codec is identified"
Linux Build Service Account [Sat, 16 Jul 2016 14:34:14 +0000 (07:34 -0700)]
Merge "ASoC: wcd9335: Update decimator filter cutoff frequency"
Linux Build Service Account [Sat, 16 Jul 2016 14:34:13 +0000 (07:34 -0700)]
Merge "defconfig: msm: build dtb appended zImage for msmfalcon"
Linux Build Service Account [Sat, 16 Jul 2016 14:34:12 +0000 (07:34 -0700)]
Merge "arch: arm: select ARM_GIC even for targets with gic-v3"
Linux Build Service Account [Sat, 16 Jul 2016 14:34:11 +0000 (07:34 -0700)]
Merge "clk: Add support to set custom flags with clk_set_flags"
Linux Build Service Account [Sat, 16 Jul 2016 14:34:11 +0000 (07:34 -0700)]
Merge "msm: pcie: change the logging type for dumping PARF registers"
Linux Build Service Account [Sat, 16 Jul 2016 03:03:32 +0000 (20:03 -0700)]
Merge "ARM: dts: msm: peripheral_mem carveout for msmcobalt"
Yeleswarapu Nagaradhesh [Wed, 29 Jun 2016 01:47:52 +0000 (18:47 -0700)]
ASoC: aud-ext-clk: enable lnbbclk2 for tavil
Tavil is sourced from lnbbclk2 and hence enable
this clock for tavil codec.
CRs-Fixed:
1041199
Change-Id: I5409b0f4ed58fefdd25abbe79f144de7e693c1a1
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
Yeleswarapu Nagaradhesh [Wed, 13 Jul 2016 19:47:05 +0000 (01:17 +0530)]
ASoC: wcd9xxx: add support for wcd934x codec
Add wcd934x as a mfd child and configure regmap.
Configure MCLK as per the HW sequence.
CRs-Fixed:
1041199
Change-Id: I9e2dbb0f0acaa1442c1624556bc52abf98158c92
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
Yeleswarapu Nagaradhesh [Wed, 13 Jul 2016 22:16:36 +0000 (03:46 +0530)]
ASoC: msm: add support for wcd934x
Add support for wcd934x codec in machine
driver.
CRs-Fixed:
1041199
Change-Id: I98bbd10cc25e11f0411c94a4fdbedebc1ab56429
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
Yeleswarapu Nagaradhesh [Mon, 11 Jul 2016 18:24:17 +0000 (23:54 +0530)]
defconfig: arm64: msmcortex: enable wcd934x for msmcobalt
Enable wcd934x audio codec for msmcobalt platform.
CRs-Fixed:
1041199
Change-Id: I71d868703091821c76638da0abfa07f3bb043d82
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
Yeleswarapu Nagaradhesh [Wed, 13 Jul 2016 19:44:56 +0000 (01:14 +0530)]
ASoC: wcd934x: add wcd934x audio codec driver
Add changes to support wcd934x audio codec.
This driver registers to ALSA framework, supports
basic codec operations like playback and record.
CRs-Fixed:
1041199
Change-Id: I62c53d98b6cd8e750a040f692b164b9bfcf44799
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
Chris Lew [Tue, 5 Jul 2016 22:12:28 +0000 (15:12 -0700)]
ARM: dts: msm: Remove SMD device for DSPS edge for MSMCOBALT
SMD clients for DSPS have migrated to G-Link.
Remove SMD device for DSPS edge.
CRs-Fixed:
1041462
Change-Id: I9f62cc0e8229b86500fa72908be5c503847aed8f
Signed-off-by: Chris Lew <clew@codeaurora.org>
Chris Lew [Tue, 5 Jul 2016 22:11:27 +0000 (15:11 -0700)]
ARM: dts: msm: Remove SMD device for ADSP edge for MSMCOBALT
SMD clients for ADSP have migrated to G-Link.
Remove SMD device for ADSP edge.
CRs-Fixed:
1041461
Change-Id: I299d31569291e90431802059f727a57ea0f76200
Signed-off-by: Chris Lew <clew@codeaurora.org>
Chris Lew [Tue, 5 Jul 2016 22:09:57 +0000 (15:09 -0700)]
ARM: dts: msm: Remove SMD device for Modem edge for MSMCOBALT
SMD clients for Modem have migrated to G-Link.
Remove SMD device for Modem edge.
CRs-Fixed:
1041459
Change-Id: I6122ceb014f70b8e0ac005bc3789fbd13a3e867a
Signed-off-by: Chris Lew <clew@codeaurora.org>
Linux Build Service Account [Fri, 15 Jul 2016 21:34:47 +0000 (14:34 -0700)]
Merge "ARM: dts: msm: Increase ADSP ion heap by 4 MB for msmcobalt"
Linux Build Service Account [Fri, 15 Jul 2016 21:34:47 +0000 (14:34 -0700)]
Merge "msm: camera: Fix memory read by adding bounds check"
Linux Build Service Account [Fri, 15 Jul 2016 21:34:45 +0000 (14:34 -0700)]
Merge "usb: pd: pdphy: Assign __pdphy before usbpd_create()"
Linux Build Service Account [Fri, 15 Jul 2016 21:34:34 +0000 (14:34 -0700)]
Merge "irq-chip: gic-v3: Initialize mpm for GIC monitored interrupts"
Linux Build Service Account [Fri, 15 Jul 2016 21:34:22 +0000 (14:34 -0700)]
Merge "spmi: spmi-pmic-arb: enable the SPMI interrupt as a wakeup source"
Ravi Joshi [Thu, 19 Dec 2013 00:14:15 +0000 (16:14 -0800)]
WLAN subsystem: Sysctl support for key TCP/IP parameters
It has been observed that default values for some of key tcp/ip
parameters are affecting the tput/performance of the system. Hence
extending configuration capabilities to TCP/Ip stack through
sysctl interface
Change-Id: I4287e9103769535f43e0934bac08435a524ee6a4
CRs-Fixed: 507581
Signed-off-by: Ravi Joshi <ravij@codeaurora.org>
Signed-off-by: Ganesh Babu Kumaravel <kganesh@codeaurora.org>
Signed-off-by: Mohit Khanna <mkhannaqca@codeaurora.org>
Deepak Katragadda [Fri, 1 Jul 2016 00:11:49 +0000 (17:11 -0700)]
clk: msm: clock-gcc-cobalt: Remove support for gcc_bimc_hmss_axi_clk
The gcc_bimc_hmss_axi_clk will be configured outside of HLOS.
The linux clock driver does not need to manually enable it.
CRs-Fixed:
1012646
Change-Id: Ib0b848fb410f4bf266b09cefed0e8bce7292d2ec
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
Phani Kumar Uppalapati [Mon, 14 Mar 2016 19:03:20 +0000 (12:03 -0700)]
ASoC: wcd9335: Update decimator filter cutoff frequency
Update decimator high pass filter cutoff frequency if the
TX is path closed within 300ms after opening the session.
This will restore the cutoff frequency to the default
correct value.
CRs-fixed: 988075
Change-Id: Iece28fe2551a74ec7b1b8b4b5cac02537e3d28d8
Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
Harry Yang [Thu, 23 Jun 2016 21:54:43 +0000 (14:54 -0700)]
qcom-charger: update parallel charging states after boot
If a USB charger is already attached before the master charger
probes, the master will miss updating parallel charging states.
ICL and charge state change interrupts get triggered before
their handlers are registered. Hence these interrupts will not
be handled. Obtain the state of missing interrupts by polling
status registers.
If parallel charging is ready on master side before the parallel
charger probes, then parallel charging will not be enabled.
Check if parallel charging is ready once the parallel charger
probes so parallel charging can be enabled immediately.
CRs-Fixed:
1033688
Change-Id: Ic91baeaeb7410b6f265b8bfa8e31e2bcff8dfce2
Signed-off-by: Harry Yang <harryy@codeaurora.org>
Tony Truong [Fri, 1 Jul 2016 02:15:28 +0000 (19:15 -0700)]
msm: pcie: change the logging type for dumping PARF registers
When clients dumps PCIe PARF registers, it should not flood
dmesg. Change the logging type for dumping PCIe PARF register
to a lower priority one. The dump will only show up in PCIe
specific logs and not dmesg.
Change-Id: Ide04b0d2017ce3c1a99edd2b38ef5b06178a1f41
Signed-off-by: Tony Truong <truong@codeaurora.org>
Liam Mark [Fri, 3 Jun 2016 23:32:42 +0000 (16:32 -0700)]
ARM: dts: msm: peripheral_mem carveout for msmcobalt
The peripheral_mem carveout currently contains three separate images.
If these images are dynamically unloaded and reloaded in the wrong
order they could fragment the memory such that not all images would
fit.
Break apart the peripheral_mem into separate carveouts for each PIL
image to avoid the possibility of fragmentation.
CRs-Fixed:
1024397
Change-Id: Id9607b7e4a5e0cdcbf4c36ffad32536dd0669005
Signed-off-by: Liam Mark <lmark@codeaurora.org>
Linux Build Service Account [Fri, 15 Jul 2016 15:15:21 +0000 (08:15 -0700)]
Merge "USB: gadget: serial: Fix debugfs crash"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:37 +0000 (03:44 -0700)]
Merge "msm: ADSPRPC: Handle fastrpc glink channel open on timeout"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:34 +0000 (03:44 -0700)]
Merge "msm: kgsl: Disable GPU software clockgating on A540"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:33 +0000 (03:44 -0700)]
Merge "ARM: dts: msmcobalt: Add control for GPU software clockgating"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:32 +0000 (03:44 -0700)]
Merge "scsi: ufshcd: Fix race between clk scaling and ungate work"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:31 +0000 (03:44 -0700)]
Merge "ARM: dts: msm: add 2k truly panel for msmcobalt"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:30 +0000 (03:44 -0700)]
Merge "qcom-charger: show correct battery status while charging via wireless"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:29 +0000 (03:44 -0700)]
Merge "msm: ipa3: don't check offset_entry when using DDR address"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:28 +0000 (03:44 -0700)]
Merge "msm: kgsl: Disable GPU isense clock below nominal power level"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:28 +0000 (03:44 -0700)]
Merge "Merge remote-tracking branch 'origin/tmp-
917a9a9133a6' into lsk"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:27 +0000 (03:44 -0700)]
Merge "ARM: dts: msm: disable L1 and L1ss for PCIe on msmcobalt"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:26 +0000 (03:44 -0700)]
Merge "qcom-charger: qpnp-smb2: enable some irqs as a wakeup source"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:25 +0000 (03:44 -0700)]
Merge "usb: dwc3: Fix bug in ep disable operation"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:25 +0000 (03:44 -0700)]
Merge "icnss: Setup hypervisor permissions for MSA0"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:24 +0000 (03:44 -0700)]
Merge "msm: vidc: Fix buffer overflow issue in driver"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:23 +0000 (03:44 -0700)]
Merge "spmi-pmic-arb: change mode callback/ops for v3"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:23 +0000 (03:44 -0700)]
Merge "msm: kgsl: Remove ISENSE control code"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:22 +0000 (03:44 -0700)]
Merge "ARM: dts: msmcobalt: Enable GPU Turbo on A540"
Linux Build Service Account [Fri, 15 Jul 2016 10:44:19 +0000 (03:44 -0700)]
Merge "msm: ipa: exit when hdr proc ctx table is full"
Srinivas Ramana [Tue, 12 Jul 2016 06:52:49 +0000 (12:22 +0530)]
defconfig: msm: build dtb appended zImage for msmfalcon
Enable building dtb appended zImage for msmfalcon.
Change-Id: I47abe573e2867b9c38bebd637a4ae2f07fab63a3
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
Srinivas Ramana [Thu, 7 Jul 2016 09:57:16 +0000 (15:27 +0530)]
arch: arm: select ARM_GIC even for targets with gic-v3
Some of the features like MSM_GIC_SHOW_IRQ are using ARM_GIC
flag. So select this even for gic-v3 target on 32-bit.
This will also make it consistent with arm64 where ARM_GIC
is selected along with gic-v3.
Change-Id: Ie929d63a23c88799c488c5a79c81cd1cbfaa6565
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
Arumuga Durai A [Thu, 5 May 2016 07:23:29 +0000 (12:53 +0530)]
USB: gadget: serial: Fix debugfs crash
Serial function driver creates debugfs files even though ports
are not allocated. Fetching/reading those files without allocation
of ports leads to crash. Check port allocation before creating
the files.
Change-Id: I85b050a261cca6f961d5d9058efb8b7facf242ce
Signed-off-by: Arumuga Durai A <cadurai@codeaurora.org>
Trishansh Bhardwaj [Wed, 29 Jun 2016 09:04:31 +0000 (14:34 +0530)]
msm: camera: Fix memory read by adding bounds check
Adds bound check on reg_cfg_cmd->u.dmi_info.hi_tbl_offset.
IOCTL VIDIOC_MSM_VFE_REG_CFG uses usersupplied value without
performing bounds check for following cmd_type.
VFE_READ_DMI_16BIT
VFE_READ_DMI_32BIT
VFE_READ_DMI_64BIT
Change-Id: I554c45ef3a172f5b5891b67a7e8e7a1f3f3882ed
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
Yeleswarapu Nagaradhesh [Tue, 21 Jun 2016 18:50:06 +0000 (00:20 +0530)]
drivers: mfd: do not modify reset gpio if codec is identified
If target can support multiple codecs, only one of the
codecs will be enumerated. Do not clean up common resources
when other codec fails to enumerate.
CRs-Fixed:
1041199
Change-Id: I74a298739925b5763458c2e637372aa8f2c2aa55
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
Sagar Gore [Fri, 6 May 2016 00:39:50 +0000 (17:39 -0700)]
msm: camera: ispif: RDI Pack mode support
Add support for pack mode in ISPIF RDI path.
Change-Id: I9472f3162a87b8a4255d9c684573093642d488a2
Signed-off-by: Sagar Gore <sgore@codeaurora.org>
Sathish Ambley [Thu, 14 Jul 2016 21:49:38 +0000 (14:49 -0700)]
ARM: dts: msm: Increase ADSP ion heap by 4 MB for msmcobalt
Increase ADSP ION heap by 4 MB that is required by the
ImproveTouch functionality.
Change-Id: I03a298cf69369efc58f8d85d39897408d34f3635
Signed-off-by: Sathish Ambley <sathishambley@codeaurora.org>