qctecmdr
5eec24fa1d
Merge "phy: qcom-ufs: Fix LF markings"
2021-02-25 11:46:50 -08:00
qctecmdr
000532774d
Merge "power: smb1351: Remove otg_vreg support for charger"
2021-02-25 11:46:50 -08:00
qctecmdr
9a4424e5a8
Merge "usb: typec: ucsi: Notify USB role switch only if partner supports USB data"
2021-02-25 11:46:49 -08:00
qctecmdr
3d7b513f5a
Merge "usb: function: f_gsi: Allow line state ioctl query"
2021-02-25 11:46:48 -08:00
qctecmdr
48d3bb2778
Merge "clk: qcom: Update halt_check flags for UFS axi clocks"
2021-02-25 11:46:48 -08:00
qctecmdr
eca62752fe
Merge "defconfig: gen3auto: add qseecom driver support"
2021-02-25 06:25:39 -08:00
qctecmdr
af5eb471b0
Merge "defconfig: Enable serial console for sdxnightjar perf build"
2021-02-25 06:25:39 -08:00
qctecmdr
1265a866c9
Merge "switch: qcom: initialize parb_phase to 0"
2021-02-25 06:25:39 -08:00
qctecmdr
b3c9c0f233
Merge "arm-smmu: Fix iommu group refcount leak"
2021-02-25 06:25:39 -08:00
qctecmdr
e28d7965d1
Merge "icnss2: Add new ipc context to log smp2p related logs"
2021-02-25 06:25:38 -08:00
qctecmdr
c276cd7a48
Merge "drivers: soc: qcom: Add snapshot of virtual subsystem notification driver"
2021-02-25 06:25:38 -08:00
qctecmdr
406e430dc8
Merge "msm: pcie: remove unnecessary global PCI device table"
2021-02-25 06:25:38 -08:00
qctecmdr
fbc73ecea6
Merge "backlight: qcom-spmi-wled: update check for OVP fault in probe"
2021-02-25 06:25:37 -08:00
qctecmdr
cfc04e4928
Merge "pinctrl: qcom: spmi-gpio: Add compatible strings for pmi632 and pm6125"
2021-02-24 20:57:37 -08:00
qctecmdr
a833e5517a
Merge "spi: spi-msm-geni: Set the mode1 for SPI slave"
2021-02-24 20:57:37 -08:00
qctecmdr
88c9d046cc
Merge "mmc: core: Set host->bus_refs properly when card is set as corrupted"
2021-02-24 20:57:37 -08:00
qctecmdr
13bbc1f008
Merge "defconfig: quinvm: Enable IPA configs"
2021-02-24 20:57:37 -08:00
qctecmdr
18afa4d355
Merge "Merge android11-5.4.61+ (364ec3d) into msm-5.4"
2021-02-24 20:57:36 -08:00
qctecmdr
c2d5eb90f0
Merge "defconfig: Enable Qseecom driver compilation for scuba"
2021-02-24 20:57:36 -08:00
qctecmdr
6c2f5bec8a
Merge "cpufreq: qcom-cpufreq-hw: Add support to dump EPSS registers"
2021-02-24 20:57:36 -08:00
Anant Goel
d4c4d565c6
drivers: soc: qcom: Add snapshot of virtual subsystem notification driver
...
Add snapshot of virtual subsystem notification driver
from msm-4.14. This snapshot is taken as of msm-4.14
commit 035eb1f641f7 ("drivers: soc: qcom: Add snapshot of
virtual subsystem notification driver").
Change-Id: I8006342906e80e10ce2b2579f0dd0d89a072a6c5
Signed-off-by: Anant Goel <anantg@codeaurora.org>
2021-02-24 10:10:27 -08:00
qctecmdr
03b56c71a2
Merge "cnss2: Add api to get pci reg dump for hang data"
2021-02-24 06:59:35 -08:00
qctecmdr
6ddda8325e
Merge "icnss2: Add handler for SMMU faults"
2021-02-24 06:59:35 -08:00
qctecmdr
0ecf216555
Merge "defconfig: sdxlemur: Enable CONFIG_QCOM_MEMORY_DUMP_V2"
2021-02-24 06:59:35 -08:00
qctecmdr
c41a4908a0
Merge "defconfig: gen3auto: Enable boot stats and boot marker"
2021-02-24 06:59:34 -08:00
qctecmdr
e0d0ced759
Merge "soc: qcom: pil: Refine error handling for SCM ICC client"
2021-02-24 06:59:34 -08:00
qctecmdr
bcb98f59d0
Merge "dt-bindings: add required macro definitions for SSPHY registers"
2021-02-24 06:59:33 -08:00
qctecmdr
ab195f7450
Merge "msm: mhi_dev: Update num_reqs for ADB channel"
2021-02-24 06:59:33 -08:00
qctecmdr
9009fb4d7e
Merge "usb: dwc3: Enable parkmode for Gen1 controllers"
2021-02-24 06:59:32 -08:00
qctecmdr
ce2b2d67c5
Merge "firmware: qcom_scm: Fix compilation with QCOM_SCM config"
2021-02-24 06:59:32 -08:00
qctecmdr
b8cb5d94c9
Merge "usb: gadget: cser: Requeue OUT USB requests if ECONNRESET is received"
2021-02-24 06:59:32 -08:00
Package Warehouse Build User
b9d505e558
Merge "usb: function: Clear function suspend related flags on config reset" into msm-5.4
2021-02-24 06:28:13 -08:00
Package Warehouse Build User
e4fe3f8351
Merge "mtd: msm_qpic_nand: Enable Pagescope read feature on sdxlemur" into msm-5.4
2021-02-24 06:28:07 -08:00
Package Warehouse Build User
5bbe9895c1
Merge "msm: Add config option for AQC glue driver" into msm-5.4
2021-02-24 06:27:55 -08:00
Package Warehouse Build User
72d7b411a9
Merge "USB: Fix compilation errors with host stack disabled" into msm-5.4
2021-02-24 06:27:36 -08:00
Package Warehouse Build User
98dbd89763
Merge "msm: ipa3: Adding IPA defconfig WLAN dependent on this flag" into msm-5.4
2021-02-24 06:27:16 -08:00
Package Warehouse Build User
1f316795dd
Merge "defconfig: Enable PMU support for sdmsteppeauto" into msm-5.4
2021-02-24 06:10:21 -08:00
Package Warehouse Build User
254f2ee0da
Merge "slim-msm-ngd: Fix unbalanced core irq disable from ndg_slim_enable" into msm-5.4
2021-02-24 06:08:38 -08:00
Package Warehouse Build User
a5cc0741d2
Merge changes I8b206eb3,I992252cd into msm-5.4
...
* changes:
defconfig: Enable Devfreq support for sdmsteppeauto
defconfig: Enable core hang detect for sdmsteppeauto
2021-02-24 06:03:57 -08:00
Package Warehouse Build User
e9d68d5a29
Merge changes I8cd97abd,I6956378e into msm-5.4
...
* changes:
defconfig: Enable service locator and notifier for sdmsteppeauto
defconfig: Enable LLCC driver for sdmsteppeauto
2021-02-24 05:58:58 -08:00
Package Warehouse Build User
bcb0ae1b30
Merge "pinctrl: qcom: Update configuration for Monaco" into msm-5.4
2021-02-24 05:57:23 -08:00
qctecmdr
7786c0199f
Merge "pinctrl: qcom: Correct sdc1 rclk offset for Shima"
2021-02-24 00:19:57 -08:00
qctecmdr
8415850e70
Merge "defconfig: sdxlemur: Enable LKDTM driver"
2021-02-24 00:19:57 -08:00
qctecmdr
254a633e55
Merge "power: smb5: Disable bat-temp irq upon debug battery detection"
2021-02-24 00:19:56 -08:00
Lijuan Gao
b1d8595341
defconfig: Enable serial console for sdxnightjar perf build
...
Enable SERIAL_MSM and SERIAL_MSM_CONSOLE config for sdxnightjar
perf build.
Change-Id: I23b06c27088278fc5bd52e2bd40ae0e694e8cb94
Signed-off-by: Lijuan Gao <lijuang@codeaurora.org>
2021-02-24 15:29:55 +08:00
Veera Vegivada
3bb6923339
clk: qcom: Update halt_check flags for UFS axi clocks
...
Update the halt_check flags to BRANCH_HALT_VOTED for UFS axi clocks.
Change-Id: Icafcb0041947a64efe828801edfe62215556ddaf
Signed-off-by: Veera Vegivada <vvegivad@codeaurora.org>
2021-02-24 11:45:47 +05:30
Naman Padhiar
f5cc043bb9
icnss2: Add new ipc context to log smp2p related logs
...
Add new ipc context to log smp2p related logs and put
aggressive logs to appropriate ipc log context to avoid
losing of critical logs.
Change-Id: Ia2a9fb8a9c724e2adc514e618abf9f032ce1ea0a
Signed-off-by: Naman Padhiar <npadhiar@codeaurora.org>
2021-02-23 22:53:02 +05:30
Xiaowen Wu
7fe1fe71c5
defconfig: gen3auto: add qseecom driver support
...
Add qseecom driver support for DP HDCP processing.
Change-Id: Id66ef91eaf24205b455411c9719680d39d25cc65
Signed-off-by: Xiaowen Wu <wxiaowen@codeaurora.org>
2021-02-23 07:42:59 -08:00
Elson Roy Serrao
e20b7664ee
usb: function: f_gsi: Allow line state ioctl query
...
As part of gsi_disable we send zero length packet to the
user space daemons(i.e. QTI/QBI). These daemons when they
receive a ZLP, query for line state to manage the open/close
of their DPM ports. Allow the line state ioctl query irrespective
of gsi connected state.
Change-Id: I4cd50c2b9273ffdeff561dbb1e4cd248cea2139b
Signed-off-by: Elson Roy Serrao <eserrao@codeaurora.org>
2021-02-23 07:08:38 -08:00
Srinivasarao P
022f93cd7d
Merge android11-5.4.61+ (364ec3d) into msm-5.4
...
* refs/heads/tmp-364ec3d:
UPSTREAM: futex: Don't enable IRQs unconditionally in put_pi_state()
UPSTREAM: futex: Handle transient "ownerless" rtmutex state correctly
UPSTREAM: futex: Fix incorrect should_fail_futex() handling
ANDROID: add macros to create OEM data fields
BACKPORT: arm64: perf: Support new DT compatibles
UPSTREAM: usb: xhci-mtk: fix unreleased bandwidth data
ANDROID: sched: add em_pd_energy vendor hook
ANDROID: schedutil: add vendor hook for adjusting util to freq calculation
ANDROID: ABI: update symbols of unisoc whitelist
Revert "BACKPORT: FROMGIT: mm: improve mprotect(R|W) efficiency on pages referenced once"
BACKPORT: FROMGIT: mm: improve mprotect(R|W) efficiency on pages referenced once
ANDROID: simplify vendor hooks for non-GKI builds
Conflicts:
kernel/sched/cpufreq_schedutil.c
Change-Id: I9e98cddb693248a3c255d7010c8aeaad85b60ced
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2021-02-23 18:05:00 +05:30