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

Unverified Commit 491a7791 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'MMI-S2SN32.34-60' into android13-4.19-kona 

* tag 'MMI-S2SN32.34-60':
  ARM: dts: msm: Disable NFC dt entries on Tron
  ARM: dts: msm: Refactor the devicetree entry for RB5 boards
  ARM: dts: msm: disable IPA entry for khaje APQ targets
  ARM: dts: qcom: update nodes for quadcore devices
  ARM: dts: qcom: delete cluster1 from l2cache_pmu node
  ARM: dts: msm: disable IPA entry for khaje APQ targets
  ARM: dts: msm: Renaming seeya panels to 90Hz and 60Hz refresh rates
  ARM: dts: qcom: update nodes for quadcore devices
  ARM: dts: qcom: delete cluster1 from l2cache_pmu node
  ARM: dts: qcom: Add apq variant device tree support to Khaje
  ARM: dts: msm: Fixes for SKU4 bring up
  ARM: dts: qcom: Add smcinvoke dtsi node
  ARM: dts: msm: Add support for XR SKU4 Standalone Ref Device
  ARM: dts: msm: Set polling delay to zero for ADC thermistors on QM215
  ARM: dts: qcom: add support for AR glass display to 90 fPS
  ARM: dts: msm: increase mdp and lut clocks for khaje target
  ARM: dts: msm: Enable KPDPWR status logging
  dt-bindings: input: qpnp-power-on: Add qcom,log-kpd-event description
  ARM: dts: msm: Update GPU FMAX to 1.26GHz
  ARM: dts: msm: Remove qcom,enable-ocp-broadcast option
  ARM: dts: msm: change battery charger for AR Glass
  ARM: dts: msm: Update skin thermal zone mitigations for KHAJE
  ARM: dts: msm: Add feature config node in qfprom for Khaje
  ARM: dts: msm: Add usb3-u1u2-disable for msm-4.19 targets
  ARM: dts: msm: Add dt files for Khaje AATC
  ARM: dts: msm: Disable the IPA hw in APQ targets
  ARM: dts: msm: add CPU dai for proxy rx and tx

Change-Id: I1bc32980b45c25055c2a2a5f08c3705dc4c12727
parents 8fa64ce3 754afa56

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

+12 −0
Original line number Diff line number Diff line
@@ -62,6 +62,12 @@ SoCs: 
- KHAJE

  compatible = "qcom,khaje"



- KHAJEP

  compatible = "qcom,khajep"



- KHAJEQ

  compatible = "qcom,khajeq"



- SCUBA

  compatible = "qcom,scuba"
@@ -253,6 +259,12 @@ compatible = "qcom,bengalp-idp" 
compatible = "qcom,khaje-idp"

compatible = "qcom,khaje-qrd"

compatible = "qcom,khaje-atp"

compatible = "qcom,khajep-idp"

compatible = "qcom,khajep-qrd"

compatible = "qcom,khajeq-idp"

compatible = "qcom,khajeq-qrd"

compatible = "qcom,khajep-atp"

compatible = "qcom,khajeq-atp"

compatible = "qcom,scuba-rumi"

compatible = "qcom,scuba-idp"

compatible = "qcom,scuba-qrd"

arch/arm64/boot/dts/vendor/bindings/input/qpnp-power-on.txt

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ Optional properties: 
				power off trigger during system shutdown case.

- qcom,ps-hold-hard-reset-disable:	Boolean property to disable PS_HOLD

				power off trigger during system hard reset case.

- qcom,log-kpd-event:		Boolean property to enable logging of KPDPWR status

				during driver INIT and runtime when key is pressed.



Optional Sub-nodes:

- qcom,pon_1 ... qcom,pon_n:	These PON child nodes correspond to features

arch/arm64/boot/dts/vendor/qcom/Makefile

+74 −9
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
                kona-xrfusion-overlay.dtbo \

                kona-xrfusion-ult-overlay.dtbo \

                kona-arglass-overlay.dtbo \

                kona-xrsku4-overlay.dtbo \

                kona-hdk-overlay.dtbo



kona-cdp-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb
@@ -26,6 +27,7 @@ kona-qrd-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb 
kona-xrfusion-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-xrfusion-ult-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-arglass-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-xrsku4-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-hdk-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

else

dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \
@@ -36,6 +38,7 @@ dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \ 
        kona-xrfusion.dtb \

        kona-xrfusion-ult.dtb \

        kona-arglass.dtb \

        kona-xrsku4.dtb \

        kona-cdp.dtb \

        kona-cdp-lcd.dtb \

        kona-cdp-lcd-tron.dtb \
@@ -49,6 +52,7 @@ dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \ 
        kona-v2-xrfusion.dtb \

        kona-v2-xrfusion-ult.dtb \

        kona-v2-arglass.dtb \

        kona-v2-xrsku4.dtb \

        kona-hdk.dtb \

        kona-v2.1-mtp.dtb \

        kona-v2.1-mtp-ws.dtb \
@@ -59,8 +63,11 @@ dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \ 
        kona-v2.1-xrfusion.dtb \

        kona-v2.1-xrfusion-ult.dtb \

        kona-v2.1-arglass.dtb \

        kona-v2.1-xrsku4.dtb \

        qrb5165-iot-rb5.dtb \

        qrb5165m-iot-rb5.dtb \

        qrb5165n-iot-rb5.dtb \

        qrb5165n-v2-iot-rb5.dtb \

        kona-v2.1-iot-rb5.dtb

endif
@@ -240,27 +247,67 @@ endif 


ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

        dtbo-$(CONFIG_ARCH_KHAJE) += \

		khaje-idp-overlay.dtbo \

		khaje-atp-overlay.dtbo \

		khaje-qrd-overlay.dtbo \

		khaje-qrd-hvdcp3p5-overlay.dtbo \

		khaje-qrd-nowcd9375-overlay.dtbo \

		khaje-qrd-nopmi-overlay.dtbo \

		khaje-idp-overlay.dtbo \

		khaje-idp-nopmi-overlay.dtbo \

		khaje-idp-usbc-overlay.dtbo \

		khaje-idp-pm8010-overlay.dtbo \

		khaje-qrd-nopmi-overlay.dtbo \

		khaje-idps-display-90hz-overlay.dtbo \

		khaje-atp-overlay.dtbo

		khajep-atp-overlay.dtbo \

		khajep-qrd-overlay.dtbo \

		khajep-qrd-hvdcp3p5-overlay.dtbo \

		khajep-qrd-nowcd9375-overlay.dtbo \

		khajep-qrd-nopmi-overlay.dtbo \

		khajep-idp-overlay.dtbo \

		khajep-idp-nopmi-overlay.dtbo \

		khajep-idp-usbc-overlay.dtbo \

		khajep-idp-pm8010-overlay.dtbo \

		khajep-idps-display-90hz-overlay.dtbo \

		khajeq-atp-overlay.dtbo \

		khajeq-qrd-overlay.dtbo \

		khajeq-qrd-hvdcp3p5-overlay.dtbo \

		khajeq-qrd-nowcd9375-overlay.dtbo \

		khajeq-qrd-nopmi-overlay.dtbo \

		khajeq-idp-overlay.dtbo \

		khajeq-idp-nopmi-overlay.dtbo \

		khajeq-idp-usbc-overlay.dtbo \

		khajeq-idp-pm8010-overlay.dtbo \

		khajeq-idps-display-90hz-overlay.dtbo



khaje-atp-overlay.dtbo-base := khaje.dtb

khaje-idp-overlay.dtbo-base := khaje.dtb

khaje-qrd-overlay.dtbo-base := khaje.dtb

khaje-qrd-hvdcp3p5-overlay.dtbo-base := khaje.dtb

khaje-qrd-nowcd9375-overlay.dtbo-base := khaje.dtb

khaje-idp-nopmi-overlay.dtbo-base := khaje.dtb

khaje-idp-usbc-overlay.dtbo-base := khaje.dtb

khaje-idp-pm8010-overlay.dtbo-base := khaje.dtb

khaje-qrd-nopmi-overlay.dtbo-base := khaje.dtb

khaje-idps-display-90hz-overlay.dtbo-base := khaje.dtb

khaje-atp-overlay.dtbo-base := khaje.dtb

khaje-qrd-overlay.dtbo-base := khaje.dtb

khaje-qrd-hvdcp3p5-overlay.dtbo-base := khaje.dtb

khaje-qrd-nopmi-overlay.dtbo-base := khaje.dtb

khaje-qrd-nowcd9375-overlay.dtbo-base := khaje.dtb

khajep-atp-overlay.dtbo-base := khajep.dtb

khajep-idps-display-90hz-overlay.dtbo-base := khajep.dtb

khajep-idp-overlay.dtbo-base := khajep.dtb

khajep-idp-nopmi-overlay.dtbo-base := khajep.dtb

khajep-idp-usbc-overlay.dtbo-base := khajep.dtb

khajep-idp-pm8010-overlay.dtbo-base := khajep.dtb

khajep-qrd-overlay.dtbo-base := khajep.dtb

khajep-qrd-hvdcp3p5-overlay.dtbo-base := khajep.dtb

khajep-qrd-nowcd9375-overlay.dtbo-base := khajep.dtb

khajep-qrd-nopmi-overlay.dtbo-base := khajep.dtb

khajeq-atp-overlay.dtbo-base := khajeq.dtb

khajeq-qrd-overlay.dtbo-base := khajeq.dtb

khajeq-qrd-hvdcp3p5-overlay.dtbo-base := khajeq.dtb

khajeq-qrd-nowcd9375-overlay.dtbo-base := khajeq.dtb

khajeq-qrd-nopmi-overlay.dtbo-base := khajeq.dtb

khajeq-idps-display-90hz-overlay.dtbo-base := khajeq.dtb

khajeq-idp-overlay.dtbo-base := khajeq.dtb

khajeq-idp-nopmi-overlay.dtbo-base := khajeq.dtb

khajeq-idp-pm8010-overlay.dtbo-base := khajeq.dtb

khajeq-idp-usbc-overlay.dtbo-base := khajeq.dtb

else

dtb-$(CONFIG_ARCH_KHAJE) += khaje-idp.dtb \

		khaje-qrd.dtb \
@@ -271,7 +318,25 @@ dtb-$(CONFIG_ARCH_KHAJE) += khaje-idp.dtb \ 
		khaje-idp-pm8010.dtb \

		khaje-qrd-nopmi.dtb \

		khaje-idps-display-90hz.dtb \

		khaje-atp.dtb

		khaje-atp.dtb \

		khajep-atp.dtb \

		khajep-qrd.dtb \

		khajep-qrd-hvdcp3p5.dtb \

		khajep-idps-display-90hz.dtb \

		khajep-idp-nopmi.dtb \

		khajep-idp-usbc.dtb \

		khajep-idp-pm8010.dtb \

		khajep-qrd-nowcd9375.dtb \

		khajep-qrd-nopmi.dtb \

		khajeq-atp.dtb \

		khajeq-idps-display-90hz.dtb \

		khajeq-idp-nopmi.dtb \

		khajeq-idp-usbc.dtb \

		khajeq-idp-pm8010.dtb \

		khajeq-qrd.dtb \

		khajeq-qrd-nowcd9375.dtb \

		khajeq-qrd-hvdcp3p5.dtb \

		khajeq-qrd-nopmi.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

arch/arm64/boot/dts/vendor/qcom/dsi-panel-arglass-seeya-dual-1080p-90hz-video.dtsi

0 → 100644
+116 −0
Original line number Diff line number Diff line 
&mdss_mdp {

	dsi_dual_arglass_seeya_90hz_video: qcom,mdss_dsi_arglass_seeya_90hz_video {

	qcom,mdss-dsi-panel-name =

		"sy049wdm02 uoled video mode dsi seeya 90HZ panel with DSC";

	qcom,mdss-dsi-panel-type = "dsi_video_mode";

	qcom,dsi-ctrl-num = <0 1>;

	qcom,dsi-phy-num = <0 1>;



	qcom,mdss-dsi-virtual-channel-id = <0>;

	qcom,mdss-dsi-stream = <0>;

	qcom,mdss-dsi-bpp = <24>;

	qcom,mdss-dsi-border-color = <0>;

	qcom,mdss-dsi-traffic-mode = "non_burst_sync_event";

	qcom,mdss-dsi-bllp-eof-power-mode;

	qcom,mdss-dsi-bllp-power-mode;

	qcom,mdss-dsi-lane-0-state;

	qcom,mdss-dsi-lane-1-state;

	qcom,mdss-dsi-lane-2-state;

	qcom,mdss-dsi-lane-3-state;

	qcom,mdss-dsi-dma-trigger = "trigger_sw";

	qcom,mdss-dsi-mdp-trigger = "none";

	qcom,mdss-dsi-reset-sequence = <1 20>, <0 20>, <1 50>;

	qcom,adjust-timer-wakeup-ms = <1>;

	qcom,mdss-dsi-panel-count = <2>;

	qcom,mdss-dsi-panel-hdr-color-primaries = <14500 15500 32000

		17000 15500 30000 8000 3000>;



	qcom,mdss-dsi-display-timings {

		timing@0 {

			qcom,mdss-dsi-panel-width = <1920>;

			qcom,mdss-dsi-panel-height = <1080>;

			qcom,mdss-dsi-h-front-porch = <32>;

			qcom,mdss-dsi-h-back-porch = <32>;

			qcom,mdss-dsi-h-pulse-width = <4>;

			qcom,mdss-dsi-h-sync-skew = <0>;

			qcom,mdss-dsi-v-back-porch = <14>;

			qcom,mdss-dsi-v-front-porch = <16>;

			qcom,mdss-dsi-v-pulse-width = <2>;

			qcom,mdss-dsi-h-left-border = <0>;

			qcom,mdss-dsi-panel-framerate = <90>;

			qcom,mdss-dsi-on-command = [

				//cmd1

				39 01 00 00 00 00 02 53 29

				39 01 00 00 00 00 03 51 FF 01

				39 01 00 00 00 00 02 03 01

				39 01 00 00 00 00 07 80 01 E0 E0 0E 00 31

				39 01 00 00 00 00 08 81 03 04 00 10 00 10 00

				39 01 00 00 00 00 08 82 03 04 00 10 00 10 01

				39 01 00 00 00 00 02 35 00

				39 01 00 00 00 00 02 26 20

				//pps

				39 01 00 00 00 00 11 70 00 00 00 89 20 80 04 38

				 07 80 00 1e 03 C0 03 C0

				39 01 00 00 00 00 02 65 10

				39 01 00 00 00 00 11 70 02 00 00 00 00 20 03 B4

					00 0D 00 0C 03 50 01 E9

				39 01 00 00 00 00 02 65 20

				39 01 00 00 00 00 0D 70 18 00 10 F0 03 0C 20 00

					06 0B 0B 33

				//  cmd2 p1

				39 01 00 00 00 00 03 F0 AA 11

				39 01 00 00 00 00 02 C0 00

				39 01 00 00 00 00 09 C2 03 FF 03 FF 03 FF 03 FF

				//  cmd2 p2

				39 01 00 00 00 00 03 F0 AA 12

				39 01 00 00 00 00 03 BF 37 A9

				/* H mirror dsi1 */

				39 01 00 00 00 00 03 FF 5A 80

				39 01 00 00 00 00 02 65 2F

				39 01 00 00 00 00 02 F2 01

				39 01 00 00 00 00 02 36 02

				/* v mirror dsi0 */

				39 01 00 04 00 00 03 FF 5A 80

				39 01 00 04 00 00 02 65 2F

				39 01 00 04 00 00 02 F2 01

				39 01 00 04 00 00 02 36 01

				39 01 00 04 00 00 03 F0 AA 13

				39 01 00 04 00 00 02 65 01

				39 01 00 04 00 00 02 C1 A2

				39 01 00 04 00 00 07 C4 12 53 64 31 42 56

				39 01 00 04 00 00 03 F0 AA 16

				39 01 00 04 00 00 07 B6 12 53 64 31 42 56

				39 01 00 04 00 00 03 B0 00 55

				/* CMDs PP0 */

				39 01 00 00 00 00 03 FF 5A 80

				39 01 00 00 00 00 02 65 2F

				39 01 00 00 00 00 02 F2 01

				//cmd3 p1

				39 01 00 00 00 00 03 FF 5A 81

				39 01 00 00 00 00 02 65 05

				39 01 00 00 00 00 02 F2 22

				39 01 00 00 00 00 02 65 0A

				39 01 00 00 00 00 02 F2 00

				39 01 00 00 00 00 02 65 16

				39 01 00 00 00 00 0F F9 01 5F 61 64 67 6A 6D 6F

				 75 7B 80 86 8B 91

				05 01 00 00 14 00 01 11

				05 01 00 00 64 00 01 29

				39 01 00 00 00 00 03 F0 AA 11

			];

			qcom,mdss-dsi-off-command = [05 01 00 00 0a 00

				02 28 00 05 01 00 00 3c 00 02 10 00];



			qcom,mdss-dsi-on-command-state = "dsi_lp_mode";

			qcom,mdss-dsi-off-command-state = "dsi_hs_mode";

			qcom,compression-mode = "dsc";

			qcom,mdss-dsc-slice-height = <30>;

			qcom,mdss-dsc-slice-width = <960>;

			qcom,mdss-dsc-slice-per-pkt = <1>;

			qcom,mdss-dsc-bit-per-component = <8>;

			qcom,mdss-dsc-bit-per-pixel = <8>;

			qcom,mdss-dsc-block-prediction-enable;

			};

		};

	};

};

arch/arm64/boot/dts/vendor/qcom/dsi-panel-arglass-seeya-dual-1080p-video.dtsi

+1 −1
Original line number Diff line number Diff line 
&mdss_mdp {

	dsi_dual_arglass_seeya_video: qcom,mdss_dsi_arglass_seeya_video {

	qcom,mdss-dsi-panel-name =

		"sy049wdm02 uoled video mode dsi seeya panel with DSC";

		"sy049wdm02 uoled video mode dsi seeya 60Hz panel";

	qcom,mdss-dsi-panel-type = "dsi_video_mode";

	qcom,dsi-ctrl-num = <0 1>;

	qcom,dsi-phy-num = <0 1>;