Unverified Commit 8f48482f authored Jan 03, 2024 by Michael Bestas

Merge commit '57477563' into android13-4.19-kona

Estimated tag: LA.UM.9.15.r1-07400-KAMORTA.QSSI13.0

* commit '57477563':
  ARM: dts: msm: Add Dynamic FPS support for SKU4
  ARM: dts: msm: Enable imx586 and imx686 for RB5 NonPop/M SOM
  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
  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

Change-Id: I85ce6994efe0406b1176b8090c2b3b31d21d9eeb

parents 102cc14c 57477563

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.

arch/arm64/boot/dts/vendor/bindings/misc/kinetics-nordic.txt

0 → 100644

+10 −0

Original line number	Diff line number	Diff line
		KINETICS-NORDIC provides a way to configure kinetics-nordic driver.

		Required properties:
		- compatible : should be "kinetics,nordic"

		Optional properties:
		Example:
		nordic {
		compatible = "kinetics,nordic";
		};

arch/arm64/boot/dts/vendor/bindings/misc/nordic-spicontroller.txt

0 → 100644

+10 −0

Original line number	Diff line number	Diff line
		NORDIC-SPICONTROLLER provides a way to configure nordic spi driver.

		Required properties:
		- compatible : should be "nordic,spicontroller"

		Optional properties:
		Example:
		nordic {
		compatible = "nordic,spicontroller";
		};