tuners: Add help text to MEDIA_TUNER

This allows us to disable tuners since they aren't used in phones AFAIK.

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Ib1698a6a17533aa4d23445beafae19ebfc791b19
msm: mdss: refactor mdss color formats

Add missing color formats and reorganize color formats to have better
code reuse and make it easy to add new formats if required.

Change-Id: Ic7c6bb6f35a9c282d9ef99bd5e1d18b0b8033971
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
msm: mdss: add color format for venus core

Venus output format expects luma and chroma components to be aligned to
32 bytes, add new color format to support this type of input.

Change-Id: I1fc9a61a0c8cfa8244460105fdab02d019d31556
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
msm_fb: Add support for BGRX_8888 format

Changes to support BGRX_8888 format as mdp4 source format.

Change-Id: Ief72ec3deaaf02f621871aaadd7a0992366b21fe
Signed-off-by: Pawan Kumar <pavaku@codeaurora.org>
msm: mdss: Add macro tile formats

MDP now supports tile formats on APQ8084. Macro tile formats
are aligned with number of memory banks and access channels to
improve performance. This change adds the formats to user space
accessible kernel header file.

Change-Id: Ie566cc12b38f81d111f378f19883433bcc71fa48
Signed-off-by: Shalabh Jain <shalabhj@codeaurora.org>
msm_fb: Fix color format mapping between V4L2 and MDP

Add V4L2_PIX_FMT_UYVY, V4L2_PIX_FMT_YUYV, V4L2_PIX_FMT_YVU420
format mapping in video driver. Add support  for
MDP_CBYCRY_H2V1 format for mdp4.

Change-Id: I4d5f1ae4ea71aa57c168f7143ff15f79e27cc1d0
Signed-off-by: Pawan Kumar <pavaku@codeaurora.org>
msm_fb: Calibration config API

Add definition for struct to be used in post processing calibration API.
Needed by OEM calibration tool to provide better support of post processing
features.

Change-Id: I40760a85bb58730bfe64469ecf3e2ab3b6e7609e
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
(cherry picked from commit e8ed5ec0bd9fd5b298464b7f08b5807afa3291a8)
video: msm: Add logical display id for post processing

Define logical id for display backend processing.
These ids are independent with hw implementation, could be used
for MDP4, MDP5 and future ASICs. Kernel driver implementation will
also be abstracted to the post processing user.

Signed-off-by: Ken Zhang <kenz@codeaurora.org>
(cherry picked from commit 6a431631728d2d217447079dd636bd1e26d56ac4)

Change-Id: I27bd4e7d3803f4b356d924c65ac28e142375d1d5
Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>
staging: import prima v3.1.7.16 as legacy

Change-Id: Ie3a7548a087ff122389a410232269a6098b6eb6d
AU_LINUX_ANDROID_JB_REL.04.01.01.02.039

Change-Id: Ibdf6cfb8b460f4f8cc7ade722be320359d240d03
AU_LINUX_ANDROID_JB_REL_RB4.04.01.02.16.074

Change-Id: Ie8989191702455ffcd0e34af0816c8ef528e8947
prima: fix build

Change-Id: Id3e7b2e43e4387a6818a6c4918a5c1cd92b4e658
Signed-off-by: Arnav Gupta <championswimmer@aokp.co>
fix build with gcc4.8

Change-Id: I7a1aec183cfd07b27d9037c3ac853326b9e41718
msm_serial_hs:Increase rx buffer size to 1024bytes

Increase the UARTDM rx buffer size from 512 bytes
to 1024 bytes. This patch helps to increase the
rx data rates of the clients that uses serial_hs driver.
CRs-Fixed: 514385

Change-Id: I957b1e47887931047e66da555e73683e7dca49a8
Signed-off-by: Dilip Kota <c_dkota@codeaurora.org>
msm-camera: Fix various small issues in Actuator driver

Bound check and validate userspace parameters direction,
number of steps and direction sign. Also fix possible
memory leak in certain error cases.

Change-Id: I05a3f63583845851df36b122f2079d345657cb99
CRs-Fixed: 511349

Signed-off-by: Katta Santhisindhu <kattas@codeaurora.org>
dt/flattree: Add stub defintions for flat device tree function

Several flattened device tree functions are currently accessed in a
file that is compiled regardless of whether device tree is enabled
or not. Add stubs for these functions if device tree is not selected.

Change-Id: I0bea3325692fac46d3e5ef457aa30e083f71cd6d
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
msm: 8974: Add function to reserve memory from device tree

Memory reservations for memory pools or using memblock remove
must happen early at bootup. Add a function at early boot to
walk the flattened device tree and extract memory reservation
information from appropriate bindings in device tree. To ensure
that the memory is only reserved when a driver is enabled,
drivers must put EXPORT_COMPAT(<compat string>) in the driver
as well as adding the binding to the device tree. More
documentation is available in
Documentation/devicetree/bindings/arm/msm/memory-reserve.txt

Change-Id: I28fa71d7a30cea9af5447acb5d2dde562fa0f6de
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
gpu: ion: Add support for device tree.

Add device tree parsing to common msm ion code
to allow new targets to specify ION heap configuration
in device tree.

Document the device tree bindings for ION.

Change-Id: I40b7f4b1fbb3ca4ad1d6dc06a33b647f6af1d669
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
ion: isolate msm-specific ion extensions

This is another step in the process of isolating msm-specific ion
features from stock ion.

Change-Id: I3a437dbc618cb70859126c81596373338ad06500
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>

Conflicts:

	include/linux/ion.h