OSDN Git Service

sagit-ice-cold/kernel_xiaomi_msm8998.git
7 years agoARM: dts: msm: configure interrupt types for charger for pmi8998
Abhijeet Dharmapurikar [Tue, 14 Feb 2017 01:41:47 +0000 (17:41 -0800)]
ARM: dts: msm: configure interrupt types for charger for pmi8998

Currently the interrupt trigger type is configured as NONE. This
causes a level handler to be assigned to these interrupts.

However, all of them are edge triggered interrupts with varying
falling/rising/both edge flavors. Update the device tree to
use their correct trigger types thereby preventing missed interrupt
storms because of incorrect handler types.

Change-Id: I6b5cddc8281ca7f6810dcb754d7dd2e6ae6f339c
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
7 years agoMerge "spi: spi_qsd: Use the right device for dma_unmap_single operation"
Linux Build Service Account [Sun, 12 Feb 2017 22:28:20 +0000 (14:28 -0800)]
Merge "spi: spi_qsd: Use the right device for dma_unmap_single operation"

7 years agoMerge "config: Add new file msmcortex_mediabox_defconfig"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:30 +0000 (01:25 -0800)]
Merge "config: Add new file msmcortex_mediabox_defconfig"

7 years agoMerge "ARM: dts: msm: add mdss node for sdm630"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:28 +0000 (01:25 -0800)]
Merge "ARM: dts: msm: add mdss node for sdm630"

7 years agoMerge "qcom: qpnp-smb2: Reset switcher_power_ok irq count when USBIN_UV fires"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:25 +0000 (01:25 -0800)]
Merge "qcom: qpnp-smb2: Reset switcher_power_ok irq count when USBIN_UV fires"

7 years agoMerge "qcom: smb-lib: make smb_irq_info common for smb2 and smb138x chargers"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:23 +0000 (01:25 -0800)]
Merge "qcom: smb-lib: make smb_irq_info common for smb2 and smb138x chargers"

7 years agoMerge "qcom: qnovo: Update fcc and fv through batt psy"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:21 +0000 (01:25 -0800)]
Merge "qcom: qnovo: Update fcc and fv through batt psy"

7 years agoMerge "arm64: process: Update the kernel offset"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:20 +0000 (01:25 -0800)]
Merge "arm64: process: Update the kernel offset"

7 years agoMerge "defconfig: msm: Enable EL2 tlb handler"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:19 +0000 (01:25 -0800)]
Merge "defconfig: msm: Enable EL2 tlb handler"

7 years agoMerge "arm64: raise exception to EL2 for sync aborts"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:19 +0000 (01:25 -0800)]
Merge "arm64: raise exception to EL2 for sync aborts"

7 years agoMerge "qpnp-smb2: Add DT option for enabling input suspend on fake battery"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:18 +0000 (01:25 -0800)]
Merge "qpnp-smb2: Add DT option for enabling input suspend on fake battery"

7 years agoMerge "msm: ipa3: fix race condition in SSR"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:17 +0000 (01:25 -0800)]
Merge "msm: ipa3: fix race condition in SSR"

7 years agoMerge "input: keyboard: correct suspend/resume for gpio_keys"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:16 +0000 (01:25 -0800)]
Merge "input: keyboard: correct suspend/resume for gpio_keys"

7 years agoMerge "input: gpio_keys: Add support for pinctrl framework"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:15 +0000 (01:25 -0800)]
Merge "input: gpio_keys: Add support for pinctrl framework"

7 years agoMerge "ARM: dts: msm: Disable CXIP LM feature for sdm630"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:14 +0000 (01:25 -0800)]
Merge "ARM: dts: msm: Disable CXIP LM feature for sdm630"

7 years agoMerge "defconfig: msm: Enable BALANCE_ANON_FILE_RECLAIM"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:13 +0000 (01:25 -0800)]
Merge "defconfig: msm: Enable BALANCE_ANON_FILE_RECLAIM"

7 years agoMerge "msm: mhi: fix latent issues in MHI drivers"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:13 +0000 (01:25 -0800)]
Merge "msm: mhi: fix latent issues in MHI drivers"

7 years agoMerge "ath10k: converge TLV and HL1.0 params and API"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:12 +0000 (01:25 -0800)]
Merge "ath10k: converge TLV and HL1.0 params and API"

7 years agoMerge "tracing: Add clock trace events only for COMMON_CLK_MSM"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:11 +0000 (01:25 -0800)]
Merge "tracing: Add clock trace events only for COMMON_CLK_MSM"

7 years agoMerge "defconfig: Enable FG GEN3 and QNOVO configs for sdm660 32-bit"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:09 +0000 (01:25 -0800)]
Merge "defconfig: Enable FG GEN3 and QNOVO configs for sdm660 32-bit"

7 years agoMerge "regulator: cpr4-mmss-ldo: Add GFX LDO CPR support for sdm630"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:09 +0000 (01:25 -0800)]
Merge "regulator: cpr4-mmss-ldo: Add GFX LDO CPR support for sdm630"

7 years agoMerge "ARM: dts: msm: add camera focus and snapshot device nodes for SDM630"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:08 +0000 (01:25 -0800)]
Merge "ARM: dts: msm: add camera focus and snapshot device nodes for SDM630"

7 years agoMerge "clk: qcom: mdss: update the clk_ops for dp_vco_divided_clk_src_mux"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:07 +0000 (01:25 -0800)]
Merge "clk: qcom: mdss: update the clk_ops for dp_vco_divided_clk_src_mux"

7 years agoMerge "ARM: dts: msm: Update MEM ACC corner mapping for APC0/1 for sdm630"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:06 +0000 (01:25 -0800)]
Merge "ARM: dts: msm: Update MEM ACC corner mapping for APC0/1 for sdm630"

7 years agoMerge "drm/msm: Use dma_sync_sg_for_device() to flush cache for new buffers"
Linux Build Service Account [Sat, 11 Feb 2017 09:25:05 +0000 (01:25 -0800)]
Merge "drm/msm: Use dma_sync_sg_for_device() to flush cache for new buffers"

7 years agoqcom: qpnp-smb2: Reset switcher_power_ok irq count when USBIN_UV fires
Subbaraman Narayanamurthy [Tue, 7 Feb 2017 00:33:12 +0000 (16:33 -0800)]
qcom: qpnp-smb2: Reset switcher_power_ok irq count when USBIN_UV fires

Currently when 3 switcher_power_ok interrupts are seen within a
second, the driver thinks that the switcher is reverse boosting
and suspends USB input path.

However, switcher_power_ok could happen 3 times within a second
while AICL is run from a charger collapse, a valid usecase which
ends up in an USB suspended state.

Note that AICL run caused switcher_power_ok is accompanied by an
USBIN_UV interrupt. Use that to distinguish reverse boost Vs AICL
runs. In particular, reset the switcher_power_ok interrupt count
updated by storm_watch when an USBIN_UV interrupt is seen.

Change-Id: I6817c66319f9af03ac28324a8d863876fdadafb3
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
7 years agoqcom: smb-lib: make smb_irq_info common for smb2 and smb138x chargers
Subbaraman Narayanamurthy [Tue, 7 Feb 2017 00:22:48 +0000 (16:22 -0800)]
qcom: smb-lib: make smb_irq_info common for smb2 and smb138x chargers

Since the interrupt information for both smb2 and smb138x charger
devices are almost common, abstract it to a single smb_irq_info
struct. Also, keep an interrupt index for every interrupt which
can be used when necessary.

Change-Id: I4e42dd15a46b59c1a9c27412ca6fdff281fa71ec
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
7 years agoqcom: storm-watch: add support to reset storm count
Subbaraman Narayanamurthy [Tue, 7 Feb 2017 00:04:32 +0000 (16:04 -0800)]
qcom: storm-watch: add support to reset storm count

There are some circumstances where we have to reset the storm
watch interrupt count. Add support for it.

Change-Id: Iacbeb3258d53010aab8ba881d10de773fe54dd93
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
7 years agoqcom: qnovo: Update fcc and fv through batt psy
Harry Yang [Wed, 8 Feb 2017 05:33:19 +0000 (21:33 -0800)]
qcom: qnovo: Update fcc and fv through batt psy

To force qnovo FCC and FV through parallel framework
more conveniently, batt psy is bridged to replace votable
in qnovo driver. The two properties are -
POWER_SUPPLY_PROP_CURRENT_QNOVO and
POWER_SUPPLY_PROP_VOLTAGE_QNOVO.

CRs-Fixed: 2004173
Change-Id: I40b179fe5535e0209fcdbc1cb7e64cbfdf45a14b
Signed-off-by: Harry Yang <harryy@codeaurora.org>
7 years agoqpnp-smb2: expose forcing fcc/fv values via battery psy
Harry Yang [Fri, 10 Feb 2017 01:45:12 +0000 (17:45 -0800)]
qpnp-smb2: expose forcing fcc/fv values via battery psy

CURRENT_QNOVO and VOLTAGE_QNOVO allow "forcing" fast charge
current and float voltage value, implemented around votable
such that one can have previlige in FCC and FV voting.

CRs-Fixed: 2004173
Change-Id: I2df30220aa89e15c4bace9980990f227218a5bdd
Signed-off-by: Harry Yang <harryy@codeaurora.org>
7 years agosmb-lib: add ICL settled value to IRQ debug print
Nicholas Troast [Thu, 9 Feb 2017 18:57:28 +0000 (10:57 -0800)]
smb-lib: add ICL settled value to IRQ debug print

Print the ICL settled value within the icl-changed IRQ handler.

Change-Id: I5553abecfc5e32b24bef3525f532f4b3505c0757
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
7 years agosmb-lib: fix slave BCL for HVDCP3
Fenglin Wu [Wed, 11 Jan 2017 10:16:25 +0000 (18:16 +0800)]
smb-lib: fix slave BCL for HVDCP3

Currently, fixed 5V adapter voltage is used for calculating slave FCC.
When HVDCP 3.0 is used it skews the desired FCC distribution. Fix this
by using the HVDCP3 pulse count to determine the actual adapter voltage
when limiting the slave battery current.

Change-Id: Ib4735ffe7b6287a3e57e0f74eb24c13c6a2b7a5a
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
7 years agopower_supply: add INPUT_VOLTAGE_SETTLED property
Nicholas Troast [Sat, 28 Jan 2017 17:32:17 +0000 (09:32 -0800)]
power_supply: add INPUT_VOLTAGE_SETTLED property

INPUT_VOLTAGE_SETTLED is the negotiated adapter voltage setting.

Change-Id: I2ac529a77e8ed007c908c4f37eea718a80bc11d3
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
7 years agoARM: dts: msm: enable the chg-state-change IRQ for SMB138X
Nicholas Troast [Mon, 16 Jan 2017 22:15:22 +0000 (14:15 -0800)]
ARM: dts: msm: enable the chg-state-change IRQ for SMB138X

The chg-state-change IRQ will be used to notify when the parallel slave
charger changes its charge state. Enable it.

Change-Id: Ia57db8ec5f2263b62217c235725ee9caa07f86e4
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
7 years agosmb138x-charger: add handler for slave chg state change
Nicholas Troast [Mon, 16 Jan 2017 22:12:33 +0000 (14:12 -0800)]
smb138x-charger: add handler for slave chg state change

Add an IRQ handler function that notifies when the slave charge state
changes.

Change-Id: I359ed08c5ad289ceeabd6fa8720a959c74b6bb5e
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
7 years agoMerge "net: support __netdev_alloc_frag to always use GFP_DMA"
Linux Build Service Account [Fri, 10 Feb 2017 23:47:10 +0000 (15:47 -0800)]
Merge "net: support __netdev_alloc_frag to always use GFP_DMA"

7 years agoMerge "msm: kgsl: Fix Integer overflow in sparse_bind related functions"
Linux Build Service Account [Fri, 10 Feb 2017 23:47:10 +0000 (15:47 -0800)]
Merge "msm: kgsl: Fix Integer overflow in sparse_bind related functions"

7 years agopower_supply: Add CURRENT_QNOVO and VOLTAGE_QNOVO properties
Harry Yang [Wed, 8 Feb 2017 00:53:28 +0000 (16:53 -0800)]
power_supply: Add CURRENT_QNOVO and VOLTAGE_QNOVO properties

CURRENT_QNOVO - force fast charge current value
VOLTAGE_QNOVO - force float voltage value

CRs-Fixed: 2004173
Change-Id: I7569052fd2cb6d1ce9a3a8e69e79b950a6c62d57
Signed-off-by: Harry Yang <harryy@codeaurora.org>
7 years agoqcom: smb-lib: remove FCC_MAX votable
Harry Yang [Tue, 7 Feb 2017 21:29:57 +0000 (13:29 -0800)]
qcom: smb-lib: remove FCC_MAX votable

FCC_MAX votable was introduced as an intermediate votable used by
Qnovo driver for fast charge current vote, but does not fit in
the new requirement that Qnovo force its vote value.

Remove it.

CRs-Fixed: 2004173
Change-Id: Iff8b74113550f808546d61ef864f3935fc5d61fa
Signed-off-by: Harry Yang <harryy@codeaurora.org>
7 years agoqpnp-smb2: Add DT option for enabling input suspend on fake battery
Ashay Jaiswal [Fri, 10 Feb 2017 17:54:23 +0000 (23:24 +0530)]
qpnp-smb2: Add DT option for enabling input suspend on fake battery

Input suspend on fake battery feature is by default enabled in the
software, add a DT property to enable/disable the feature.

Change-Id: I06bda6c72010699f4be24ff6044fe3bb248b06fb
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Harry Yang <harryy@codeaurora.org>
7 years agomsm: mhi: fix latent issues in MHI drivers
Tony Truong [Thu, 31 Mar 2016 19:06:24 +0000 (12:06 -0700)]
msm: mhi: fix latent issues in MHI drivers

Incorrect checks in MHI drivers may crash the system.
Fix these checks so that MHI drivers will handle the
errors gracefully.

Change-Id: I462263799c2e76573300ed43b51e39ecba42914b
Signed-off-by: Tony Truong <truong@codeaurora.org>
7 years agoarm64: process: Update the kernel offset
Runmin Wang [Fri, 10 Feb 2017 19:59:33 +0000 (11:59 -0800)]
arm64: process: Update the kernel offset

Kernel address is relocated to the VMALLOC region. Update the check
to use KIMAGE_VADDR.

Change-Id: Ie2539a78a8180a3dbc2c8075a891e99892d809f2
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
7 years agomsm: ipa3: fix race condition in SSR
Skylar Chang [Fri, 10 Feb 2017 19:40:30 +0000 (11:40 -0800)]
msm: ipa3: fix race condition in SSR

On pipe setup, enable data path should happen for after
all pipe resources are allocated.
This change prevents a race condition where the pipe is enabled
before RX buffers are submitted to IPA.
Then, when buffers are submitted to IPA there is a race between
submitting the buffers and getting RX packets.

CRs-Fixed: 1096357
Change-Id: Ic32924b6893bb8c7813b1b8e68e03b5e09560b69
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
7 years agodefconfig: msm: Enable EL2 tlb handler
Runmin Wang [Thu, 9 Feb 2017 21:57:04 +0000 (13:57 -0800)]
defconfig: msm: Enable EL2 tlb handler

Enable QCOM_EL2_TLB_HANDLER so that tlb conflict is handled
by EL2.

Change-Id: I8af8be929293e5419d58712d742cb62fb82f8897
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
7 years agoarm64: raise exception to EL2 for sync aborts
Prasad Sodagudi [Tue, 31 Jan 2017 21:56:40 +0000 (13:56 -0800)]
arm64: raise exception to EL2 for sync aborts

Raise exception to EL2 for every EL1 sync data aborts,
so that EL2 handles the TLB conflicts.

Change-Id: Ib140599e23c399b23c12ddbeb59979d6caf5d38e
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
7 years agoconfig: Add new file msmcortex_mediabox_defconfig
Suresh Reddy Yellala [Tue, 7 Feb 2017 21:29:37 +0000 (13:29 -0800)]
config: Add new file msmcortex_mediabox_defconfig

APQ8098 Display driver is moving away from Framebuffer (CONFIG_FB)
configuration to DRM  (CONFIG_DRM) configuration.

Change-Id: Ibe19318682fcd127b5f32096ae4445ec7d2d42dd
Signed-off-by: Suresh Reddy Yellala <suresh@codeaurora.org>
7 years agoMerge "ASoC: msm: qdsp6v2: Add INT3 Tx port for LSM"
Linux Build Service Account [Fri, 10 Feb 2017 14:46:06 +0000 (06:46 -0800)]
Merge "ASoC: msm: qdsp6v2: Add INT3 Tx port for LSM"

7 years agoMerge "drivers: soc: add mutex to prevent response being processed twice"
Linux Build Service Account [Fri, 10 Feb 2017 14:46:05 +0000 (06:46 -0800)]
Merge "drivers: soc: add mutex to prevent response being processed twice"

7 years agoMerge "ARM: dts: msm: add SMB1351 charger node for SDM660 MTP"
Linux Build Service Account [Fri, 10 Feb 2017 14:46:04 +0000 (06:46 -0800)]
Merge "ARM: dts: msm: add SMB1351 charger node for SDM660 MTP"

7 years agoMerge "qpnp-smb2: support POWER_SUPPLY_PROP_CTM_CURRENT_MAX"
Linux Build Service Account [Fri, 10 Feb 2017 14:46:02 +0000 (06:46 -0800)]
Merge "qpnp-smb2: support POWER_SUPPLY_PROP_CTM_CURRENT_MAX"

7 years agoMerge "power_supply: add DIE_HEALTH and CONNECTOR_HEALTH properties"
Linux Build Service Account [Fri, 10 Feb 2017 14:46:01 +0000 (06:46 -0800)]
Merge "power_supply: add DIE_HEALTH and CONNECTOR_HEALTH properties"

7 years agoMerge "defconfig: arm64: msm-perf: Enable MSM_TZ_LOG"
Linux Build Service Account [Fri, 10 Feb 2017 14:46:00 +0000 (06:46 -0800)]
Merge "defconfig: arm64: msm-perf: Enable MSM_TZ_LOG"

7 years agoMerge "soc: qcom: Add support for Cx iPeak limit driver"
Linux Build Service Account [Fri, 10 Feb 2017 14:46:00 +0000 (06:46 -0800)]
Merge "soc: qcom: Add support for Cx iPeak limit driver"

7 years agoMerge "USB: qc_rndis: Fix aggregation parameters settings issue"
Linux Build Service Account [Fri, 10 Feb 2017 14:45:58 +0000 (06:45 -0800)]
Merge "USB: qc_rndis: Fix aggregation parameters settings issue"

7 years agoMerge "ARM: dts: msm: Add APC0/1 CPR instances for sdm630"
Linux Build Service Account [Fri, 10 Feb 2017 14:45:57 +0000 (06:45 -0800)]
Merge "ARM: dts: msm: Add APC0/1 CPR instances for sdm630"

7 years agoMerge "defconfig: msm: Enable CONFIG_MMC_RING_BUFFER for sdm660"
Linux Build Service Account [Fri, 10 Feb 2017 14:45:56 +0000 (06:45 -0800)]
Merge "defconfig: msm: Enable CONFIG_MMC_RING_BUFFER for sdm660"

7 years agoMerge "driver-core: cpu: Make isolate node read-only"
Linux Build Service Account [Fri, 10 Feb 2017 14:45:55 +0000 (06:45 -0800)]
Merge "driver-core: cpu: Make isolate node read-only"

7 years agoMerge "qpnp-smb2: Make CURRENT_MAX property writeable for usb_psy"
Linux Build Service Account [Fri, 10 Feb 2017 14:45:54 +0000 (06:45 -0800)]
Merge "qpnp-smb2: Make CURRENT_MAX property writeable for usb_psy"

7 years agoMerge "ASoC: msm: qdsp6v2: Add endianness control for USB devices"
Linux Build Service Account [Fri, 10 Feb 2017 14:45:53 +0000 (06:45 -0800)]
Merge "ASoC: msm: qdsp6v2: Add endianness control for USB devices"

7 years agoMerge "msm: rndis_ipa: Fix to incorrect state transition"
Linux Build Service Account [Fri, 10 Feb 2017 14:45:53 +0000 (06:45 -0800)]
Merge "msm: rndis_ipa: Fix to incorrect state transition"

7 years agoMerge "clk: qcom: Add qpnp clock divider support"
Linux Build Service Account [Fri, 10 Feb 2017 14:45:47 +0000 (06:45 -0800)]
Merge "clk: qcom: Add qpnp clock divider support"

7 years agoath10k: converge TLV and HL1.0 params and API
Govind Singh [Mon, 6 Feb 2017 14:20:49 +0000 (19:50 +0530)]
ath10k: converge TLV and HL1.0 params and API

HL1.0 wmi type configuration is overlapped with wmi
TLV type configuration.

converge TLV and HL1.0 params and API to remove
redundant code.

Change-Id: Ia41b300ca810495acfdab9f014f59d8cfa839ae3
Signed-off-by: Govind Singh <govinds@codeaurora.org>
7 years agotracing: Add clock trace events only for COMMON_CLK_MSM
Amit Nischal [Fri, 10 Feb 2017 12:58:34 +0000 (18:28 +0530)]
tracing: Add clock trace events only for COMMON_CLK_MSM

Clock trace events related to msm clock framework are
not required to be part of available events other that
CLK_MSM config so add the support for the same by
adding a config check.

Change-Id: I93e8d9604a58c0cb48be723d5845591e7a4b7861
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
7 years agodefconfig: Enable FG GEN3 and QNOVO configs for sdm660 32-bit
Tirupathi Reddy [Fri, 10 Feb 2017 11:50:08 +0000 (17:20 +0530)]
defconfig: Enable FG GEN3 and QNOVO configs for sdm660 32-bit

Enable the GEN3 Fuel Gauge driver and Qnovo pulse charging engine
for sdm660 32-bit platform.

CRs-Fixed: 2005232
Change-Id: Ib6a158e7e6ee55fb348dc2ef7e4eb7d40f3051a5
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
7 years agoqcom: qnovo: fix 32-bit compilation
Tirupathi Reddy [Fri, 10 Feb 2017 12:40:43 +0000 (18:10 +0530)]
qcom: qnovo: fix 32-bit compilation

Make division operations in qpnp-qnovo 32-bit compatible.

CRs-Fixed: 2005232
Change-Id: I3dd5eed9cad8b2d054993305f1c737bc81418b5f
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
7 years agoqpnp-fg-gen3: fix 32-bit compilation
Tirupathi Reddy [Fri, 10 Feb 2017 12:36:40 +0000 (18:06 +0530)]
qpnp-fg-gen3: fix 32-bit compilation

Make division operations in qpnp-fg-gen3 32-bit compatible.

CRs-Fixed: 2005232
Change-Id: I33215147d093aef3f04c46912bddd5aef284d7c4
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
7 years agoinput: keyboard: correct suspend/resume for gpio_keys
Shantanu Jain [Wed, 19 Mar 2014 14:54:22 +0000 (20:24 +0530)]
input: keyboard: correct suspend/resume for gpio_keys

Execute pinctrl operations at correct place in
suspend/resume procedure of gpio_keys driver.

Change-Id: Ic393778e35f52859512bd32ccbf6c4d1079a7e37
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
7 years agoinput: gpio_keys: Add support for pinctrl framework
Shantanu Jain [Tue, 11 Mar 2014 10:39:57 +0000 (16:09 +0530)]
input: gpio_keys: Add support for pinctrl framework

Add pinctrl framework support for gpio configuration
to gpio_keys driver.

Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Change-Id: I50c46caca0a65f8906f816e04f89610497956eea

7 years agoclk: qcom: mdss: update the clk_ops for dp_vco_divided_clk_src_mux
Padmanabhan Komanduru [Sun, 5 Feb 2017 03:46:08 +0000 (09:16 +0530)]
clk: qcom: mdss: update the clk_ops for dp_vco_divided_clk_src_mux

The fractional divider values for DP pixel clock RCG needs to be
determined dynamically. Add the recalc_rate operation for the DP
PLL mux clock dp_vco_divided_clk_src_mux which is the parent of
DP pixel clock RCG. This enables the RCG clock to calculate the
fractional dividers correctly. Modify the determine rate op for the
mux clock to also set the new parent after performing the determine
rate operation.

Change-Id: Id931a60677380ecee28eb9aec6468548898b812b
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
7 years agoARM: dts: msm: add mdss node for sdm630
Jayant Shekhar [Mon, 23 Jan 2017 11:16:31 +0000 (16:46 +0530)]
ARM: dts: msm: add mdss node for sdm630

Add mdss node for sdm630 which is used by
display driver.

Change-Id: Ie5b6448a9a6da59ea1a134db3c700e35f89da50b
Signed-off-by: Jayant Shekhar <jshekhar@codeaurora.org>
Signed-off-by: Sandeep Panda <spanda@codeaurora.org>
7 years agoARM: dts: msm: add camera focus and snapshot device nodes for SDM630
Shantanu Jain [Thu, 9 Feb 2017 12:48:19 +0000 (18:18 +0530)]
ARM: dts: msm: add camera focus and snapshot device nodes for SDM630

MSM GPIO 64 is connected to camera focus button and MSM GPIO 113 is
connected to camera snapshot button. Add the device nodes for these
buttons for SDM630 devices.

Change-Id: I7f58f3ed6e7cfa49f03ebea23cff4eae417a071b
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
7 years agoregulator: cpr4-mmss-ldo: Add GFX LDO CPR support for sdm630
Tirupathi Reddy [Wed, 1 Feb 2017 07:24:43 +0000 (12:54 +0530)]
regulator: cpr4-mmss-ldo: Add GFX LDO CPR support for sdm630

GPU subsystem in sdm630 is supplied by either LDO300(VDD_GFX)
in LDO mode or VDD_CX in BHS mode. This LDO300 is CPR managed
and supports CPR closed-loop operation.

CRs-Fixed: 2000929
Change-Id: I94d6739f9abbdba3918b118eaa29fc0bc5cbd6e7
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
7 years agoqpnp-smb2: support POWER_SUPPLY_PROP_CTM_CURRENT_MAX
Nicholas Troast [Thu, 9 Feb 2017 18:05:03 +0000 (10:05 -0800)]
qpnp-smb2: support POWER_SUPPLY_PROP_CTM_CURRENT_MAX

CTM needs to vote for USB ICL. Add support for it.

Change-Id: I88b146000f7327cf5dc7310fb721309f08dc3035
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
7 years agopower_supply: add CTM_CURRENT_MAX property
Nicholas Troast [Mon, 6 Feb 2017 03:44:33 +0000 (19:44 -0800)]
power_supply: add CTM_CURRENT_MAX property

POWER_SUPPLY_PROP_CTM_CURRENT_MAX is needed by CTM to limit USB input
current. Add it.

Change-Id: I8aac65a91959300676cf7e1c2685a557f322c509
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
7 years agopower: supply: qcom: implement die and connector health property
Nicholas Troast [Wed, 8 Feb 2017 18:47:37 +0000 (10:47 -0800)]
power: supply: qcom: implement die and connector health property

The die and connector health properties expose the comparator output of
the thermal regulation. If both die and skin temperature regulation is
enabled then the output of the comparator will be the higher of the two.
The property values can be one of: Unknown, Cool, Warm, Hot, Overheat.

Change-Id: Ic92c9cb08ec42fd2c2f26a54687a17e3b05b388f
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
7 years agopower_supply: add DIE_HEALTH and CONNECTOR_HEALTH properties
Nicholas Troast [Wed, 8 Feb 2017 18:41:06 +0000 (10:41 -0800)]
power_supply: add DIE_HEALTH and CONNECTOR_HEALTH properties

The DIE_HEALTH and CONNECTOR_HEALTH properties are used to show the
output of the thermal regulation TEMP_RANGE.

Change-Id: Ice3f159b7775084bdd0099047d4660a1e5edce98
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
7 years agosmb-lib: add support of ICL voting based on charger
Abhijeet Dharmapurikar [Wed, 8 Feb 2017 21:35:14 +0000 (13:35 -0800)]
smb-lib: add support of ICL voting based on charger

Add support to vote for ICL based on charger type.
Following are the current limit for chargers:
Legacy adapters:
CDP: 1500mA, DCP: 1800mA, HVDCP: 3000mA

TypeC Adapters:
Based on the current advertised by the adapter.

Change-Id: Ia5dbf73c29949a94e096ca6233a33c40da744140
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
7 years agodefconfig: arm64: msm-perf: Enable MSM_TZ_LOG
Matt Wagantall [Fri, 24 Jul 2015 04:08:19 +0000 (21:08 -0700)]
defconfig: arm64: msm-perf: Enable MSM_TZ_LOG

The tz_log driver is responsible for allocating the memory for the
'qsee_log' buffer. If tz_log driver is disabled and some part of the
bootchain has set the qsee_log address before Linux booted, then that
previous address will continue being used. If that address overlaps
with memory used for some other purpose, logging to qsee_log may
scribble on memory and cause a crash.

Change-Id: I10d69355beeb252115a0d91cfabfa8b9e729c969
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
7 years agoARM: dts: msm: add SMB1351 charger node for SDM660 MTP
Ashay Jaiswal [Thu, 9 Feb 2017 16:55:21 +0000 (22:25 +0530)]
ARM: dts: msm: add SMB1351 charger node for SDM660 MTP

Add SMB1351 charger node in parallel charger configuration
for SDM660.

Change-Id: Ia36a352f2728c25605b4a4a730493b99f83c8c12
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
7 years agoARM: dts: msm: Update MEM ACC corner mapping for APC0/1 for sdm630
Tirupathi Reddy [Fri, 10 Feb 2017 07:09:00 +0000 (12:39 +0530)]
ARM: dts: msm: Update MEM ACC corner mapping for APC0/1 for sdm630

Use NOM ACC settings up to TURBO voltage corner for APC0/1 for
sdm630.

CRs-Fixed: 2005083
Change-Id: Ifa50b62c5b8ae46a691d260f3517a4bc410d19c3
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
7 years agoclk: qcom: add MDSS PLL support for sdm630
Sandeep Panda [Fri, 10 Feb 2017 05:08:01 +0000 (10:38 +0530)]
clk: qcom: add MDSS PLL support for sdm630

Add the sdm630 compatible string to MDSS PLL driver
of_device_id table list, so that initialization of
MDSS PLL driver takes place for sdm630 platform.

Change-Id: I284ff9c07a4a971260ade399a2f7a605003ccf1d
Signed-off-by: Sandeep Panda <spanda@codeaurora.org>
7 years agoMerge "power: qcom-charger: add support for USBIN-USBIN parallel configuration"
Linux Build Service Account [Fri, 10 Feb 2017 06:09:30 +0000 (22:09 -0800)]
Merge "power: qcom-charger: add support for USBIN-USBIN parallel configuration"

7 years agoMerge "power: smb1351-charger: update drive to support parallel architecture"
Linux Build Service Account [Fri, 10 Feb 2017 06:09:28 +0000 (22:09 -0800)]
Merge "power: smb1351-charger: update drive to support parallel architecture"

7 years agoMerge "icnss: For WDOG bite, shutdown after FW ready"
Linux Build Service Account [Fri, 10 Feb 2017 06:09:27 +0000 (22:09 -0800)]
Merge "icnss: For WDOG bite, shutdown after FW ready"

7 years agoMerge "sched: remove sched_new_task_windows tunable"
Linux Build Service Account [Fri, 10 Feb 2017 06:09:26 +0000 (22:09 -0800)]
Merge "sched: remove sched_new_task_windows tunable"

7 years agoMerge "ARM: dts: msm: Add alias name for secondary GPU sensor in MSM8998"
Linux Build Service Account [Fri, 10 Feb 2017 06:09:26 +0000 (22:09 -0800)]
Merge "ARM: dts: msm: Add alias name for secondary GPU sensor in MSM8998"

7 years agoMerge "ARM: dts: msm: Update tsens for cluster0 mitigation profile for sdm630"
Linux Build Service Account [Fri, 10 Feb 2017 06:09:25 +0000 (22:09 -0800)]
Merge "ARM: dts: msm: Update tsens for cluster0 mitigation profile for sdm630"

7 years agoMerge "icnss: Avoid DOMAIN_ATTR_ATOMIC setting during S1 bypass"
Linux Build Service Account [Fri, 10 Feb 2017 06:09:23 +0000 (22:09 -0800)]
Merge "icnss: Avoid DOMAIN_ATTR_ATOMIC setting during S1 bypass"

7 years agoMerge "usb: host: xhci: Fix bound check for interrupter number"
Linux Build Service Account [Fri, 10 Feb 2017 06:09:22 +0000 (22:09 -0800)]
Merge "usb: host: xhci: Fix bound check for interrupter number"

7 years agoMerge "clk: qcom: update post div bits to be cleared for MMCC/GPU clocks"
Linux Build Service Account [Fri, 10 Feb 2017 06:09:21 +0000 (22:09 -0800)]
Merge "clk: qcom: update post div bits to be cleared for MMCC/GPU clocks"

7 years agoMerge "ARM: dts: msm: Add audio support for SDM630, SDA630/660"
Linux Build Service Account [Fri, 10 Feb 2017 06:09:20 +0000 (22:09 -0800)]
Merge "ARM: dts: msm: Add audio support for SDM630, SDA630/660"

7 years agoMerge "defconfig: mfd: Enable REGMAP_ALLOW_WRITE_DEBUGFS for 8998"
Linux Build Service Account [Fri, 10 Feb 2017 06:09:15 +0000 (22:09 -0800)]
Merge "defconfig: mfd: Enable REGMAP_ALLOW_WRITE_DEBUGFS for 8998"

7 years agoMerge "msm: regmap: configure REGMAP debugfs write optional"
Linux Build Service Account [Fri, 10 Feb 2017 06:09:14 +0000 (22:09 -0800)]
Merge "msm: regmap: configure REGMAP debugfs write optional"

7 years agoMerge "msm: mdss: enable dest_scaler data protection"
Linux Build Service Account [Fri, 10 Feb 2017 06:09:13 +0000 (22:09 -0800)]
Merge "msm: mdss: enable dest_scaler data protection"

7 years agoARM: dts: msm: Add APC0/1 CPR instances for sdm630
Tirupathi Reddy [Mon, 30 Jan 2017 10:12:01 +0000 (15:42 +0530)]
ARM: dts: msm: Add APC0/1 CPR instances for sdm630

Add CPR device nodes with required configuration for supporting
closed-loop operation for APC0/1 CPR instances in sdm630.

CRs-Fixed: 1117353
Change-Id: I206ef602a78802ddd15b568b1d5d1043ddfc44c0
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
7 years agopower: qcom-charger: add support for USBIN-USBIN parallel configuration
Ashay Jaiswal [Mon, 6 Feb 2017 18:01:29 +0000 (23:31 +0530)]
power: qcom-charger: add support for USBIN-USBIN parallel configuration

Add support for USBIN-USBIN configuration based parallel charging. This
involves splitting Input Current Limit(ICL) between the main and the
parallel charger, ICL re-split is done when the settled AICL of the main
charger changes by 300mA.

Change-Id: I5b916f1503a2267ca1e73b24096cb60a304e3c19
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
7 years agopower: smb1351-charger: update drive to support parallel architecture
Ashay Jaiswal [Mon, 6 Feb 2017 18:42:08 +0000 (00:12 +0530)]
power: smb1351-charger: update drive to support parallel architecture

Re-organize SMB1351 charger driver to support new parallel charger
architecture.
- New property "POWER_SUPPLY_PROP_PARALLEL_MODE" exposes the parallel
  charger configuration, in this case it is USBIN-USBIN configuration.
- Property "POWER_SUPPLY_CHARGE_TYPE" is added to report the current
  charge type and is also used for parallel charger chip detection.

Change-Id: I05692b34daef244f89a365e03043ae2ffe42d9da
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
7 years agopower: qcom-charger: add support to detect parallel charger
Abhijeet Dharmapurikar [Wed, 8 Feb 2017 21:34:01 +0000 (13:34 -0800)]
power: qcom-charger: add support to detect parallel charger

Add support to detect presence of parallel charger chip by
requesting a register read via power_supply framework.
If parallel chip is absent then disable parallel charger.

Change-Id: Icfa4a774d344fde4c7d1f4ced772a707be85020d
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
7 years agoqcom: battery: add support to delay parallel enable
Ashay Jaiswal [Thu, 2 Feb 2017 17:15:22 +0000 (22:45 +0530)]
qcom: battery: add support to delay parallel enable

Add support to delay parallel enable until HVDCP detection
and authentication completes. This involves adding a new voter
which enables parallel charger under following condition:
For DCP: enable parallel path after HVDCP detection
times out.
For HVDCP: enable parallel path after HVDCP authentication
completes.

Change-Id: Ib1c740eee5c721a0c267f6a9bc924c58af4b2c1e
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
7 years agosmb-lib: manage override in icl_callback
Abhijeet Dharmapurikar [Tue, 7 Feb 2017 02:39:19 +0000 (18:39 -0800)]
smb-lib: manage override in icl_callback

Currently we have only one path - the pd active setting path -  where
ICL_OVERRIDE gets set.

With the upcoming changes to manage connector temperature
mitigation and usbin-usbin parallel charger, the ICL_OVERRIDE is needed
to be set from these usecases.

So instead of creating a voter for ICL_OVERRIDE and putting the onus
on callsites to set it before calling their icl settings, it is best
to handle it in icl_callback.

Update the icl_callback to manage override and suspend in this way.

- Presence of voter signifies that the driver wants to enforce a
  value different than the hw default. Force an icl override.

- No voters signifies that the hw defaults are good, undo an override.

- For USB types that command a limit aka SDP and CDP, never override.

- never suspend if there are no clients.

Change-Id: I3ed01237b0bb2c028bec572d2905cabb03ce50a3
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>