summaryrefslogtreecommitdiff
path: root/arch (follow)
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | | | | | | | | | | | | | Merge "ARM: dts: msm: add MI2S and AUX PCM support for msmcobalt"Linux Build Service Account2016-09-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | ARM: dts: msm: add MI2S and AUX PCM support for msmcobaltKuirong Wang2016-09-19
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DAI nodes for MI2S and AUX PCM interfaces so the MI2S and AUX PCM DAIs are available to audio CUP dai driver. CRs-Fixed: 1047362 1047365 Change-Id: Ice01d5a829b6637c24822943ab393fb0809895cd Signed-off-by: Kuirong Wang <kuirongw@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | Merge "ARM: dts: msm: Add rpm-smd node for msmfalcon"Linux Build Service Account2016-09-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | ARM: dts: msm: Add rpm-smd node for msmfalconRaju P.L.S.S.S.N2016-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rpm-smd node for communication with RPM subsystem over glink. Change-Id: I95fb375500c649f3e986f0cde5a3ce6fa8ad27ad Signed-off-by: Raju P.L.S.S.S.N <rplsssn@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | Merge "ARM: dts: msm: add sound support for msmcobalt skuk"Linux Build Service Account2016-09-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | ARM: dts: msm: add sound support for msmcobalt skukXiaojun Sang2016-09-19
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sound node entry for msmcobalt qrd skuk to enable audio components like wsa, earpiece and microphones. CRs-Fixed: 1062729 Change-Id: I40166e423618f5e78093b22efb5ab5def517a051 Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | Merge "ARM: dts: msm: update PCIe reset clks for MSM8996 and msmcobalt"Linux Build Service Account2016-09-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | ARM: dts: msm: update PCIe reset clks for MSM8996 and msmcobaltTony Truong2016-09-19
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API for clock reset is moving to use the reset framework. To comply with this change, PCIe reset clocks need to be updated in its devicetree node for MSM8996 and msmcobalt. Change-Id: I92d6e80898f63700f040f43d133fe461ff458937 Signed-off-by: Amit Nischal <anischal@codeaurora.org> Signed-off-by: Tony Truong <truong@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | Merge "msm: camera: Add support for reset controller framework"Linux Build Service Account2016-09-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | msm: camera: Add support for reset controller frameworkAmit Nischal2016-09-12
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current api which performs the clock reset is moved to use the reset framework, so support the changes in camera driver for the same. The reset framework requires to get reset handle and perform assert/deassert of the resets. Change-Id: I5a809e464c90c29b6f69fc0bfba67bae9a9b6551 Signed-off-by: Amit Nischal <anischal@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | Merge "msm: msm_bus: introduce bus topology for msmfalcon"Linux Build Service Account2016-09-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | msm: msm_bus: introduce bus topology for msmfalconKiran Gunda2016-09-14
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce bus topology for msmfalcon. This is a representation of the bus connections in the SOC and allows the bus driver to setup bandwidth requests from clients for the paths desired. Change-Id: If58f6c5b48a023ba7f9212758d71930116156008 Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | Merge "ARM: dts: reduce on/off time for nt35597 dsc panels"Linux Build Service Account2016-09-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | ARM: dts: reduce on/off time for nt35597 dsc panelsIngrid Gallardo2016-09-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the wait on each of the commands for the on/off sequences of the nt35587 dsc command and video mode panels. This optimizes the suspend/resume delays on these panels. CRs-Fixed: 1048778 Change-Id: Ia5602cd4c612b8aacbdf27206a0a28cb50858911 Signed-off-by: Ingrid Gallardo <ingridg@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | Merge "ARM: dts: msm: add sharp 120 Hz panel support for msmcobalt"Linux Build Service Account2016-09-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | ARM: dts: msm: add sharp 120 Hz panel support for msmcobaltIngrid Gallardo2016-09-07
| |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add required settings for command mode 120Hz sharp panel in msmcobalt for CDP and MTP devices. CRs-Fixed: 1060888 Change-Id: I58d05466f5e372fb9ce3e0dd49fff07c341f6dc0 Signed-off-by: Ingrid Gallardo <ingridg@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | Merge "defconfig: msmcortex: Remove panic on SBE"Linux Build Service Account2016-09-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | defconfig: msmcortex: Remove panic on SBERunmin Wang2016-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove panic on single bit cache error because single bit error can be corrected. Change-Id: Id14ffa45a1326e47adc847c012e9ac21c6954990 Signed-off-by: Runmin Wang <runminw@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | Merge "defconfig: arm64: msmcortex: enable MSM_TZ_LOG for msmcobalt"Linux Build Service Account2016-09-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | defconfig: arm64: msmcortex: enable MSM_TZ_LOG for msmcobaltZhen Kong2016-09-15
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable TZlog driver in msmcortex-perf_defconfig to collect TZ log for msmcobalt Change-Id: I9cebd73d2165af47fb15a5916753365b4b7562bc Signed-off-by: Zhen Kong <zkong@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "defconfig: msm: enable common log for msmcobalt""Linux Build Service Account2016-09-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Revert "defconfig: msm: enable common log for msmcobalt"Shashank Mittal2016-09-14
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 49fcea4ca0b6 ("defconfig: msm: enable common log for msmcobalt") Scam dump allocation is moved to watchdog driver so common log driver is not required for perf defconfig. Change-Id: I7c189e3e4182348c05b5e9573c9039a04c70bf62 Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | Merge "ARM: dts: msm: enable scan dump for msmcobalt"Linux Build Service Account2016-09-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | ARM: dts: msm: enable scan dump for msmcobaltShashank Mittal2016-09-14
| |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to allocate memory for scan dumps for msmcobalt. This memory can be used to save CPU scan dumps at the time of a crash. Change-Id: I325bc1cb97b5a1ef2c00374b00d967e258a90a48 Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | Merge "config: msmcortex: enable qnovo driver"Linux Build Service Account2016-09-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | config: msmcortex: enable qnovo driverAbhijeet Dharmapurikar2016-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable support for Qnovo pulse engine device. This pulse engine device works with the smb2 charger device and charges the battery using pulses. CRs-Fixed: 1018090 Change-Id: Ie8b5025988cf9ad54c05ac23f3a51e74a50c8c40 Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | Merge "msm: camera: Add support for camera on version 2 of msmcobalt"Linux Build Service Account2016-09-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | msm: camera: Add support for camera on version 2 of msmcobaltViswanadha Raju Thotakura2016-09-13
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EQ bias is enabled in of msmcobalt version 2 csiphy. Differentiate this setting with new version 2 camera dt file. CRs-Fixed: 1050172 Change-Id: I5781453f2b2a81b9cf5f7fb643e021b53879583e Signed-off-by: Viswanadha Raju Thotakura <viswanad@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | Merge "ARM: dts: msm: add new clk for native playback on msmcobalt"Linux Build Service Account2016-09-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | ARM: dts: msm: add new clk for native playback on msmcobaltMeng Wang2016-09-13
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSM GPIO 69 is used as a clock for native playback on msmcobalt. Add the GPIO 69 configuration along with pinctrl information. CRs-Fixed: 1066167 Change-Id: Icd3e82a754867c0f16035a5f3eb7f86ee57c7281 Signed-off-by: Meng Wang <mwang@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | Merge "ARM: dts: msm: enable bwmon4 for cpubw monitor for msmcobalt"Linux Build Service Account2016-09-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | ARM: dts: msm: enable bwmon4 for cpubw monitor for msmcobaltDavid Keitel2016-09-15
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the qcom,hw-timer-hz property and enable qcom,bimc-bwmon4 device for msmcobalt to be able to use the BWMON2 hardware instead of the legacy BWMON hardware. Change-Id: I1d1c2e5d2fcf705d8ffd527ec7434d90cc004834 Signed-off-by: David Keitel <dkeitel@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | Merge "ARM: dts: msm: Update the GDSCs for MSMfalcon"Linux Build Service Account2016-09-15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | ARM: dts: msm: Update the GDSCs for MSMfalconTaniya Das2016-09-15
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the GDSC not present in msmfalcon and also remove few clocks which are not required to be controlled from GDSC driver. Change-Id: I284197693722912919c59ec26cfae5e382da787b Signed-off-by: Taniya Das <tdas@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | Merge "msm: kgsl: Use A540 zap shader for msmcobalt"Linux Build Service Account2016-09-15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | ARM: dts: msm: Use a540_zap for msmcobaltLokesh Batra2016-09-14
| |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the zap shader name in msmcobalt GPU DTSI. msmcobalt uses a540_zap. CRs-Fixed: 1065444 Change-Id: I4093ccb753da45d04620e2af032034518da2d83b Signed-off-by: Lokesh Batra <lbatra@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | Merge "qcom-charger: smb2: Only change wipower watts if defined in dtsi"Linux Build Service Account2016-09-15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | qcom-charger: smb2: Only change wipower watts if defined in dtsiVic Wei2016-09-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only change wipower_max_uw value if defined in device tree file. CRs-Fixed: 1064863 Change-Id: Ic64d80ee5e2f5fc79cb9220a6b2a86751dd3f0ce Signed-off-by: Vic Wei <vwei@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | Merge "defconfig: enable spss-utils driver for msmcobalt"Linux Build Service Account2016-09-15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | defconfig: enable spss-utils driver for msmcobaltAmir Samuelov2016-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Secure Processor Subsystem (SPSS) Utilities driver. This driver selects the firmware file for SPSS PIL. Change-Id: Ia9e710b9c75f2d8cffee26373ec8e56a20323563 Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
| * | | | | | | | | | | | | | | | | | | | | | | ARM: dts: msm: add spss_utils to msmcobaltAmir Samuelov2016-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add device tree info for Secure Processor Subsystem Utilities driver. Change-Id: I2657705131fcbbcc63a723b3badb3f43135b4408 Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | | Merge "scsi: ufs: Add support for reset controller framework"Linux Build Service Account2016-09-15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | scsi: ufs: Add support for reset controller frameworkAmit Nischal2016-09-13
| | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current api which performs the clock reset is moved to use the reset framework, so support the changes in ufs driver for the same. The reset framework requires to get reset handle and perform assert/deassert of the resets. Change-Id: I78d833639772cf541e563cbf9fae1aa75ec6a7da Signed-off-by: Amit Nischal <anischal@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | | Merge "ARM: dts: msm: Add SPS node for msmtriton"Linux Build Service Account2016-09-15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | ARM: dts: msm: Add SPS node for msmtritonRama Krishna Phani A2016-09-12
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SPS module to device tree. SPS (Smart Peripheral System) enables the support of all BAMs in the system which provide DMA functionality to various peripherals. Change-Id: I9fcf626fbbaaa4a15d88983de23910e02a9b57e8 Signed-off-by: Rama Krishna Phani A <rphani@codeaurora.org>
* | | | | | | | | | | | | | | | | | | | | | | Merge "Merge branch 'tmp-bab1564' into msm-4.4"Linux Build Service Account2016-09-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tmp-bab1564' into msm-4.4Runmin Wang2016-09-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | / / / / / / / / / / | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tmp-bab1564: ANDROID: mmc: Add CONFIG_MMC_SIMULATE_MAX_SPEED android: base-cfg: Add CONFIG_INET_DIAG_DESTROY cpufreq: interactive: only apply interactive boost when enabled cpufreq: interactive: fix policy locking ANDROID: dm verity fec: add sysfs attribute fec/corrected ANDROID: android: base-cfg: enable CONFIG_DM_VERITY_FEC UPSTREAM: dm verity: add ignore_zero_blocks feature UPSTREAM: dm verity: add support for forward error correction UPSTREAM: dm verity: factor out verity_for_bv_block() UPSTREAM: dm verity: factor out structures and functions useful to separate object UPSTREAM: dm verity: move dm-verity.c to dm-verity-target.c UPSTREAM: dm verity: separate function for parsing opt args UPSTREAM: dm verity: clean up duplicate hashing code UPSTREAM: dm: don't save and restore bi_private mm: Export do_munmap sdcardfs: remove unneeded __init and __exit sdcardfs: Remove unused code fs: Export d_absolute_path sdcardfs: remove effectless config option inotify: Fix erroneous update of bit count fs: sdcardfs: Declare LOOKUP_CASE_INSENSITIVE unconditionally trace: cpufreq: fix typo in min/max cpufreq sdcardfs: Add support for d_canonical_path vfs: add d_canonical_path for stacked filesystem support sdcardfs: Bring up to date with Android M permissions: Changed type-casting in packagelist management Port of sdcardfs to 4.4 Included sdcardfs source code for kernel 3.0 ANDROID: usb: gadget: Add support for MTP OS desc CHROMIUM: usb: gadget: f_accessory: add .raw_request callback CHROMIUM: usb: gadget: audio_source: add .free_func callback CHROMIUM: usb: gadget: f_mtp: fix usb_ss_ep_comp_descriptor CHROMIUM: usb: gadget: f_mtp: Add SuperSpeed support FROMLIST: mmc: block: fix ABI regression of mmc_blk_ioctl FROMLIST: mm: ASLR: use get_random_long() FROMLIST: drivers: char: random: add get_random_long() FROMLIST: pstore-ram: fix NULL reference when used with pdata usb: u_ether: Add missing rx_work init ANDROID: dm-crypt: run in a WQ_HIGHPRI workqueue misc: uid_stat: Include linux/atomic.h instead of asm/atomic.h hid-sensor-hub.c: fix wrong do_div() usage power: Provide dummy log_suspend_abort_reason() if SUSPEND is disabled PM / suspend: Add dependency on RTC_LIB drivers: power: use 'current' instead of 'get_current()' video: adf: Set ADF_MEMBLOCK to boolean video: adf: Fix modular build net: ppp: Fix modular build for PPPOLAC and PPPOPNS net: pppolac/pppopns: Replace msg.msg_iov with iov_iter_kvec() ANDROID: mmc: sdio: Disable retuning in sdio_reset_comm() ANDROID: mmc: Move tracepoint creation and export symbols ANDROID: kernel/watchdog: fix unused variable warning ANDROID: usb: gadget: f_mtp: don't use le16 for u8 field ANDROID: lowmemorykiller: fix declaration order warnings ANDROID: net: fix 'const' warnings net: diag: support v4mapped sockets in inet_diag_find_one_icsk() net: tcp: deal with listen sockets properly in tcp_abort. tcp: diag: add support for request sockets to tcp_abort() net: diag: Support destroying TCP sockets. net: diag: Support SOCK_DESTROY for inet sockets. net: diag: Add the ability to destroy a socket. net: diag: split inet_diag_dump_one_icsk into two Revert "mmc: Extend wakelock if bus is dead" Revert "mmc: core: Hold a wake lock accross delayed work + mmc rescan" ANDROID: mmc: move to a SCHED_FIFO thread Conflicts: drivers/cpufreq/cpufreq_interactive.c drivers/misc/uid_stat.c drivers/mmc/card/block.c drivers/mmc/card/queue.c drivers/mmc/card/queue.h drivers/mmc/core/core.c drivers/mmc/core/sdio.c drivers/staging/android/lowmemorykiller.c drivers/usb/gadget/function/f_mtp.c kernel/watchdog.c Signed-off-by: Runmin Wang <runminw@codeaurora.org> Change-Id: Ibb4db11c57395f67dee86211a110c462e6181552
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidAlex Shi2016-04-21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: d_canonical_path in include/linux/dcache.h
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidAlex Shi2016-04-13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | FROMLIST: mm: ASLR: use get_random_long()dcashman2016-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit https://lkml.org/lkml/2016/2/4/833) Replace calls to get_random_int() followed by a cast to (unsigned long) with calls to get_random_long(). Also address shifting bug which, in case of x86 removed entropy mask for mmap_rnd_bits values > 31 bits. Bug: 26963541 Signed-off-by: Daniel Cashman <dcashman@android.com> Signed-off-by: Daniel Cashman <dcashman@google.com> Change-Id: I36c156c9b8d7d157134895fddd4cd6efddcbee86