Commit graph

587044 commits

Author SHA1 Message Date
Linux Build Service Account
acbfc1a1a4 Merge "ASoC: msm: qdsp6v2: support TDM to AUX_PCM loopback for BT HFP uplink" into dev/msm-4.4-8996au 2017-04-06 21:48:14 -07:00
Honghao Liu
440b821a0f ASoC: msm: update TDM slot mapping and FE DAI array
Update TDM slot mapping and add hostless FE DAIs for customized
sound card on automotive platform.

CRs-fixed: 2024584
Change-Id: I08c2765972405e6dfbbcd6d2590109e119b92423
Signed-off-by: Honghao Liu <honghaol@codeaurora.org>
2017-04-06 17:45:16 -04:00
Honghao Liu
449148abd8 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>
2017-04-06 11:10:48 -07:00
Arun KS
e8a49b120c 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>
2017-04-06 15:45:04 +05:30
Deepak Katragadda
9a0d24cf9f 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>
2017-04-06 02:13:03 -07:00
Yajun Li
8f626889b9 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>
2017-04-06 01:54:36 -07:00
Jin Li
280560eaac 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>
2017-04-06 01:54:18 -07:00
Jin Li
0fe164a0e3 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>
2017-04-06 01:53:56 -07:00
Yunyun Cao
6a6b7144c8 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>
2017-04-06 01:53:20 -07:00
Yunyun Cao
ad01f02a8c 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>
2017-04-06 01:42:57 -07:00
Linux Build Service Account
4fbc830131 Merge "ASoC: msm: qdsp6v2: Add support for 7 channel mapping" into dev/msm-4.4-8996au 2017-04-06 01:39:01 -07:00
Linux Build Service Account
c03f770f11 Merge "clk: msm: clock: Add support for early boot frequency for MSM8996" into dev/msm-4.4-8996au 2017-04-06 01:38:59 -07:00
Linux Build Service Account
a09e2b50c8 Merge "ARM: dts: msm: disable unused devices from msm8996 mojave" into dev/msm-4.4-8996au 2017-04-06 01:38:58 -07:00
Linux Build Service Account
8511ea1692 Merge "dma-mapping: fix build when !CONFIG_ARM_SMMU" into dev/msm-4.4-8996au 2017-04-06 01:38:57 -07:00
Linux Build Service Account
c9c5b69a21 Merge "arm64: fix build when !CONFIG_DMA_CMA" into dev/msm-4.4-8996au 2017-04-06 01:38:56 -07:00
Rohit Kumar
927f88ec52 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>
2017-04-06 01:24:04 -07:00
Odelu Kukatla
71b61f9188 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>
2017-04-06 01:23:51 -07:00
Atul Raut
a4a875c636 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>
2017-04-06 01:23:40 -07:00
Atul Raut
9aa5d67e64 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>
2017-04-06 01:23:25 -07:00
Atul Raut
f517b4d3a8 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>
2017-04-06 01:23:04 -07:00
Deepak Katragadda
407df63737 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>
2017-04-06 01:22:15 -07:00
Srivatsa Vaddagiri
57dcf47eb5 Revert "defconfig: msm: Enable config for SPM and Event timer"
This reverts commit e15b1696c1
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>
2017-04-06 13:26:10 +05:30
Linux Build Service Account
3f7e49b533 Merge "BACKPORT: f2fs: add a max block check for get_data_block_bmap" into dev/msm-4.4-8996au 2017-04-05 14:05:11 -07:00
Linux Build Service Account
a3851309db Merge "msm: mdss: dp: fix notifications for link training tests" 2017-04-05 12:17:10 -07:00
Linux Build Service Account
d850fccd93 Merge "ARM: dts: msm: Update MDSS max mixer/pipe width for sdm630" 2017-04-05 12:17:09 -07:00
Linux Build Service Account
bfdd19a48e Merge "crypto: msm: Use appropriate logging function" 2017-04-05 12:17:08 -07:00
Linux Build Service Account
9e160e7f8b Merge "qcom: smb1351: update CHARGING_ENABLE reporting logic" 2017-04-05 12:17:04 -07:00
Linux Build Service Account
8f91cc1fa4 Merge "power_supply: add HW_CURRENT_MAX power_supply property" 2017-04-05 12:17:03 -07:00
Linux Build Service Account
6e2c59ad47 Merge "ARM: dts: msm: add regulators and clk in icnss device node for sdm630" 2017-04-05 12:17:02 -07:00
Linux Build Service Account
c9b6da0d6c Merge "sdm660: ADSPRPC: Null check file session ctx during mmap create" 2017-04-05 12:17:01 -07:00
Linux Build Service Account
3016150b12 Merge "ARM: dts: msm: add regulators and clk in icnss device node for sdm660" 2017-04-05 12:17:00 -07:00
Linux Build Service Account
17e5e6be4b Merge "ARM: dts: msm: update itech and st1031ga battery profile parameters" 2017-04-05 12:16:59 -07:00
Linux Build Service Account
bbc2d362eb Merge "ARM: dts: msm: enable SDR104 workaround for MSM8998" 2017-04-05 12:16:56 -07:00
Linux Build Service Account
b8d554f7cb Merge "msm: kgsl: Use legacy PM4 check instead of adreno version" 2017-04-05 12:16:55 -07:00
Linux Build Service Account
c5751be200 Merge "msm: ADSPRPC: Unmap remote heap buffer only for ADSP SSR" 2017-04-05 04:05:40 -07:00
Linux Build Service Account
85cd9a2afb Merge "power: smb-lib: update USBIN_V_VOTER usage" 2017-04-05 04:05:39 -07:00
Linux Build Service Account
0645e1acd6 Merge "msm: pcie: support PCIe MSI QGIC with stage 1 SMMU enabled" 2017-04-05 04:05:37 -07:00
Linux Build Service Account
d7d5fb015b Merge "Revert "defconfig: msm: Enable RCU_STALL_WATCHDOG_BITE flag"" 2017-04-05 04:05:37 -07:00
Linux Build Service Account
078448a790 Merge "Input: stm: optimize the laser sensor driver" 2017-04-05 04:05:36 -07:00
Linux Build Service Account
e81f37a9e5 Merge "ARM: dts: msm: Update camera clock sources for sdm630" 2017-04-05 04:05:35 -07:00
Linux Build Service Account
61aa6bdf98 Merge "ARM: dts: msm: Add flash and OIS node to camera sensor mtp for msm8998" 2017-04-05 04:05:34 -07:00
Linux Build Service Account
bbb98a633c Merge "ARM: dts: msm: enable FAN regulator driver for msm8996au" into dev/msm-4.4-8996au 2017-04-05 03:45:47 -07:00
Linux Build Service Account
e9ffd2832d Merge "regulator: core: Fix voltage change propagations to supply regulators" into dev/msm-4.4-8996au 2017-04-05 03:45:46 -07:00
Subbaraman Narayanamurthy
58a6e682cb 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>
2017-04-05 03:36:04 -07:00
Subbaraman Narayanamurthy
06b81f055c 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>
2017-04-05 03:21:21 -07:00
Lynus Vaz
341934ba38 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>
2017-04-05 03:07:24 -07:00
Linux Build Service Account
f41d7c8239 Merge "ARM: dts: msm: update APCC CPR configuration for msm8996proAU" into dev/msm-4.4-8996au 2017-04-05 02:50:50 -07:00
Subbaraman Narayanamurthy
f65d09a188 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>
2017-04-05 02:40:10 -07:00
David Collins
d6a2cb240f 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>
2017-04-05 02:39:30 -07:00
David Collins
80e624f173 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>
2017-04-05 02:23:30 -07:00