Commit graph

572478 commits

Author SHA1 Message Date
Shubhraprakash Das
6dee9ee63f msm: camera isp: Control camif interrupts on camif enable/disable
Turn off the camif interrupts when camif is disabled and turn them
on when camif is enabled. Also, improve the code to keep track of
interrupts that are enabled by updating them in the function that
sets interrupts instead of doing it in multiple places.

CRs-Fixed: 1037272
Change-Id: I1cc965696c06bd3901d86668aaf597abb3ef2d6d
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
2016-07-20 11:48:57 -07:00
Shalini Krishnamoorthi
b13e28827a clk: qcom: Porting display clocks from msm folder to qcom folder
Porting msm8996 related display clocks/PLL from drivers/clk/msm
to drivers/clk/qcom (upstream version).

Change-Id: I7a4ab0be9e70f25817edadfc2eab4f7adf4435ee
Signed-off-by: Shalini Krishnamoorthi <shakri@codeaurora.org>
2016-07-20 11:46:58 -07:00
Mayank Rana
92a165748a ARM: dts: msm: Update QUSB PHY device node compatible property on msmcobalt
It is required to use phy-msm-qusb-v2.c driver with msmcobalt platform.
Hence use "qcom,qusb2phy-v2" instead of "qcom,qusb2phy" as compatiable
string with QUSB PHY related device node on msmcobalt.

Change-Id: I8d8ed29215f326801ba4e60794cc63e4eaeeb97e
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2016-07-20 11:34:49 -07:00
Devdutt Patnaik
e00fec135a usb: phy: qusb: Determine linestate for QUSB2 PHY
Controller driver passes current speed to QUSB2 PHY driver in
the flags parameter. Determine linestate using speed,
mode and cable connection status. This deprecates the older
mechanism where linestate was determined by reading the now
obsoleted QUSB2PHY_PORT_UTMI_STATUS register.

Change-Id: I682eb250964f32f93d7b31dae0291aca7fa44362
Signed-off-by: Devdutt Patnaik <dpatnaik@codeaurora.org>
2016-07-20 11:34:48 -07:00
Devdutt Patnaik
4d0a155ed7 usb: dwc3: Determine connection speed for HS PHY
DP/DM linestate is needed by the QUSB2 PHY driver to configure the
polarity of DP/DM transition triggers for exiting low power mode.
This was previously available via the  QUSB2PHY_PORT_UTMI_STATUS
PHY register which is now deprecated. In order to correctly determine
the interrupt polarity we need to pass the current operating speed
to the QUSB2 PHY driver. The PHY driver uses mode, speed and
cable connection status to determine the linestate and configure
interrupt polarities for wake up. Add logic to determine operating
speed for host and device mode cases.

Change-Id: Iaede1269f514a314bd9717a33100f748e7753b2a
Signed-off-by: Devdutt Patnaik <dpatnaik@codeaurora.org>
2016-07-20 11:34:47 -07:00
Devdutt Patnaik
54178f48e0 ARM: dts: msm: Update QUSB2 PHY device node for host mode on msmcobalt
Update the device node for QUSB2 PHY with the recommended
register initialization sequence for host mode.
This is needed to fix HS enumeration issues due to port
reset failure.

Change-Id: I8cfed672ff02cd61beb956116f9fcd365211cf11
Signed-off-by: Devdutt Patnaik <dpatnaik@codeaurora.org>
2016-07-20 11:33:56 -07:00
Jack Pham
f33cac01f3 usb: pd: Don't notify EXTCON_USB unless type is SDP or CDP
commit 77f6fd8044 ("usb: pd: Add support to notify plug
orientation via extcon") added an additional extcon notifier
to indicate orientation. But for the PE_SNK_STARTUP case
the change inadvertently notifies EXTCON_USB for all sink
states when it should just be for psy_type==USB|USB_CDP.
Add the missing curly braces to the if statement.

Change-Id: I19d424ff0d46cc0134210424a7d431b331cbf963
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2016-07-20 09:51:33 -07:00
Linux Build Service Account
9e4b3ba4af Merge "soc: qcom: code cleanup for service-locator" 2016-07-20 08:07:33 -07:00
Linux Build Service Account
b1210d3650 Merge "msm: vidc: Increase output port buffer size for VP9 decode" 2016-07-20 08:07:32 -07:00
Linux Build Service Account
135ada4b84 Merge "wcnss: Avoid user buffer overloading for write cal data" 2016-07-20 08:07:31 -07:00
Linux Build Service Account
043976c57f Merge "ARM: dts: msm: add gpio controller node for msmcobalt" 2016-07-20 08:07:28 -07:00
Linux Build Service Account
ee51bb2ba3 Merge "qcom-charger: smb138x-charger: change power supply type to usb parallel" 2016-07-20 08:07:27 -07:00
Linux Build Service Account
9d47bda2f3 Merge "ARM: dts: msm: update min voltage for pmcobalt s5 and s7" 2016-07-20 08:07:26 -07:00
Linux Build Service Account
7d113eb7d6 Merge "ARM: dts: msm: add ion heaps for msmfalcon" 2016-07-20 08:07:25 -07:00
Linux Build Service Account
8ac4813eb5 Merge "ARM: dts: msm: Add initial memory map for msmfalcon" 2016-07-20 08:07:24 -07:00
Dhoat Harpal
fd706908c9 ARM: dts: msm: Add ipc-spinlock entry for MSMFALCON
Add the ipc-spinlock entry to facilitate locking between apps and
non-apps processors.

CRs-Fixed: 1043377
Change-Id: I097e5464ec6ab80c12bcdb5f38d0599fa40da9ee
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2016-07-20 20:00:20 +05:30
Raviteja Tamatam
c4469317c0 msm: mdss: fix mdss errors on 32-bit compilation
Changes made to fix mdss compilation errors on
32-bit mode

Change-Id: Ic28f6f36781154ff0c28f4636ade8523d753ab6a
Signed-off-by: Raviteja Tamatam <travitej@codeaurora.org>
2016-07-20 16:19:35 +05:30
Anand Kumar
f009a48f80 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>
2016-07-20 00:35:18 -07:00
Yeleswarapu Nagaradhesh
5e351f3751 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>
2016-07-20 12:37:23 +05:30
Yeleswarapu Nagaradhesh
7f5b8235c1 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>
2016-07-20 00:01:03 -07:00
Yeleswarapu Nagaradhesh
1b289a8a23 ASoC: wcd: add wcd934x gpio controller device
Add wcd934x gpio controller as child to codec node
and add all child devices of codec.

CRs-Fixed: 1041199
Change-Id: I32ad5c5c8c9dd30a79818c873cfe1d121fd62d49
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
2016-07-19 23:31:09 -07:00
Laxminath Kasam
482c8b19a8 ASoC: Fix freed memory access of pcm stream kctl
Consider sound card instantiate fails due to
audrx init failure. In such case, all dais/ctls
are de-registered and freed. But as part of it,
access to unregistered ctls for pcm_chmap and similar
controls result in crash.  Ctls are freed at disconnection
but the disconnect is called only when it was registered.

CRs-Fixed: 1038054
Change-Id: Ief8817b4ec000c058d46aa021977b7c6003c0011
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2016-07-20 11:40:25 +05:30
Jonathan Wicks
81adc62fa0 ARM: dts: msm: Enable the GPU QDSS STM for msm8996
Add the QDSS STM property to the 8996 device tree so
that data can be logged from the GPU to the debug
bus when available.

CRs-Fixed: 1031648
Change-Id: I0edd786a3465ac38188a1d1213ba5bea84c67a6f
Signed-off-by: Jonathan Wicks <jwicks@codeaurora.org>
2016-07-19 19:55:52 -07:00
Jonathan Wicks
6e192957e8 msm: kgsl: Map GPU QDSS STM through GPU IOMMU
Map the GPU QDSS STM area as a global into the GPU
IOMMU so that GPU traces can be routed to QDSS.
Enable the gpuaddr and size of the area to be queried
from userspace.

CRs-Fixed: 1031648
Change-Id: I2e32522a42508a6bee088c95dc56a13935dd691c
Signed-off-by: Jonathan Wicks <jwicks@codeaurora.org>
2016-07-19 19:54:57 -07:00
Linux Build Service Account
7eb20e5733 Merge "msm: vidc: Add support for setting packed QP range" 2016-07-19 18:48:00 -07:00
Linux Build Service Account
25a5fb85c0 Merge "qcom: wcd934x: add pinctrl driver for wcd934x" 2016-07-19 18:47:59 -07:00
Linux Build Service Account
3225611f1d Merge "NFC: Fix crash due to invalid use of ese gpio" 2016-07-19 18:47:58 -07:00
Linux Build Service Account
88451207ce Merge "msm: vidc: check for venus_hfi_device state in resume" 2016-07-19 18:47:57 -07:00
Linux Build Service Account
c9176f0451 Merge "msm: camera: ispif: RDI Pack mode support" 2016-07-19 18:47:56 -07:00
Linux Build Service Account
b673198869 Merge "sched/core: Fix uninitialized variable used for tracepoint" 2016-07-19 18:47:55 -07:00
Linux Build Service Account
3a2dd33cfb Merge "sched/core: Fix null-pointer dereference" 2016-07-19 18:47:55 -07:00
Linux Build Service Account
83e5e75fab Merge "ARM: dts: msm: Remove SMD device for DSPS edge for MSMCOBALT" 2016-07-19 18:47:54 -07:00
Linux Build Service Account
67f5028611 Merge "ARM: dts: msm: Remove SMD device for ADSP edge for MSMCOBALT" 2016-07-19 18:47:53 -07:00
Linux Build Service Account
0520f0ab44 Merge "ARM: dts: msm: Remove SMD device for Modem edge for MSMCOBALT" 2016-07-19 18:47:53 -07:00
Linux Build Service Account
f0d75197a8 Merge "WLAN subsystem: Sysctl support for key TCP/IP parameters" 2016-07-19 18:47:51 -07:00
David Dai
445a76b790 ARM: dts: msm: Add GDSC data for mnoc fab for msmcobalt
Add gdsc_mdss, gdsc_camss_top, gdsc_venus references in order
to enable client side clocks during QoS configuration. Also
include mmssnoc_axi reference so that we can guarantee bus clock
to be on at the time of QoS configuration in the event
that the initial bandwidth vote from client is 0.

CRs-Fixed: 1043729
Change-Id: If8e08112d065e1327fd54d7b0daf511632aa059f
Signed-off-by: David Dai <daidavid1@codeaurora.org>
2016-07-19 17:28:04 -07:00
Amit Pundir
400dd9ed77 netfilter: xt_qtaguid: seq_printf fixes
Update seq_printf() usage in xt_qtaguid to align
with changes from mainline commit 6798a8caaf
"fs/seq_file: convert int seq_vprint/seq_printf/etc...
returns to void".

Change-Id: Iecda872c6eae372988ff20a44164fb4a57db0f82
CRs-Fixed: 1035969
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: 7c79aca516
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-19 16:48:58 -07:00
Amit Pundir
98056556c7 Revert "net: activity_stats: Stop using obsolete create_proc_read_entry api"
This reverts commit 7c121720fa.

Change-Id: Ib2ce5e7153756f03d48c94a5afbd32d4ae4c5c83
CRs-Fixed: 1035969
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: 5c0d8ae10a
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-19 16:48:56 -07:00
Amit Pundir
ddd333bdb3 Revert "misc: uidstat: avoid create_stat() race and blockage."
This reverts commit f7a8121740.

Change-Id: I3f003d5d1b8f3e9068f467723256932f29009915
CRs-Fixed: 1035969
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: cded5596a3
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-19 16:48:53 -07:00
Amit Pundir
ef8f8484c1 Revert "misc: uidstat: Remove use of obsolete create_proc_read_entry api"
This reverts commit fccab646d3.

Change-Id: I48bee6e92e4210059aa6e82db4badf24c1cb1546
CRs-Fixed: 1035969
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: 1ada37dc07
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-19 16:48:50 -07:00
Amit Pundir
859dc4e658 Revert "misc seq_printf fixes for 4.4"
This reverts commit 5c7566a29b.

This patch revert some changes in net/netfilter/xt_qtaguid.c as well.
I'll submit another patch to restore those changes.

Change-Id: I2d9251867235a6566b4c676de0546ce046848c91
CRs-Fixed: 1035969
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: cdb6973ae1
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-19 16:48:47 -07:00
Bryse Flowers
9b9d994aa4 defconfig: um: Disable activity stats
Temporarily disable modules while stability issues are resolved.

Change-Id: I9c21883988e3da494c3a0a815fd3eee4c1a70a0f
CRs-Fixed: 1035969
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-19 16:48:42 -07:00
Puja Gupta
06ab5bc8cf 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>
2016-07-19 16:17:37 -07:00
Devdutt Patnaik
4e2ea2e9dc usb: phy: qusb: Add support for host mode phy init seq
Update QUSB2 HS PHY init sequence in host mode to fix
enumeration issues due to port reset operation failure.

Change-Id: I95daf3e3a833f9daeac6190daa33191f9db8cf26
Signed-off-by: Devdutt Patnaik <dpatnaik@codeaurora.org>
2016-07-19 15:40:12 -07:00
Skylar Chang
80b2de9c6e msm: ipa: do not use delay in SSR
In some rare race condition during SSR, modem might
programmed commands to IPA to lock the pipe, and AP will
enable delay on this pipe which will prevent IPA to read
unlock command. In this case IPA HW will be stalled as it
is locked forever on this pipe.

CRs-Fixed: 1040724
Change-Id: Ifc874c9e881eb1b3ccea321679bb272cd427fabb
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2016-07-19 11:51:46 -07:00
Nicholas Troast
081d5841c7 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>
2016-07-19 09:09:12 -07:00
Nicholas Troast
6f50a62d39 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>
2016-07-19 09:06:34 -07:00
Linux Build Service Account
7ebe256eaa Merge "ASoC: msm: Add support for 192KHZ sampling rate on mi2s rx ports" 2016-07-19 03:39:57 -07:00
Linux Build Service Account
7e2261a267 Merge "ASoC: msm: Implementing Tx mute in ASM loopback" 2016-07-19 03:39:56 -07:00
Deepak Kushwah
12d028e02f 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>
2016-07-19 03:32:47 -07:00