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

Unverified Commit b70ab0f1 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge remote-tracking branch 'sm8250/lineage-20' into lineage-20 

* sm8250/lineage-20:
  arm64: efi: Switch to static_assert wrapper
  BACKPORT: build_bug.h: add wrapper for _Static_assert
  vidc: Return EBUSY if mbpf check fails
  Revert "qcacld-3.0: qca6390_defconfig: Enable desc debug check."
  Revert "qcacld-3.0: qca6390_defconfig: Enable power debug."
  GKI: config: FW_CACHE: remove duplicated CONFIG_FW_CACHE
  GKI: ARM: dts: msm: disable coresight for bengal/kona/lito
  defconfig: bengal/kona/lito: enable CONFIG_CC_WERROR
  kernel: Add CC_WERROR config to turn warnings into errors
  BACKPORT: media: venus: hfi: fix the check in session buffer requirement
  ASoC: bolero: Add check for CMPDR switch
  msm:vidc_3x: reject sessions based on max mbpf
  ASoC: wcd937x: Add flag to decide RX_MUTE for HPHL and EAR
  BACKPORT: blk-mq: fix is_flush_rq
  BACKPORT: blk-mq: clearing flush request reference in tags->rqs[]
  BACKPORT: blk-mq: clear stale request in tags->rq[] before freeing one request pool
  BACKPORT: blk-mq: grab rq->refcount before calling ->fn in blk_mq_tagset_busy_iter
  ARM: msm: Add board config support for 32 bit qcm2150
  soc: qcom: socinfo: Add supprot for QCM2150 QRD soc-id
  msm: camera: sensor: Unmap DMA buffers to end access from kernel
  ASoC: msm-audio-effects-q6-v2: Add BPF order check
  dsp: q6afe: Add check for fbsp state
  dsp: q6asm: Add check for ADSP payload size
  ASoC: msm-pcm-host-voice: Check validity of session idx
  dsp: q6lsm: Address use after free for mmap handle
  ASoC: Resolve use after free in listen sound client
  dsp: q6lsm: Add check for payload buffer
  ASoC: msm-pcm-host-voice: Check validity of session idx
  dsp: q6lsm: Address use after free for mmap handle
  dsp: q6lsm: Add check for payload buffer
  ASoC: Resolve use after free in listen sound client
  ASoC: msm-lsm-client: Integer overflow check
  ASoC: dsp: q6core: Avoid use after free
  msm: camera: mem_mgr: release buffers after usage
  ASoC: msm-pcm-q6-v2: Add dsp buf check
  ASoC: msm-pcm-q6-v2: Add dsp buf check
  ARM: dts: msm: Add Dynamic FPS support for SKU4
  ARM: dts: msm: Enable imx586 and imx686 for RB5 NonPop/M SOM
  msm: camera: smmu: Use get_file to increase ref count
  ARM: dts: qcom: Add apb_bclk to enable dcc
  ARM: dts: msm: enable esd check for xr sku4 platform
  Revert "ARM: dts: msm: Add GPU pwrlevels for KONA-7230"
  ARM: dts: msm: Add cluster ID to core hang DT node
  ARM: dts: msm: update bandwidth vote to nominal values for bengal
  bindings: leds: Add torch-realtime-brightness-control property
  ARM: dts: msm: disable splash and rdump region for 7230
  ARM: dts: msm: add a dt property to restrict TPS4 pattern support
  ARM: dts: msm: Disable secondary usb controller for KONA-7230
  ARM: dts: msm: Add GPU pwrlevels for KONA-7230
  ARM: dts: msm: disable IPA entry for khaje APQ gaming targets
  ARM: dts: qcom: Disabling camera nodes for khajeg
  ARM: dts: qcom: Add apq-gaming variant device tree support to Khaje
  ARM: dts: qcom: Add device tree support for Khaje IOT
  ARM: dts: qcom: Add second trip to skin-msm-therm-usr for sxr2130
  ARM: dts: msm: Update MPM IPC register for khaje
  Revert "ARM: dts: msm: enable vsync-skew for SKU4 panel"
  ARM: dts: msm: Add gpio87 to PDC irq map for kona
  Revert "ARM: dts: msm: Remove IFE-Lite nodes"
  ARM: dts: msm: Configure PCIE2 for I210 Ethernet card
  ARM: dts: msm: Configure PCIE2 for I210 Ethernet card
  ARM: dts: msm: Configure PCIE2 for I210 Ethernet card
  ARM: dts: msm: Add configuration for ice driver in kona.dtsi
  ARM: dts: msm: enable vsync-skew for SKU4 panel
  ARM: dts: msm: Change the typical voltage for XR Reference devices
  ARM: dts: msm: configure dp as primary
  ARM: dts: msm: Remove IFE-Lite nodes
  ARM: dts: msm: dynamic aux config
  Revert "Revert "ARM: dts: msm: add dp support for rb5""
  ARM: dts: msm: Add initial support for Nordic
  ARM: dts: msm: Add initial dts support for KONA-7230
  Revert "ARM: dts: msm: add dp support for rb5"
  ARM: dts: msm: Add initial support for Nordic chip
  dt-bindings: add documentation for nordic-spicontroller
  ARM: dts: msm: update bias-voltage settings for display on bengal
  ARM: dts: msm: enable the 4-wire UART SE0 for QCS2290
  ARM: dts: msm: Add 4-wire UART SE0 dt nodes for DIAG
  ARM: dts: msm: add dp support for rb5
  ARM: dts: qcom: Add support sdm660-pm660a for SDM660
  dt-bindings: add documentation for kinetics-nordic
  ARM: dts: msm: Keep DSC properties for non-XR Kona projects
  ARM: dts: msm: add wb clk status for kona target
  dt-bindings: usb: Add genoa extcon notifier driver description
  ARM: dts: msm: Change persistence on AR Display
  ARM: dts: msm: Increase timeout for ufs phy gdsc on kona
  msm: camera: memmgr: Update copyright fix
  ARM: dts: qcom: update the subtype
  ARM: dts: msm: Add device tree files for SCUBALITE
  ARM: dts: msm: Enable CVP SMMU fault tolerance and Stall disable
  ARM: dts: qcom: Add new device tree
  ARM: dts: msm: Switching back to 60FPS to XR2 AR Glass
  asoc: changes to fix KW errors.

Change-Id: Ia641d048b1eb2188665a24acb75d6460f252001c
parents df905f07 82df9edf

Makefile

+4 −0
Original line number Diff line number Diff line
@@ -711,6 +711,10 @@ else 
KBUILD_CFLAGS   += -O2

endif



ifdef CONFIG_CC_WERROR

KBUILD_CFLAGS  += -Werror

endif



# Tell gcc to never replace conditional load with a non-conditional one

KBUILD_CFLAGS	+= $(call cc-option,--param=allow-store-data-races=0)

KBUILD_CFLAGS	+= $(call cc-option,-fno-allow-store-data-races)

arch/arm/mach-qcom/board-qm215.c

+2 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2018, 2021, The Linux Foundation. All rights reserved.

 * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include <linux/kernel.h>
@@ -10,6 +11,7 @@ 


static const char *qm215_dt_match[] __initconst = {

	"qcom,qm215",

	"qcom,qcm2150",

	NULL

};

arch/arm64/boot/dts/vendor/bindings/arm/msm/msm.txt

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ SoCs: 
- KHAJEQ

  compatible = "qcom,khajeq"



- KHAJEG

  compatible = "qcom,khajeg"



- SCUBA

  compatible = "qcom,scuba"
@@ -265,6 +268,9 @@ compatible = "qcom,khajeq-idp" 
compatible = "qcom,khajeq-qrd"

compatible = "qcom,khajep-atp"

compatible = "qcom,khajeq-atp"

compatible = "qcom,khajeg-idp"

compatible = "qcom,khajeg-qrd"

compatible = "qcom,khajeg-atp"

compatible = "qcom,scuba-rumi"

compatible = "qcom,scuba-idp"

compatible = "qcom,scuba-qrd"

arch/arm64/boot/dts/vendor/bindings/display/msm/sde-dp.txt

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ DP Controller: Required properties: 
- qcom,dp-aux-switch:		Phandle for the driver used to program the AUX switch for Display Port orientation.

- qcom,dp-hpd-gpio:		HPD gpio for direct DP connector without USB PHY or AUX switch.

- qcom,dp-gpio-aux-switch:      Gpio DP AUX switch chipset support.

- qcom,no_tps4_support:		To restrict TPS4 pattern support in link training for Display port.

- qcom,<type>-supply-entries:		A node that lists the elements of the supply used by the a particular "type" of DSI module. The module "types"

					can be "core", "ctrl", and "phy". Within the same type,

					there can be more than one instance of this binding,

arch/arm64/boot/dts/vendor/bindings/leds/leds-qpnp-flash-v2.txt

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ Optional properties: 
- qcom,ramp-down-step	: Integer property to specify flash current ramp down

			  time step. Unit is in nS. Allowed values are: 200, 400, 800, 1600,

			  3200, 6400, 12800, 25600.

- qcom,torch-realtime-brightness-control : Boolean property which enables torch realtime brightness control

				  which gives option to change brightness from torch node when it is

				  already enabled from switch node.

- qcom,short-circuit-det	: Boolean property which enables short circuit fault detection.

- qcom,open-circuit-det		: Boolean property which enables open circuit fault detection.

- qcom,vph-droop-det		: Boolean property which enables VPH droop detection.