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

Commit ff5b1932 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Select 120Hz panel as default on 120Hz shima dts"

parents 1f900da4 12f00961

qcom/Makefile

+9 −3
Original line number Diff line number Diff line
@@ -105,21 +105,27 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
dtbo-$(CONFIG_ARCH_SHIMA) +=    \

	shima-rumi-overlay.dtbo \

	shima-idp-overlay.dtbo  \

	shima-idp-120fps-overlay.dtbo \

	shima-atp-overlay.dtbo \

	shima-qrd-overlay.dtbo \

	shima-idps-digital-mics-overlay.dtbo

	shima-idps-digital-mics-overlay.dtbo \

	shima-idps-digital-mics-120fps-overlay.dtbo



shima-rumi-overlay.dtbo-base := shima.dtb

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

shima-idp-120fps-overlay.dtbo-base := shima.dtb

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

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

shima-idps-digital-mics-overlay.dtbo-base := shima.dtb

shima-idps-digital-mics-120fps-overlay.dtbo-base := shima.dtb

else

dtb-$(CONFIG_ARCH_SHIMA) += shima-rumi.dtb  \

			    shima-idp.dtb   \

			    shima-idp-120fps.dtb  \

			    shima-atp.dtb \

			    shima-qrd.dtb \

			    shima-idps-digital-mics.dtb

			    shima-idps-digital-mics.dtb \

			    shima-idps-digital-mics-120fps.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

qcom/shima-idp-120fps-overlay.dts

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

/plugin/;



#include "shima-idp-120fps.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Shima IDP + 120fps";

	compatible = "qcom,shima-idp", "qcom,shima", "qcom,idp";

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

	qcom,board-id = <34 2>;

};

qcom/shima-idp-120fps.dts

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



#include "shima.dtsi"

#include "shima-idp-120fps.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Shima IDP + 120fps";

	compatible = "qcom,shima-idp", "qcom,shima", "qcom,idp";

	qcom,board-id = <34 2>;

};

qcom/shima-idp-120fps.dtsi

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#include "shima-idp.dtsi"



&soc {

};



&sde_dsi {

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

};

qcom/shima-idps-digital-mics-120fps-overlay.dts

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

/plugin/;



#include "shima-idps-digital-mics-120fps.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Shima IDPS DIGITAL MICS + 120fps";

	compatible = "qcom,shima-idp", "qcom,shima", "qcom,idp";

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

	qcom,board-id = <34 3>;

};