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

Commit 00da8d6b authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge a9e3f7ef on remote branch 

Change-Id: If2b94d8de9013345dd8d0dc3904df8dbe7ef90fd
parents 754afa56 a9e3f7ef

qcom/Makefile

+9 −2
Original line number Diff line number Diff line
@@ -214,7 +214,9 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		scuba-iot-idp-overlay.dtbo \

		scuba-iot-idp-usbc-overlay.dtbo \

		scuba-iot-qrd-eldo-overlay.dtbo \

		scuba-iot-qrd-non-eldo-overlay.dtbo

		scuba-iot-qrd-non-eldo-overlay.dtbo \

		scuba-iot-rb1-overlay.dtbo \

		scubalite-iot-idp-overlay.dtbo



scuba-rumi-overlay.dtbo-base := scuba.dtb scubap.dtb scuba-2gb.dtb

scuba-idp-overlay.dtbo-base := scuba.dtb scubap.dtb scuba-2gb.dtb
@@ -224,7 +226,9 @@ scuba-idp-usbc-overlay.dtbo-base := scuba.dtb scubap.dtb scuba-2gb.dtb 
scuba-iot-idp-overlay.dtbo-base := scuba-iot.dtb scuba-iot-2gb.dtb scubap-iot.dtb scubap-iot-idp.dtb scubap-iot-idp-2gb.dtb

scuba-iot-qrd-eldo-overlay.dtbo-base := scuba-iot.dtb scubap-iot.dtb scuba-iot-2gb.dtb

scuba-iot-qrd-non-eldo-overlay.dtbo-base := scuba-iot.dtb scubap-iot.dtb scuba-iot-2gb.dtb

scuba-iot-rb1-overlay.dtbo-base := scubap-iot-2gb.dtb

scuba-iot-idp-usbc-overlay.dtbo-base := scuba-iot.dtb scubap-iot.dtb scuba-iot-2gb.dtb

scubalite-iot-idp-overlay.dtbo-base := scuba-iot-2gb.dtb scubap-iot-2gb.dtb

else

dtb-$(CONFIG_ARCH_SCUBA) += scuba-rumi.dtb \

	scuba-idp.dtb \
@@ -240,9 +244,12 @@ dtb-$(CONFIG_ARCH_SCUBA) += scuba-rumi.dtb \ 
	scubap-iot-idp.dtb \

	scuba-iot-qrd-eldo.dtb \

	scuba-iot-qrd-non-eldo.dtb \

	scubap-iot-rb1-2gb.dtb \

	scubap-iot-idp-2gb.dtb \

	scuba-iot-idp-2gb.dtb \

	scuba-iot-idp-usbc-2gb.dtb

	scuba-iot-idp-usbc-2gb.dtb \

	scubalite-iot-idp-2gb.dtb \

	scubaplite-iot-idp-2gb.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

qcom/dsi-panel-arglass-seeya-dual-1080p-video.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
				/* 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 0C C2 03 FF 03 FF 03 FF 03 FF 82 00 00

				39 01 00 00 00 00 0C C2 01 32 01 32 01 32 01 32 02 00 00

				/* CMD2 P2 */

				39 01 00 00 00 00 03 F0 AA 12

				39 01 00 00 00 00 03 BF 37 A9

qcom/kona-arglass.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ 
	/delete-property/ avdd-supply;

	lab-supply = <&lcdb_ldo_vreg>;

	ibb-supply = <&lcdb_ncp_vreg>;

	qcom,dsi-default-panel = <&dsi_dual_arglass_seeya_90hz_video>;

	qcom,dsi-default-panel = <&dsi_dual_arglass_seeya_video>;

};



&display_panel_avdd {

qcom/kona-cvp.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
				<&apps_smmu 0x2120 0x400>;

			buffer-types = <0xfff>;

			qcom,iommu-dma-addr-pool = <0x4b000000 0x90000000>;

			qcom,iommu-faults = "non-fatal", "stall-disable";

		};
@@ -72,6 +73,7 @@ 
			buffer-types = <0x741>;

			qcom,iommu-dma-addr-pool = <0x01000000 0x25800000>;

			qcom,iommu-vmid = <0xB>;

			qcom,iommu-faults = "non-fatal", "stall-disable";

		};



		cvp_secure_pixel_cb {
@@ -82,6 +84,7 @@ 
			buffer-types = <0x106>;

			qcom,iommu-dma-addr-pool = <0x26800000 0x24800000>;

			qcom,iommu-vmid = <0xA>;

			qcom,iommu-faults = "non-fatal", "stall-disable";

		};



		/* Memory Heaps */

qcom/scuba-iot-rb1-overlay.dts

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/dts-v1/;

/plugin/;



#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "scuba-iot-rb1.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Scuba IOT RB1";

	compatible = "qcom,scuba-qrd", "qcom,scuba-iot", "qcom,qrd";

	qcom,msm-id = <474 0x10000>;

	qcom,board-id = <0x1000B 1>;

};