Merge "gpu: ion: replace __GFP_ZERO with manual zero'ing"
Conflicts:
	drivers/gpu/ion/ion_iommu_heap.c
Merge "gpu: ion: allocate huge pages in iommu heap"
Conflicts:
	drivers/gpu/ion/ion_iommu_heap.c
msm: mdm: Fix for incorrect ramdump timeout and ssr ref count.

The SSR reference count now gets decremented only once during a SSR cycle.
Ramdump timeout is now set correctly for each mdm.

Change-Id: I3f1d577805d4a6cc5171a69107f8529a9d165b04
Signed-off-by: Ameya Thakur <ameyat@codeaurora.org>
msm: hsic_sysmon: Support multiple instances

Enhance the driver to support (currently up to 2) multiple sysmon
interface instances. This is done by classifying the supported PIDs
as either the first or second allowable instance. Add PID 9079 and
allow it to be instantiated as the second instance. Also make use
of the new USB_DEVICE_INTERFACE_NUMBER macro.

Change-Id: I6f9fbf37d151dcce1d0bcf5204460ce0732730f1
Signed-off-by: Jack Pham <jackp@codeaurora.org>
msm: sysmon: Add support for second USB HSIC modem

Add support for a secondary instance of an external modem over
the USB/HSIC transport.

Change-Id: I1891ccc14279dfcbcf5e3555a6d42f42049e208a
Signed-off-by: Jack Pham <jackp@codeaurora.org>
msm: 8064: add configuration to prevent asserting ap2m_errfatal

For the DSDA2 target with two external modems, independent
subsystem restart of each modem is required. This flag is
used by the mdm driver to prevent it from asserting the
ap2mdm_errfatal during subsystem shutdown for the DSDA2 target,
otherwise both modems would reset because they share the same
gpio.

Change-Id: I27aedaa2b1b8756079710e41d8a4a9572b8ff83a
Signed-off-by: Joel King <joelking@codeaurora.org>
msm: mdm: do not assert ap2mdm_errfatal gpio in some cases during SSR

Some platforms have the ap2mdm_errfatal line shared between
two external modems. Current implementation is to assert that
gpio during the SSR shutdown callback but that does not allow
for independent restart of each modem. On most platforms it is
actually not necessary to assert the ap2mdm_errfatal during
restart of the mdm. It is necessary during kernel panic of the
apps processor but that is already done in the panic handler.
The use case where it is necessary to assert the errfatal gpio
is where the mdm needs to be restarted by the SSR module, for
example on platforms where the internal and external modems need
to be restarted together. This patch adds a platform data parameter
to identify those platforms.

Change-Id: Ie4f5cbed752a04a80f1e4bfb50da03f52e010045
Signed-off-by: Joel King <joelking@codeaurora.org>
msm: mdm: Shutdown specific external modem

The shutdown ioctl now gets the system monitor id for the modem to shutdown
from the platform data structure rather than using a hardcoded value.

Change-Id: Ibe7666075903258932014bcf4c79aba0f71184fd
Signed-off-by: Ameya Thakur <ameyat@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/mdm_common.c
wcnss: new SMD control channel with WCNSS

A new SMD control channel is opened with WCNSS, currently only the
version information is exchanged thru this channel. WCNSS version is
exposed thru /sys interface.

Conflicts:

	drivers/net/wireless/wcnss/wcnss_wlan.c

Change-Id: I45638bdd992846fa6087b6131180684d30805002
Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>

Conflicts:
	drivers/net/wireless/wcnss/wcnss_wlan.c
video: msm: Calibration config implementation

Allow software to selectively read/write MDP color calibration registers.
This is needed to allow calibration tool to individually configure
registers.

Change-Id: I5db2dcbca0b3433c7fedf9033ceff0cf6a5e0e1f
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
(cherry picked from commit afc6fbf054d079761d5c2ee85242e56d640ee409)
Signed-off-by: Pravin Tamkhane <pravint@codeaurora.org>

Conflicts:
	drivers/video/msm/mdp4_util.c
net: rmnet_usb: Support multiple instances

Currently rmnet_usb supports a maximum of 4 net interfaces on a
single device at a time. This change allows the possibility of
multiple concurrent USB devices with RmNet interfaces to be
supported. The number and names of devices supported are now
specified by the following new module parameters:

* no_rmnet_devs - default: 1
* no_rmnet_insts_per_dev - default: 4
* rmnet_dev_names - default: "hsicctl"
* rmnet_data_init - initializes device nodes with above params

Userspace must now write to "rmnet_data_init" in order for the
control device nodes to be created.

Change-Id: I1e36d85b7fab4290ef64ef635162eb6e4de84e50
Signed-off-by: Jack Pham <jackp@codeaurora.org>
net: rmnet_usb: Add support for PID 0x9079

PID ID 9079 is a clone of 9048 intended for use over HSUSB
connection. The net device name for its interfaces will be
prefixed "rmnet2_usbX". The number and names of its control
interfaces will need to be initialized from userspace.

Change-Id: I98d25f23246c93f96a934dcfc2411c4b6d970b15
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Merge "video: msm: Calibration config implementation"
Conflicts:
	drivers/video/msm/msm_fb.c
Fixed socinfo.h
Merge "net: rmnet_usb: Use USB_DEVICE_INTERFACE_NUMBER"
Conflicts:
	drivers/net/usb/rmnet_usb_data.c
msm: vidc: Add support for NV21 color format encoding

This change adds NV21 color format encoding support.

CRs-fixed: 448511
Change-Id: If26f1241a006e2d325668b8e189f6ff76df8e125
Signed-off-by: Deepak Verma <dverma@codeaurora.org>
arm: mach-msm: qdsp6v2: update dual mono setting check

AUDIO_AAC_DUAL_MONO_PL_PR is 0 anyway and dual mono
setting is defined as unsigned value. Hence,
there is no need if new setting is less than
AUDIO_AAC_DUAL_MONO_PL_PR.

Change-Id: I2e18a875e211d05d100d827fcd5b67545de168ac
Signed-off-by: Patrick Lai <plai@codeaurora.org>
ASoC: msm: qdsp6: avoid unnecessary check

Remove unnecessary check as it should be reasonable
to assume valid parameter would be issued through
debugfs interface

Change-Id: I1a23d8c5324b813bf9501c5462684234926b5dcc
Signed-off-by: Patrick Lai <plai@codeaurora.org>
arm: mach-msm: qdsp6v2: remove unnecessary write count check

write count is never going to be negative value

Change-Id: Ie9468d4fbcccb2b7df87cbb67d0a911e584c8e62
Signed-off-by: Patrick Lai <plai@codeaurora.org>
ASoC: msm: qdsp6: add check for maximum COPPs allowed

There is maximum number of COPPs ASM session can be routed
to even though there are far more number of AFE ports.
Add the check to make sure caller is not routing to more
than ADM can actually support.

Change-Id: Iee97dd7e5d21820c87244a422fa252c2228185f9
Signed-off-by: Patrick Lai <plai@codeaurora.org>