Commit graph

583850 commits

Author SHA1 Message Date
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
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
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
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
Tirupathi Reddy
8a7153eed8 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>
2017-04-05 02:06:16 -07:00
Tirupathi Reddy
0d1cbc489e 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>
2017-04-05 02:05:54 -07:00
Tirupathi Reddy
6b2d105c62 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>
2017-04-05 02:03:30 -07:00
Linux Build Service Account
ddd6496772 Merge "ARM: dts: msm: add VDD_APCC speed bin 1 CPR boost corner for msm8996pro" into dev/msm-4.4-8996au 2017-04-05 02:00:39 -07:00
Linux Build Service Account
255c348041 Merge "ARM: dts: msm: change the VDD_APCC CPR MinSVS fuse corner for msm8996pro" into dev/msm-4.4-8996au 2017-04-05 02:00:37 -07:00
Linux Build Service Account
aa90161aba Merge "ARM: dts: msm: update VDD_GFX CPR voltage adjustments for msm8996pro" into dev/msm-4.4-8996au 2017-04-05 02:00:36 -07:00
Linux Build Service Account
90afbe948c Merge "ARM: dts: msm: update VDD_APCC CPR voltage adjustments for msm8996pro" into dev/msm-4.4-8996au 2017-04-05 02:00:35 -07:00
Linux Build Service Account
328285124d Merge "ARM: dts: msm: Add APC CPR configuration for MSM8996 speed-bin 2" into dev/msm-4.4-8996au 2017-04-05 02:00:33 -07:00
David Collins
daac3b2d71 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>
2017-04-05 01:48:05 -07:00
David Collins
03b8462c5b 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>
2017-04-05 01:47:36 -07:00
David Collins
d1ecba6df0 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>
2017-04-05 01:47:00 -07:00
David Collins
dc075ebfff 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>
2017-04-05 01:46:20 -07:00
Anirudh Ghayal
a1c594e172 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>
2017-04-05 01:45:06 -07:00
Tirupathi Reddy
6287056179 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>
2017-04-05 01:44:40 -07:00
Linux Build Service Account
4380bdb604 Merge "regulator: spm-regulator: Fix the usage of the 'uV' variable" into dev/msm-4.4-8996au 2017-04-05 01:40:19 -07:00
Linux Build Service Account
c8b2f82770 Merge "regulator: spm-regulator: Add additional settling delay for FTS2.5 SMPS" into dev/msm-4.4-8996au 2017-04-05 01:40:18 -07:00
Subbaraman Narayanamurthy
f42c241798 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>
2017-04-05 01:28:15 -07:00
Subbaraman Narayanamurthy
3f59e920a1 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>
2017-04-05 01:09:40 -07:00
Tirupathi Reddy
77f543a0c5 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>
2017-04-04 23:29:01 -07:00
Linux Build Service Account
62413888f1 Merge "regulator: cpr3: Use scaled gate count for aging measurements" into dev/msm-4.4-8996au 2017-04-04 23:13:05 -07:00
Honghao Liu
4183c07796 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>
2017-04-04 15:04:45 -07:00
Anirudh Ghayal
dbb187f140 regulator: spm-regulator: Fix the usage of the 'uV' variable
The commit 639277b6c73c ("regulator: spm-regulator: Add additional
settling delay for  FTS2.5 SMPS") incorrectly changed the usage
of 'uV' variable. The local 'uV' variable holds the correct voltage
level to be scaled up/down. Use it instead of vreg->uV.

CRs-Fixed: 1036738
Change-Id: I52540237a4db79c149409c6017ffc750b5abddd2
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-04-04 02:57:03 -07:00
Anirudh Ghayal
ccf84a34a4 regulator: spm-regulator: Add additional settling delay for FTS2.5 SMPS
Based on characterization add 70us settling delay on the voltage UP
to account for warm-up time and ramp-up delays for 0-10% and 90-100%
of the voltage value.

On the voltage ramp-down side add the stepper slew-rate delay and
and an additional 70us margin to avoid voltage updates while the
stepper is in progress. This could lead to voltage over/undershoot
due to buck-internal synchronization failure.

CRs-Fixed: 1036738
Change-Id: Id4230be9c4c981758bbf6860bab1f487a3b57f85
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-04-04 02:56:01 -07:00
Tirupathi Reddy
84b339bd0a regulator: cpr3: Use scaled gate count for aging measurements
Use scaled gate count (GCNT) for aging measurements to reduce
the noise effect on aging data. The amount of scaling depends
on the noise effect observed in characterization results. Use
a selected scaling factor value to derive the gate count (GCNT)
used for aging measurements.

CRs-Fixed: 1025832
Change-Id: I0eb3fb08d51ddca5cd4c08e26bc83eb9f66fd3ed
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-04-04 02:49:51 -07:00
Mark Salyzyn
c83c87fd6f BACKPORT: f2fs: add a max block check for get_data_block_bmap
(cherry pick from commit 179448bfe4cd201e98e728391c6b01b25c849fe8)

This patch adds a max block check for get_data_block_bmap.

Trinity test program will send a block number as parameter into
ioctl_fibmap, which will be used in get_node_path(), when the block
number large than f2fs max blocks, it will trigger kernel bug.

Signed-off-by: Yunlei He <heyunlei@huawei.com>
Signed-off-by: Xue Liu <liuxueliu.liu@huawei.com>
[Jaegeuk Kim: fix missing condition, pointed by Chao Yu]
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Bug: 28271368
Git-repo: https://android.googlesource.com/kernel/tegra.git
Git-commit: 3c714201e02ec08652be4b9544a5267e79bde3a9
Change-Id: Ia5acae04522993d5b60a0bcb5ccc184c66532be8
[d-cagle@codeaurora.org Resolve trivial merge conflicts]
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-03-31 17:13:39 -07:00
Srivatsa Vaddagiri
dc9763cc76 Merge "ARM: dts: msm: Update clock frequencies for msm8996AU" into dev/msm-4.4-8996au 2017-03-31 02:38:31 -07:00
Srivatsa Vaddagiri
acaa297ef8 Merge "mmc: bus: Handle error in case bus_ops suspend fails" into dev/msm-4.4-8996au 2017-03-31 02:17:57 -07:00
Srivatsa Vaddagiri
7807b8bcd3 Merge changes I63d7ce3e,I6fda5ed9 into dev/msm-4.4-8996au
* changes:
  clk: msm: clock-cpu-8996: Allow interrupts during alt_pll set_rate
  clk: msm: clock-alpha-pll: Allow interrupts to be enabled during set_rate
2017-03-31 02:15:35 -07:00
Srivatsa Vaddagiri
4a1abca7d8 Merge "ARM: dts: msm: Add support for speed bin 2 for MSM8996Pro" into dev/msm-4.4-8996au 2017-03-31 00:53:46 -07:00
Srivatsa Vaddagiri
ffdd7f4cbb Merge "can: Merge rh850.c from 3.18" into dev/msm-4.4-8996au 2017-03-30 23:55:47 -07:00
Bruce Wu
dd9b7cf9a4 can: Merge rh850.c from 3.18
1.can: Don't sent fw_br command
Older versions of rh850 get stuck when
fw_br command received.

2.can: Fix buffer calculation

3.can: rh850 support for CAN FD
This change enables dual mode for CAN raw frames and also CAN FD for property transfer with up to
64 bytes payload for both transmit and receive.

4.can: rh850 CAN FD backward compatibility
This change enables backward compatibility for previous versions of VNW framework to use legacy raw frame mode.

5.can: rh850 support for AMB mode
This enables the AMB driver mode to support
CAN FD frames sent while driver mode is AMB

Change-Id: I0b6939f29ebabeebe2fd32a26fcc67c4386a6cb4
Signed-off-by: Bruce Wu <brucewu@codeaurora.org>
2017-03-31 14:35:35 +08:00
Odelu Kukatla
52f2626ac9 ARM: dts: msm: Add support for speed bin 2 for MSM8996Pro
Add speed-bin 2 to support the fmax of 1.9GHz and 1.59GHz
for perf and power clusters respectively.
Also add speed-bin 2 to support the fmax of 510MHz for GPU clock.

Change-Id: I085d816474fff3a6d76db1fdb969b6a762867df7
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
2017-03-30 22:59:21 -07:00
Deepak Katragadda
0c37068948 ARM: dts: msm: Update clock frequencies for msm8996AU
Add the CPU and GPU clock frequency tables in device tree
to support MSM8996 auto. These overrides apply for both
v3 and pro based msm8996AU.

CRs-Fixed: 1039602
Change-Id: I092c0767570cf500886b75823f24346097676473
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
2017-03-30 22:42:34 -07:00
Honghao Liu
a674e321fb ASoC: msm: add support for TERT_TDM_RX_4 BE
Add TERT_TDM_RX_4 BE DAI link into automotive sound card
DAI link array. Add kcontrols for channel and bit format
configuration for TERT_TDM_RX_4 BE.

CRs-fixed: 2018097
Change-Id: I1fef2f6a799aeeee0752f3ae2462dcd26a1d66c9
Signed-off-by: Honghao Liu <honghaol@codeaurora.org>
2017-03-30 09:49:06 -07:00
Arun Ks
28ed62314e Merge "devfreq_spdm: Handle spurious interrupts during bootup" into dev/msm-4.4-8996au 2017-03-30 05:05:23 -07:00
Arun Ks
2a08ea3cc5 Merge "msm: msm_bus: fix the memory leak issue" into dev/msm-4.4-8996au 2017-03-30 05:03:56 -07:00
Arun Ks
8ec2379b85 Merge "msm: msm_bus: initialize the local variable" into dev/msm-4.4-8996au 2017-03-30 05:02:17 -07:00
Arun Ks
760c098d9e Merge "ARM: dts: msm: add speed bin 1 CPU clock boost frequency for msm8996pro" into dev/msm-4.4-8996au 2017-03-30 04:59:21 -07:00
Honghao Liu
0467b50811 ARM: dts: msm: support TERT_TDM_RX_4 DAI on msm8996 adp/cdp
Add TERT_TDM_RX_4 DAI in the TDM TERT RX entry and automotive
sound card entry for msm8996 automotive ADP/CDP platforms.

CRs-fixed: 2018097
Change-Id: Icbb2e9622fb58995fd063965a108d3e5fbaf42ea
Signed-off-by: Honghao Liu <honghaol@codeaurora.org>
2017-03-30 02:29:59 -07:00