OSDN Git Service
Honghao Liu [Fri, 24 Mar 2017 19:40:19 +0000 (15:40 -0400)]
ASoC: msm: qdsp6v2: support TDM to AUX_PCM loopback for BT HFP uplink
Add route from QUAT_TDM_TX_0 to AUX_PCM_RX Port Mixer and route from
INTHFP_DL_HL to AUX_PCM_RX.
CRs-fixed:
2024590
Change-Id: I395808fe9937128f0391668132a4dffdb6c60f42
Signed-off-by: Honghao Liu <honghaol@codeaurora.org>
Arun KS [Thu, 6 Apr 2017 10:15:04 +0000 (15:45 +0530)]
Merge remote-tracking branch 'remotes/origin/msm-4.4' into dev/msm-4.4-8996au
Conflicts:
arch/arm/boot/dts/qcom/msm8996pro.dtsi
arch/arm64/kernel/Makefile
drivers/leds/leds-qpnp-flash.c
sound/soc/msm/apq8096-auto.c
Change-Id: Idea5d05fec354b8f38ea70643decb03f7b80ddb7
Signed-off-by: Arun KS <arunks@codeaurora.org>
Deepak Katragadda [Fri, 7 Oct 2016 22:24:22 +0000 (15:24 -0700)]
ARM: dts: msm: Add FMAX tables for CPU and GPU clocks on MSM8996 Pro AU
Add the CPU and GPU clock FMAX tables for the MSM8996 Pro
auto target.
Change-Id: If655756b4598c20e85fd73720073b7d16ce143e9
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
Yajun Li [Thu, 9 Jun 2016 13:55:53 +0000 (21:55 +0800)]
drm:msm add iommu fault handler function
Adding iommu fault handler callback to iommu driver, which will be
called when memory fault happens.
Change-Id: Ia2486fe167b889633ea4fb4c42601791efda133c
Signed-off-by: Yajun Li <yajunl@codeaurora.org>
Signed-off-by: Yunyun Cao <yunyunc@codeaurora.org>
Jin Li [Mon, 12 Sep 2016 19:19:34 +0000 (15:19 -0400)]
drm/sde: update plane pitches when it's different than fb
Kernel DRM SDE driver doesn't know the alignment requirement from
user space, so it needs to be updated when pitches value when
they are different than fb value.
Change-Id: I392e247330980fcac87b6fbe49a289e0fc473d85
Signed-off-by: Jin Li <jinl@codeaurora.org>
Signed-off-by: Yunyun Cao <yunyunc@codeaurora.org>
Jin Li [Thu, 3 Nov 2016 14:46:51 +0000 (10:46 -0400)]
drm/sde: add panel count to support multiple bridge chips
When multiple bridge chips are connected to same interface, the
drm mode in the mode_set has combined timing parameters. For
each individual bridge chip, those timing parameters need to
be divided by panel count.
CRs-Fixed:
1085590
Change-Id: I9af0fa99ab6bcf9e09f4f7b372d53e6f1638e6d0
Signed-off-by: Jin Li <jinl@codeaurora.org>
Yunyun Cao [Tue, 14 Mar 2017 02:52:10 +0000 (10:52 +0800)]
ARM: dts: msm: enable dsi to hdmi bridge chip on 8996 auto platform
Add ADV7533 node into DRM display manager node to enable this
bridge chip on MSM8996 Auto Agave platform.
Change-Id: Ia430a14f8810d7db25f2f62104416c0d063a9ee5
Signed-off-by: Yunyun Cao <yunyunc@codeaurora.org>
Yunyun Cao [Fri, 10 Mar 2017 09:53:52 +0000 (17:53 +0800)]
ARM: dts: msm: include and refine sde display device tree
Include and refine sde display device tree to make drm kms
initialized successfully on MSM8996 Auto Agave platform.
Change-Id: Ifcf23f04710fb855c51b3e4e2a8b872ba8dec7c3
Signed-off-by: Yunyun Cao <yunyunc@codeaurora.org>
Linux Build Service Account [Thu, 6 Apr 2017 08:39:01 +0000 (01:39 -0700)]
Merge "ASoC: msm: qdsp6v2: Add support for 7 channel mapping" into dev/msm-4.4-8996au
Linux Build Service Account [Thu, 6 Apr 2017 08:38:59 +0000 (01:38 -0700)]
Merge "clk: msm: clock: Add support for early boot frequency for MSM8996" into dev/msm-4.4-8996au
Linux Build Service Account [Thu, 6 Apr 2017 08:38:58 +0000 (01:38 -0700)]
Merge "ARM: dts: msm: disable unused devices from msm8996 mojave" into dev/msm-4.4-8996au
Linux Build Service Account [Thu, 6 Apr 2017 08:38:57 +0000 (01:38 -0700)]
Merge "dma-mapping: fix build when !CONFIG_ARM_SMMU" into dev/msm-4.4-8996au
Linux Build Service Account [Thu, 6 Apr 2017 08:38:56 +0000 (01:38 -0700)]
Merge "arm64: fix build when !CONFIG_DMA_CMA" into dev/msm-4.4-8996au
Rohit Kumar [Tue, 14 Feb 2017 06:45:45 +0000 (12:15 +0530)]
ASoC: msm: qdsp6v2: Add support for 7 channel mapping
Add support for 7 channel mapping in asm to support
7 channel playback.
CRs-Fixed:
1114041
Change-Id: I0daf306d4495d3966406d05fc6328b2956a2d11f
Signed-off-by: Rohit Kumar <rohitkr@codeaurora.org>
Odelu Kukatla [Fri, 10 Feb 2017 10:45:12 +0000 (16:15 +0530)]
clk: msm: clock: Add support for early boot frequency for MSM8996
Power and perf clusters early boot up frequencies require to be
updated to maximum frequnecy of NOM voltage corner to improve
the boot up time, so add support for the same.
Change-Id: Icf54a648f47765867812edc5a68cf52b7fd58fdd
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
Atul Raut [Tue, 12 Apr 2016 22:26:42 +0000 (15:26 -0700)]
ARM: dts: msm: disable unused devices from msm8996 mojave
for boot optimisation remove synaptics and nfc device
support on automotive platform.
CRs-Fixed:
1002431
Change-Id: I324acdc51dd915069233feeb5710cb45a548c769
Signed-off-by: Atul Raut <araut@codeaurora.org>
Atul Raut [Mon, 30 Jan 2017 06:06:18 +0000 (22:06 -0800)]
dma-mapping: fix build when !CONFIG_ARM_SMMU
Allow compilation when CONFIG_ARM_SMMU is not selected by making
CONFIG_IOMMU_IO_PGTABLE_FAST depends on CONFIG_ARM64_DMA_USE_IOMMU.
Removed inclusion of dma-mapping-fast.h by dma-iommu.h.
CRs-Fixed:
2000526
Change-Id: Iadfc236f848f46e6742a98581dbfdb13c7a2695e
Signed-off-by: Atul Raut <araut@codeaurora.org>
Atul Raut [Mon, 30 Jan 2017 05:20:05 +0000 (21:20 -0800)]
arm64: fix build when !CONFIG_DMA_CMA
if !CONFIG_DMA_CMA throws error implicit declaration of function
‘dma_contiguous_early_fixup’ in routine
drivers/base/dma-removed.c:removed_dma_setup which has no
dependency over CONFIG_DMA_CMA.
Fix by removing dependency of CONFIG_DMA_CMA flag
for function dma_contiguous_early_fixup
CRs-Fixed:
1117213
Change-Id: Ife6d0399b7ae61d1781212a1ae7525378fb920fc
Signed-off-by: Atul Raut <araut@codeaurora.org>
Deepak Katragadda [Thu, 10 Mar 2016 01:37:22 +0000 (17:37 -0800)]
clk: msm: clock: Avoid turning off hmss_ahb_clk during certain LPM states
The clock driver sets the sleep_ena bit to allow the hmss_ahb_clk
to be disabled by hardware during certain low power modes. The
PCIe controller however might need to access some registers that
need this hmss_ahb_clk to be on. Remove the additional settings
in the clock driver to resolve the issue.
CRs-Fixed: 994609
Change-Id: Ib486a27f2e1c2d2231f8bedcb4ee8b39381cbd25
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
Srivatsa Vaddagiri [Thu, 6 Apr 2017 07:50:46 +0000 (13:20 +0530)]
Revert "defconfig: msm: Enable config for SPM and Event timer"
This reverts commit
e15b1696c1d2217c69fc99bc6f65df6be599a35a
which is introducing a change to defconfig (CONFIG_MSM_L2_SPM)
that is not defined in any Kconfig file
Change-Id: I4f63048880b6f4f1f840ad973686d7ff1f9cc062
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
Linux Build Service Account [Wed, 5 Apr 2017 21:05:11 +0000 (14:05 -0700)]
Merge "BACKPORT: f2fs: add a max block check for get_data_block_bmap" into dev/msm-4.4-8996au
Linux Build Service Account [Wed, 5 Apr 2017 19:17:10 +0000 (12:17 -0700)]
Merge "msm: mdss: dp: fix notifications for link training tests"
Linux Build Service Account [Wed, 5 Apr 2017 19:17:09 +0000 (12:17 -0700)]
Merge "ARM: dts: msm: Update MDSS max mixer/pipe width for sdm630"
Linux Build Service Account [Wed, 5 Apr 2017 19:17:08 +0000 (12:17 -0700)]
Merge "crypto: msm: Use appropriate logging function"
Linux Build Service Account [Wed, 5 Apr 2017 19:17:05 +0000 (12:17 -0700)]
Merge "qcom: smb1351: update CHARGING_ENABLE reporting logic"
Linux Build Service Account [Wed, 5 Apr 2017 19:17:03 +0000 (12:17 -0700)]
Merge "power_supply: add HW_CURRENT_MAX power_supply property"
Linux Build Service Account [Wed, 5 Apr 2017 19:17:02 +0000 (12:17 -0700)]
Merge "ARM: dts: msm: add regulators and clk in icnss device node for sdm630"
Linux Build Service Account [Wed, 5 Apr 2017 19:17:01 +0000 (12:17 -0700)]
Merge "sdm660: ADSPRPC: Null check file session ctx during mmap create"
Linux Build Service Account [Wed, 5 Apr 2017 19:17:00 +0000 (12:17 -0700)]
Merge "ARM: dts: msm: add regulators and clk in icnss device node for sdm660"
Linux Build Service Account [Wed, 5 Apr 2017 19:16:59 +0000 (12:16 -0700)]
Merge "ARM: dts: msm: update itech and st1031ga battery profile parameters"
Linux Build Service Account [Wed, 5 Apr 2017 19:16:57 +0000 (12:16 -0700)]
Merge "ARM: dts: msm: enable SDR104 workaround for MSM8998"
Linux Build Service Account [Wed, 5 Apr 2017 19:16:56 +0000 (12:16 -0700)]
Merge "msm: kgsl: Use legacy PM4 check instead of adreno version"
Linux Build Service Account [Wed, 5 Apr 2017 11:05:40 +0000 (04:05 -0700)]
Merge "msm: ADSPRPC: Unmap remote heap buffer only for ADSP SSR"
Linux Build Service Account [Wed, 5 Apr 2017 11:05:39 +0000 (04:05 -0700)]
Merge "power: smb-lib: update USBIN_V_VOTER usage"
Linux Build Service Account [Wed, 5 Apr 2017 11:05:38 +0000 (04:05 -0700)]
Merge "msm: pcie: support PCIe MSI QGIC with stage 1 SMMU enabled"
Linux Build Service Account [Wed, 5 Apr 2017 11:05:37 +0000 (04:05 -0700)]
Merge "Revert "defconfig: msm: Enable RCU_STALL_WATCHDOG_BITE flag""
Linux Build Service Account [Wed, 5 Apr 2017 11:05:36 +0000 (04:05 -0700)]
Merge "Input: stm: optimize the laser sensor driver"
Linux Build Service Account [Wed, 5 Apr 2017 11:05:35 +0000 (04:05 -0700)]
Merge "ARM: dts: msm: Update camera clock sources for sdm630"
Linux Build Service Account [Wed, 5 Apr 2017 11:05:34 +0000 (04:05 -0700)]
Merge "ARM: dts: msm: Add flash and OIS node to camera sensor mtp for msm8998"
Linux Build Service Account [Wed, 5 Apr 2017 10:45:47 +0000 (03:45 -0700)]
Merge "ARM: dts: msm: enable FAN regulator driver for msm8996au" into dev/msm-4.4-8996au
Linux Build Service Account [Wed, 5 Apr 2017 10:45:46 +0000 (03:45 -0700)]
Merge "regulator: core: Fix voltage change propagations to supply regulators" into dev/msm-4.4-8996au
Subbaraman Narayanamurthy [Mon, 21 Nov 2016 21:19:31 +0000 (13:19 -0800)]
ARM: dts: msm: update open loop voltage adjustment for GFX CPR on msm8996AU
As per the hardware characterization, update open loop voltage
adjustment for graphics CPR regulator on msm8996pro automotive
SOC.
Change-Id: Iae38ac2d1dd30b73fead14efa27e72c6110a2f78
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Subbaraman Narayanamurthy [Thu, 13 Oct 2016 19:50:16 +0000 (12:50 -0700)]
ARM: dts: msm: update APCC/GFX CPR regulator configuration for msm8996proAU
As per the hardware documentation, update the regulator
configuration for apc0, apc1, gfx CPR regulators to support new
speed bins in msm8996proAU.
Change-Id: I140cec39460975f6e95738322259f6a924a26a74
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Lynus Vaz [Mon, 27 Mar 2017 12:50:00 +0000 (18:20 +0530)]
msm: kgsl: Use legacy PM4 check instead of adreno version
Check for legacy PM4 commands instead of adreno version to calculate
ringbuffer space for PM4 commands that write to memory.
Change-Id: I5d1d4cfbc70bc73ddee9ee752de24aae154a04dc
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
Linux Build Service Account [Wed, 5 Apr 2017 09:50:50 +0000 (02:50 -0700)]
Merge "ARM: dts: msm: update APCC CPR configuration for msm8996proAU" into dev/msm-4.4-8996au
Subbaraman Narayanamurthy [Sat, 2 Jul 2016 01:28:02 +0000 (18:28 -0700)]
ARM: dts: msm: update APCC CPR configuration for msm8996proAU
As per the hardware documentation, update the APCC CPR controller
and regulator configurations for msm8996pro automotive SOC. This
includes disabling closed loop operation for APCC CPR and
adjusting the regulator configurations for APC0, APC1 and
APC_CBF.
Also, update the CPR configurations to support speed bin 0 only
for APCC CPR regulators on 8996pro automotive SOC.
CRs-Fixed:
1039626
Change-Id: I2eba3807aa14ca7a3a52b18866758e86eb921600
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
David Collins [Mon, 4 Apr 2016 22:16:30 +0000 (15:16 -0700)]
ARM: dts: msm: set VDD_APCC CPR IRQ affinity for CPU0/1 on msm8996pro
Set the CPR IRQ affinity of the VDD_APCC CPR3 controller to be
both cores of the APPS power cluster (i.e. CPU0 and CPU1). This
ensures that neither of the CPU cores of the performance cluster
will be woken up to service a VDD_APCC CPR IRQ which was
generated when the last performance cluster core power collapsed.
Change-Id: I055e50ffcb85622ddd67d55b44d77c342e9ec074
CRs-Fixed: 949650
Signed-off-by: David Collins <collinsd@codeaurora.org>
David Collins [Mon, 28 Mar 2016 18:58:29 +0000 (11:58 -0700)]
ARM: dts: msm: reduce CPU LDO headroom voltage for msm8996pro
Hardware characterization has shown that the CPU LDOs can
operate safely with less than 150 mV of headroom voltage.
Reduce the CPU LDO minimum allowed headroom voltage for both the
power cluster and the performance cluster in order to save power
by allowing LDO usage in more situations.
Change-Id: I72f28569d4719540fc84cf65d8783bbfec9435ad
CRs-Fixed: 989555
Signed-off-by: David Collins <collinsd@codeaurora.org>
Tirupathi Reddy [Tue, 4 Apr 2017 11:21:29 +0000 (16:51 +0530)]
ARM: dts: msm: enable FAN regulator driver for msm8996au
HALO external buck regulator is used as the VDD_GFX voltage rail
in msm8996au platform. Enable FAN53555 regulator driver that is
used to configure HALO external buck regulator.
Change-Id: I2c4744b1817263b6c461b3700ae3683d98945095
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Tirupathi Reddy [Fri, 10 Mar 2017 10:25:59 +0000 (15:55 +0530)]
regulator: core: Fix voltage change propagations to supply regulators
Some regulators support get_voltage and some support get_voltage_sel
operations. Do voltage change propagation only when the current
regulator has a minimum dropout voltage specified or if the current
regulator lacks both get_voltage and get_voltage_sel operations.
CRs-Fixed:
2018399
Change-Id: I24cc880d6a61c2cb489897d39a1b63199749c98d
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Tirupathi Reddy [Fri, 28 Oct 2016 11:10:56 +0000 (16:40 +0530)]
ARM: dts: msm: update APCC/GFX CPR regulator configuration for msm8996pro
As per the hardware documentation, update the regulator
configuration for apc0, apc1, gfx CPR regulators to support new
speed bins in msm8996pro.
CRs-Fixed:
1083423
Change-Id: I97b9b98305e3478012664b636df26299eca66f26
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Linux Build Service Account [Wed, 5 Apr 2017 09:00:39 +0000 (02:00 -0700)]
Merge "ARM: dts: msm: add VDD_APCC speed bin 1 CPR boost corner for msm8996pro" into dev/msm-4.4-8996au
Linux Build Service Account [Wed, 5 Apr 2017 09:00:37 +0000 (02:00 -0700)]
Merge "ARM: dts: msm: change the VDD_APCC CPR MinSVS fuse corner for msm8996pro" into dev/msm-4.4-8996au
Linux Build Service Account [Wed, 5 Apr 2017 09:00:36 +0000 (02:00 -0700)]
Merge "ARM: dts: msm: update VDD_GFX CPR voltage adjustments for msm8996pro" into dev/msm-4.4-8996au
Linux Build Service Account [Wed, 5 Apr 2017 09:00:35 +0000 (02:00 -0700)]
Merge "ARM: dts: msm: update VDD_APCC CPR voltage adjustments for msm8996pro" into dev/msm-4.4-8996au
Linux Build Service Account [Wed, 5 Apr 2017 09:00:33 +0000 (02:00 -0700)]
Merge "ARM: dts: msm: Add APC CPR configuration for MSM8996 speed-bin 2" into dev/msm-4.4-8996au
Sarada Prasanna Garnayak [Thu, 16 Mar 2017 14:22:47 +0000 (19:52 +0530)]
ARM: dts: msm: add regulators and clk in icnss device node for sdm630
During recovery, there are cases where in WLAN driver running on
APPS can access WLAN copy engine register causing exceptions
because of WLAN hardware in reset state.
Add voltage regulator and clk in icnss device node to vote for WLAN
hardware resources by the icnss platform driver during WLAN recovery.
CRs-Fixed:
2029173
Change-Id: I00bbad40ee152c8dac187ff1f541e34b254589cb
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Sarada Prasanna Garnayak [Thu, 16 Mar 2017 13:35:27 +0000 (19:05 +0530)]
ARM: dts: msm: add regulators and clk in icnss device node for sdm660
During recovery, there are cases where in WLAN driver running on
APPS can access WLAN copy engine register causing exceptions
because of WLAN hardware in reset state.
Add voltage regulator and clk in icnss device node to vote for WLAN
hardware resources by the icnss platform driver during WLAN recovery.
CRs-Fixed:
2029102
Change-Id: Iba785acc391fb56ea068199598ddc14d20bb3481
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
David Collins [Mon, 2 May 2016 22:45:57 +0000 (15:45 -0700)]
ARM: dts: msm: add VDD_APCC speed bin 1 CPR boost corner for msm8996pro
Add a VDD_APCC CPR boost corner of 1996.8 MHz for the power
cluster on MSM8996-Pro speed bin 1 parts.
Change-Id: I9bf29cdba47918770dbef5cd1f2631afccf26221
CRs-Fixed:
1010722
Signed-off-by: David Collins <collinsd@codeaurora.org>
David Collins [Fri, 15 Apr 2016 23:31:07 +0000 (16:31 -0700)]
ARM: dts: msm: change the VDD_APCC CPR MinSVS fuse corner for msm8996pro
Change the MinSVS fuse corner to virtual corner mapping for the
power cluster and performance cluster on MSM8996-Pro chips with
CPR fuse revision 2 or greater.
Change the mapping according to the following:
Power cluster: 1 (307.2 MHz) --> 3 (460.8 MHz)
Perf cluster: 1 (307.2 MHz) --> 4 (537.6 MHz)
Change-Id: I6b6ee6225d43605ad0f5ae1e16061acf12b49927
CRs-Fixed:
1004373
Signed-off-by: David Collins <collinsd@codeaurora.org>
David Collins [Mon, 14 Mar 2016 16:28:07 +0000 (09:28 -0700)]
ARM: dts: msm: update VDD_GFX CPR voltage adjustments for msm8996pro
Update the VDD_GFX CPR open-loop and closed-loop voltage
adjustments for MSM8996-Pro chips based upon characterization
results. This ensures stability and minimum power consumption.
Change-Id: I89b79f92bcb4cc54a050f8b0ba17f76ff471838f
CRs-Fixed: 989555
Signed-off-by: David Collins <collinsd@codeaurora.org>
David Collins [Mon, 14 Mar 2016 15:58:08 +0000 (08:58 -0700)]
ARM: dts: msm: update VDD_APCC CPR voltage adjustments for msm8996pro
Update the VDD_APCC CPR open-loop and closed-loop voltage
adjustments for MSM8996-Pro based upon characterization results.
This ensures stability and minimum power consumption. Reuse the
CPR revision 1 adjustment values for future CPR revisions (2 - 7)
for forward compatibility.
Change-Id: I42f7b696987102a38db324a1c515f1c6f01e6d45
CRs-Fixed: 989555
Signed-off-by: David Collins <collinsd@codeaurora.org>
Anirudh Ghayal [Mon, 14 Nov 2016 10:47:16 +0000 (16:17 +0530)]
ARM: dts: msm: Add APC CPR configuration for MSM8996 speed-bin 2
Speed-bin 2 supports same CPR fusing scheme as speed-bin 0,
add CPR configuration for all APC cpr regulators.
Change-Id: I3a7c826b0dd6d73f877b4cd23288a820d85ba24d
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
Tirupathi Reddy [Fri, 15 Apr 2016 12:59:52 +0000 (18:29 +0530)]
power: qcom: Modify APM timeout value for msm8953
As per msm8953 design, APM state machine could take more
than 200us for mode switching. Increase SW timeout constraint
value to 500us.
Also, update the mask used to check APM switch status.
CRs-Fixed: 992695
Change-Id: Ie0f8733fb5b39172fb14547292cbd05689a50230
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Linux Build Service Account [Wed, 5 Apr 2017 08:40:19 +0000 (01:40 -0700)]
Merge "regulator: spm-regulator: Fix the usage of the 'uV' variable" into dev/msm-4.4-8996au
Linux Build Service Account [Wed, 5 Apr 2017 08:40:18 +0000 (01:40 -0700)]
Merge "regulator: spm-regulator: Add additional settling delay for FTS2.5 SMPS" into dev/msm-4.4-8996au
Subbaraman Narayanamurthy [Thu, 13 Oct 2016 19:46:50 +0000 (12:46 -0700)]
regulator: cpr3-mmss: Increase fuse combo count
To accommodate speed bin 2 and fuse revisions associated with it
increase the fuse combo count from 16 to 24. At present, this is
needed for msm8996proAU SOC.
Change-Id: Ie781ffda433d491a38695caa5e55ec1ec7ff9b4a
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Subbaraman Narayanamurthy [Thu, 13 Oct 2016 19:49:23 +0000 (12:49 -0700)]
regulator: cpr3-hmss: Increase fuse combo count
To accommodate speed bin 2 and fuse revisions associated with it
increase the fuse combo count from 16 to 24. At present, this is
needed for msm8996proAU SOC.
Change-Id: I8555162eab2c6bfead2e0762f28525e0aa56cf10
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Tirupathi Reddy [Mon, 4 Jul 2016 04:23:14 +0000 (09:53 +0530)]
regulator: cpr3: Update temp based adjustments config
Temp_adj_en instantaneously reduces the voltage and quotient
when temperature enters into corresponding band which may cause
an aggressive reduction in voltage. Avoid this by not configuring
temp_adj_en bit, this only reduces the quotient and allows CPR to
react to the reduced quotient. Use temp_adj_en bit only when both
temperature based and core count based adjustments are desired.
CRs-Fixed:
1051076
Change-Id: Ia42dbdd095e51bf9b9b7e865c104dcbe8f4219da
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Neeraj Soni [Wed, 5 Apr 2017 06:27:57 +0000 (11:57 +0530)]
crypto: msm: Use appropriate logging function
Dynamic debug can be used to get the logs
Change-Id: I6510da111019022149190fd753a5da1cc816fffa
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
Linux Build Service Account [Wed, 5 Apr 2017 06:13:05 +0000 (23:13 -0700)]
Merge "regulator: cpr3: Use scaled gate count for aging measurements" into dev/msm-4.4-8996au
Tharun Kumar Merugu [Thu, 30 Mar 2017 09:03:56 +0000 (14:33 +0530)]
msm: ADSPRPC: Unmap remote heap buffer only for ADSP SSR
Unmap remote heap buffer only for ADSP SSR
Change-Id: I9abff20cfdcc4588a3a377e73d38d3ea91316d25
Acked-by: Himateja Reddy <hmreddy@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
Ashay Jaiswal [Tue, 4 Apr 2017 11:27:57 +0000 (16:57 +0530)]
qcom: smb1351: update CHARGING_ENABLE reporting logic
In case of parallel charging mode "parallel_charger_suspended"
variable tracks the charging enable state, update CHARGING_ENABLE
reporting to use the same.
CRs-Fixed:
2014572
Change-Id: Ib7246f407ad103343b7587b9de3ac938fb63767d
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Ashay Jaiswal [Tue, 28 Mar 2017 11:49:47 +0000 (17:19 +0530)]
qcom: smb2: disable parallel in restricted/thermal conditions
Add voting to disable parallel charger in case of restricted
charging and when system temperature level changes from normal.
Parallel charger gets re-enabled once thermal condition/FCC
restrictions are removed.
CRs-Fixed:
2014572
Change-Id: Ic26b3d93f2f3d582a2eb3c7b9ea0d27bbad24a50
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Abhijeet Dharmapurikar [Thu, 23 Mar 2017 21:07:07 +0000 (14:07 -0700)]
qcom: battery: update parallel algorithm for ICL change
Update the parallel algorithm for ICL change request.
Following steps are performed for every ICL change:
- disable parallel charger using ICL_CHANGE_VOTER
- update the new ICL and re-run AICL.
- re-enable parallel charger by removing vote of
ICL_CHANGE_VOTER.
While at it, update the 'smblib_get_prop_usb_online'
function to use voter library's locked API to get
the usb_icl_vote, this fixes the lockup that happens
when charging is enabled/disabled from usb_icl_votable's
callback function.
CRs-Fixed:
2014572
Change-Id: I7deb6a50d67471ab1aa5e1db6fff880574b4bafb
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Abhijeet Dharmapurikar [Thu, 23 Mar 2017 21:04:05 +0000 (14:04 -0700)]
qcom: battery: remove ICL_REDUCTION support
Make battery library to directly update the split current
of the main charger via power_supply framework's set_property
API using CURRENT_MAX property. ICL_REDUCTION property
is no longer required.
Note that we are not doing initial ICL vote for USBIN USBIN,
instead when time comes to split aicl, we will read the input
current limit and if nothing is set, check what the hw determined
as the max limit and use that.
For a PD charger case where the apsd result will be unknown,
the current limit is expected to be set by the time aicl settled is
called. The 30 second delaying of parallel enabling, should give
PD engine ample time to set the current limits.
While at it clean up the way settled current change is tracked. Create
a variable that specifically indicates the total settled current seen
last time settled current was adjusted. This makes compare to an updated
settled current value easy.
CRs-Fixed:
2014572
Change-Id: I040b65e6380f2c12350ea44bf32e6981ff126f18
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Ashay Jaiswal [Thu, 23 Mar 2017 05:04:18 +0000 (10:34 +0530)]
power_supply: add HW_CURRENT_MAX power_supply property
Add support for HW_CURRENT_MAX property which returns maximum
input current that can be set for an adapter. This property will
be specifically used by parallel charger to cast an initial ICL
vote.
CRs-Fixed:
2014572
Change-Id: I49e80e6b25f40791d9035bc1567fdf881914b1e8
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Ashay Jaiswal [Wed, 22 Mar 2017 17:48:51 +0000 (23:18 +0530)]
qpnp: smb-lib: move usb_icl_votable to battery library
Move usb_icl_votable creation and it's callback in the
battery.c file, in preparation for an upcoming change where
usb_icl_votable callback will be able to
disable parallel charger when a low input current
request is set.
The new callback uses CURRENT_MAX property to be set on main
psy to set the ICL limit of primary charger.
The limit setting code in main charger path where the votable
call resides currently relies a lot on client being present or not.
Since the votable is being moved away, it won't have information
about the client. So use the current parameter of INT_MAX to
indicate no clients present.
Also it could be that main psy is not instantiated by the time first
icl vote comes in. Ensure that we rerun_election on usb_icl_votable
the instant main psy is seen.
CRs-Fixed:
2014572
Change-Id: Ie449af086ed9218b40ea83158b69e8f8e73edda3
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Ashay Jaiswal [Tue, 21 Mar 2017 17:16:06 +0000 (22:46 +0530)]
qcom: smb2: disable h/w autonomous parallel control
The charger driver ensures that parallel charging remains
disabled as long as AICL is below threshole (1400mA) using
it's software voting mechanism(USBIN_I_VOTER), thus disable
hardware's autonomous control of input current based parallel
charging.
CRs-Fixed:
2014572
Change-Id: Ie991e0c1d16d63b6def6fb3379019114d20d60f7
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Ashay Jaiswal [Tue, 21 Mar 2017 06:54:16 +0000 (12:24 +0530)]
qcom: smb-lib: add delay for parallel enable
Currently, the driver enables parallel charger as soon
as a favorable charger is seen. This causes many, unnecessary
splits of AICL results as AICL runs for the first time. Besides
the detection logic could further update charger type and rerun
AICL.
Its best to simply delay enabling parallel charger for 30 seconds.
This ensures that type detection and its AICL run to completion and
parallel charging starts with a stable AICL result.
To realize this
- implement a workqueue which will be scheduled/cancelled 30 seconds
later when vbus plugin interrupt happens.
- The workqueue signifies that 30 seconds have elapsed and parallel
charging should be enabled by PL_DELAY_VOTER.
- remove PL_DELAY_HDVP_VOTER since PL_DELAY_VOTER will
ensure parallel gets enabled after 30 seconds of insertion.
- unvote from PL_DELAY_VOTER only when the typeC removal event happens.
A PR_SWAP during a sink session will keep the PL_DELAY_VOTER's vote
enabled, we expect CHG_STATE_VOTER to disable parallel since device will
be supplying VBUS and not charging the battery. This also means that
when another PR_SWAP happens and the device starts operating in sink mode
again, PL_DELAY_VOTER's vote will remain enabled and parallel charging
would begin when other conditions become favorable. IOW PL_DELAY_VOTER
tracks 30 second after physical insertion and remains unaffected by
PR_SWAPs.
CRs-Fixed:
2014572
Change-Id: Ibe10768e61c6d2661bc8946f7f6b9be06f0c28e6
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Ashay Jaiswal [Tue, 21 Mar 2017 05:45:51 +0000 (11:15 +0530)]
power: smb-lib: update USBIN_V_VOTER usage
The current code enables parallel charging if a high voltage
charger is seen (QC or PD) or a high current charger is seen.
This means that parallel charger could remain enabled when PD
transitions its voltage even though it has reduced the current
to 500mA. It is desirable to disable parallel charging during
such voltage transition.
So prepare for this change by first ensuring that only a QC
charger votes for USBIN_V_VOTER. The PD charger, even while
operating at higher voltages will need to depend on USBIN_I_VOTER,
just like a simple DCP charger, to enable parallel charger.
CRs-Fixed:
2014572
Change-Id: I03dfcff44b30b06918ebf176043873fb141f485f
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Linux Build Service Account [Wed, 5 Apr 2017 03:07:32 +0000 (20:07 -0700)]
Merge "defconfig: msm: Enable CONFIG_UID_CPUTIME flag"
Linux Build Service Account [Wed, 5 Apr 2017 03:07:31 +0000 (20:07 -0700)]
Merge "mmc: core: prefer SDR50 mode over DDR50 for SD card"
Linux Build Service Account [Wed, 5 Apr 2017 03:07:30 +0000 (20:07 -0700)]
Merge "ASoC: msm: qdsp6v2: Add support for 7 channel mapping"
Linux Build Service Account [Wed, 5 Apr 2017 03:07:29 +0000 (20:07 -0700)]
Merge "mmc: core: Increase the runtime PM reference count in try_claim_host"
Linux Build Service Account [Wed, 5 Apr 2017 03:07:29 +0000 (20:07 -0700)]
Merge "msm: kgsl: Remove incorrect check to cap AB vote to IB vote"
Linux Build Service Account [Wed, 5 Apr 2017 03:07:28 +0000 (20:07 -0700)]
Merge "msm: gsi: continue probe on ipc log failure"
Linux Build Service Account [Wed, 5 Apr 2017 03:07:27 +0000 (20:07 -0700)]
Merge "msm: kgsl: Disable memory retention for core clock before entering SLUMBER"
Linux Build Service Account [Wed, 5 Apr 2017 03:07:26 +0000 (20:07 -0700)]
Merge "mmc: core: Remove unused variable cached_ext_csd"
Linux Build Service Account [Wed, 5 Apr 2017 03:07:25 +0000 (20:07 -0700)]
Merge "ARM: dts: msm: Add dt support for platforms with audio over USBC"
Linux Build Service Account [Wed, 5 Apr 2017 03:07:24 +0000 (20:07 -0700)]
Merge "block: Make del_gendisk() safer for disks without queues"
Linux Build Service Account [Wed, 5 Apr 2017 03:07:23 +0000 (20:07 -0700)]
Merge "scsi: ufs: scale up the gear in 2 steps"
Linux Build Service Account [Wed, 5 Apr 2017 03:07:22 +0000 (20:07 -0700)]
Merge "drivers/base: cpu: Add node for core control isolation"
Linux Build Service Account [Wed, 5 Apr 2017 03:07:21 +0000 (20:07 -0700)]
Merge "ASoC: msm: qdsp6v2: add route for TERT_TDM_RX_4 playback"
Tony Truong [Fri, 24 Mar 2017 01:00:34 +0000 (18:00 -0700)]
msm: pcie: support PCIe MSI QGIC with stage 1 SMMU enabled
When Stage 1 SMMU is enabled, the QGIC doorbell address needs to
be mapped or else there will be a translation fault when an endpoint
tries to trigger an interrupt via MSI. PCIe host driver will map
this address on behalf of the client.
Change-Id: I7fdbe62daeb5dbecc459e4d9bc7832785f5b9fb7
Signed-off-by: Tony Truong <truong@codeaurora.org>
Honghao Liu [Tue, 4 Apr 2017 21:41:22 +0000 (17:41 -0400)]
ASoC: msm: support up to 8 channel capture on MM1
Update Multimedia1 FE to support up to 8 channel audio capture.
CRs-fixed:
2028896
Change-Id: I838ecd690fcdeef411d35a5facbe9c40a76b68c3
Signed-off-by: Honghao Liu <honghaol@codeaurora.org>
Tony Truong [Wed, 29 Mar 2017 19:16:51 +0000 (12:16 -0700)]
msm: pcie: update teardown sequence for PCIe MSI interrupt
Update the teardown sequence for PCIe MSI to support
multiple endpoints.
Change-Id: I1fbdb840bf3677e30d4d27a50503c5cc70ece272
Signed-off-by: Tony Truong <truong@codeaurora.org>
Linux Build Service Account [Tue, 4 Apr 2017 19:10:28 +0000 (12:10 -0700)]
Merge "pinctrl: lpi: Avoid initial SSR notifications at bootup"
Linux Build Service Account [Tue, 4 Apr 2017 19:10:27 +0000 (12:10 -0700)]
Merge "qcom: smb-lib: disable VCONN operations for micro USB mode"
Linux Build Service Account [Tue, 4 Apr 2017 19:10:26 +0000 (12:10 -0700)]
Merge "wil6210: remove HALP voting in debugfs ioblob"