Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 13976ba5 authored by Namratha Siddappa's avatar Namratha Siddappa
Browse files

Merge remote-tracking branch 'quic/msm-4.14' into dev/msm-4.14-display



* quic/msm-4.14:
  msm: ipa4: gsi: Remove WA of resetting  gsi channel
  msm:ipa3: endpoint config for SM6150
  ARM: dts: msm: add apss smmu support on qcs405
  ARM: dts: msm: Specify maintenance charging configuration in SM8150 MTP/QRD
  power: qpnp-fg-gen4: Add maintenance charging support
  defconfig: msm: Enable llcc_perfmon for sm8150
  ARM: dts: msm: Add llcc perfmon device for sm8150
  drivers: soc: llcc_perfmon: fix scid_status issue
  drivers: soc: llcc_perfmon: Add llcc_perfmon support
  power: qpnp-fg-gen4: Adjust recharge SOC dynamically
  mhi: core: allow setting wake db only if we're on MHI M2 state
  msm: msm_bus: Prevent double adding BCMs to query queue
  msm: ipa3: Added support for ipa 4.2 needed for SM6150
  defconfig: sm8150: Enable data flow control and power save
  defconfig: qcs405: Enable ADC configs for QCS405
  arm/arm64: defconfig: add config options for smmu on qcs405
  arm: dma-mapping: don't attach the clients to smmu device by default
  diag: Prevent accessing uninitialized diag_md_info member
  rmnet: egress burst mode qos
  backlight: qcom-spmi-wled: Expose max_avail_current for switch via sysfs
  backlight: qcom-spmi-wled: Add qpnp_wled_flash_led_prepare() API
  ARM: dts: msm: Add flash/torch devices for WLED on PM8150L
  backlight: qcom-spmi-wled: Add torch and flash support for WLED5
  power: smb5: Expose QNOVO_ENABLE property
  ARM: dts: msm: alter disable load to 0 for DSI supplies on sm8150
  sched: boost: Add a missing break
  defconfig: Enable minidump support for SM8150 target
  clk: qcom: clk-alpha-pll: Avoid reconfiguring Trion and Regera PLLs
  sched/sched_avg: make number of running tasks conservative
  sched/core_ctl: disable prev assist by default
  clk: qcom: Update the PMIC XO clocks for QCS405
  selinux: KASAN: slab-out-of-bounds in xattr_getsecurity
  defconfig: Enable QDSS bridge driver
  soc: qcom: Migrate to MHI device driver
  msm: vidc: Update enc work mode and route selection
  power: smb5: Enable updating of RECHARGE_SOC PSY property
  clk: qcom: npucc-sm8150: Minor change to the CRC enable sequence
  msm: vidc: Correct conditional check
  ARM: dts: msm: Enable dload_type selection on SM8150
  qcom: minidump: Fix stack pointer arithmetic to avoid underflow
  ipv4/GRO: Make GRO conform to RFC 6864
  Revert "GRO: Add support for TCP with fixed IPv4 ID field, limit tunnel IP ID values"
  ARM: dts: msm: Add QRD support for SM8150+SDX50
  ARM: dts: msm: Update support for GPI DMA device tree for SM6150
  clk: qcom: Add support for additional clocks for QCS405
  scsi: ufs: fix redzone overwritten error when print utp hci testbus
  mmc: block: fix one coding error
  scsi: ufs: fix two minor potential errors
  soc:qcom: Add support to log time taken ipi pings
  power: fg-memif: Add IMA support to access SRAM on GEN4 FG
  power: smb5: Fix ICL for SDP with non-compliant cable
  ARM: dts: msm:Add peripheral devices for sm8150-auto
  esoc: Increase the post power-on delay
  pinctrl: qcom: Add direct connect configuration for sm8150
  ARM: dts: msm: add graphics smmu support on qcs405
  ARM: dts: msm: Introduce smr masks for kgsl smmu for sm6150
  regulator: cpr: support corner based vdd mode switch
  msm: adsprpc: Avoid race condition during map creation and free
  ARM: dts: msm: Remove adsp memory node from video subsystem
  icnss: Add fatal error string in icnss error message
  locking/qrwlock: Prevent slowpath writers getting held up by fastpath
  locking/qrwlock, arm64: Move rwlock implementation over to qrwlocks
  locking/qrwlock: Use atomic_cond_read_acquire() when spinning in qrwlock
  locking/atomic: Add atomic_cond_read_acquire()
  locking/qrwlock: Use 'struct qrwlock' instead of 'struct __qrwlock'
  thermal: tsens: Disable Tsens interrupts during driver initialization
  msm: venc: Enable Adaptive B by default
  msm: vidc: Add vidioc_default functionality
  msm: vidc: Reduce the response wait time
  ARM: dts: msm: Update USB QMP DP PHY init sequence on SM8150
  soc: qcom: Create additional ramdump device node for SSR minidump
  soc: qcom: Add SSR minidump provision for subsystem ramdump
  soc: qcom: Add code change for SSR Minidump collection

Change-Id: Iebcd5c9f3a505941147a19770bc60d62e517c945
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents f3771ca0 ada19597
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment