Merge "msm: vidc: Add null pointer checks"
Merge "defconfig: 8974: Enable USB CCID class driver"
input: sensors: fix accelerometer output data rate issue

Accelerometer data output rate is limited by device ODR register,
no need to configure this register in polling mode.

CRs-Fixed: 641705
Change-Id: If59900b244b31f813dd17e72b19c7fd2ca4b4ba1
Signed-off-by: Bingzhe Cai <bingzhec@codeaurora.org>
Slim_ngd: Don't create the device node per SSR

Observe the device crash due to the device node
gets created per ADSP SSR when the logical address
query succeeds at the first attempt.
This patch makes sure that the device node creation
happened only once  by declaring another variable to
track the logical address retry.

CRs-Fixed: 640381
Change-Id: I3d947fcbc575af7cb431255772aa9cb64d2df6b6
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
msm: mdss: Add support for sending panel off commands in LP mode

Add support to send panel Off commands for video mode during LP
mode. This is needed to support few video mode panels which have
BLLP power mode set to HS and it is not possible to send Off
commands when pixel data is active. Hence, make changes to send
panel Off commands for such panels in LP mode after TG is
turned off.

Change-Id: I1c9f3fd1e9e052b5254cfdcf58cd974dfbe3dc8e
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
Signed-off-by: Jayant Shekhar <jshekhar@codeaurora.org>
Merge "msm: camera2: cpp: Remove the reinstallation of cpp_timer"
Merge "msm: mdss: add real time debug log"
qseecom: Validate pointer offset in qseecom_send_modfd_cmd

Validate cmd_req_buf pointer offset in qseecom_send_modfy_cmd, and
make sure cmd buffer address to be within shared bufffer.

Change-Id: I431511a92ab2cccbc2daebc0cf76cc3872689a97
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
ARM: dts: msm: Add num fabrics to the msm8226 target

Add the number of fabrics present to the msm8226 device tree file. Use
this propoerty instead of APIs in code to determine the target type to
arrive at the number of bus fabrics present.

CRs-Fixed: 642345
Change-Id: I299d735b3c37c583b29a5cdb13367af42ccf8cea
Signed-off-by: Girish Mahadevan <girishm@codeaurora.org>
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
Merge "power: qpnp-bms: use better defaults for power supply props"
ARM: dts: msm: add support for qseecom bus scaling for 8074, 8226 and 8610

To support qseecom bus scaling, ab & ib values are changed to set four
bandwidth levels: "INACTIVE, LOW, MEDIUM and HIGH" with corresponding
bus bandwidth of {0M, 0M, 150M, 492M}; and the flag of support-bus-scaling
is also set for apq8074, msm8226 and 8610.

Change-Id: I15350619143094d280ebc1e3717418285063448d
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Signed-off-by: Shruthi Krishna <skrish@codeaurora.org>
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
msm: mdss: Change the writeback format enumerations

The enumerations used for writeback format through metadata set
and get ioctls should be the same in HAL and kernel.

Change-Id: I5fb7f9266d01c3ba4390a5a6bb168af507e3c298
Signed-off-by: Sree Sesha Aravind Vadrevu <svadrevu@codeaurora.org>
ARM: dts: msm: Add batt-pres-status node to MSM QPNP-BMS devices

Add the bat_pres_status nodes to the qpnp-bms device node in order to
know whether the battery has been removed when the device is powered
off.

Change-Id: I2b71d9c8380a87b3f5b9871d5e42ba3e483cab05
Signed-off-by: Xiaozhe Shi <xiaozhes@codeaurora.org>
Merge "msm: kgsl: Flush TLB when mapping to IOMMU pagetable"
Merge "ARM: dts: msm: Add num fabrics to the msm8226 target"
Merge "ARM: dts: msm: add support for qseecom bus scaling for 8074, 8226 and 8610"
mdss: mdp3: Group together resource enable, simplifying xo shutdown

Grouping calls to prepare and unprepare of clocks along with enable
and disable for saving power in the case of static screen on command
mode panels. This makes sure that corresponding source clocks are
also disabled allowing xo shutdown to happen.

On top of that bandwidth request and iommu enable was grouped with
enabling/disabling clocks so that all display related clocks are
disable in static screen allowing for xo shutdown to happen.

Change-Id: I2db3844cbab5c41ea1bb37f5a5ed76c3c63e3a1d
Signed-off-by: Terence Hampson <thampson@codeaurora.org>
power: core: add set_voltage_limit API

Add the power_supply_set_voltage_limit API which
allows the POWER_SUPPLY_PROP_VOLTAGE_MAX property
to be configured for a given power supply.

CRs-Fixed: 637169
Change-Id: Ib525366ff742ad31d81ffee75920c19a6f9e8de8
Signed-off-by: David Keitel <dkeitel@codeaurora.org>
power: qpnp-charger: take into account charge path priority

On the SMBB peripheral there is a possibility of having
both the USB and DC input being connected at the same time.
In this situation there is a requirement to be able to communicate
to userspace services that the higher priority input was
inserted so appropriate action can be taken.

This is achieved as follows:

1. If DC has the higher priority, the USB input
current limit will be reduced to 100 mA to avoid
charging from the USB path.

2. If USB has priority the DC input current
limit will be reduced to 100 mA to avoid charging
from the DC path.

3. Upon the removal of the priority charge path
the secondary charge path input current limit
will be restored to allow charging.

CRs-Fixed: 637169
Change-Id: Id5b61103b9f1d8f32ffd707d2512972c1a310108
Signed-off-by: David Keitel <dkeitel@codeaurora.org>
msm: mdss: Hold MDP clock Ref count in pan_display path

If handoff fails, the clock ref count becomes 0 and iommu
will get detached. In pan display path, since at that
particular instant iommu gets detached, we use physical
address. After this if iommu is again attached and physical
address is fetched, it can result in continuous IOMMU page
faults. To address this hold MDP clock ref count
in pan display path.

Change-Id: I2370b276acdced2cf22083eb80fcad1b2e454315
Signed-off-by: Jayant Shekhar <jshekhar@codeaurora.org>