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

Commit 75ecc0b6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update filename of SDM845 V2 QVR"

parents 59827c85 8dd63b60

arch/arm64/boot/dts/qcom/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sdm845-cdp-overlay.dtbo \

		sdm845-mtp-overlay.dtbo \

		sdm845-qrd-overlay.dtbo \

		sdm845-qvr-overlay.dtbo \

		sdm845-4k-panel-mtp-overlay.dtbo \

		sdm845-4k-panel-cdp-overlay.dtbo \

		sdm845-4k-panel-qrd-overlay.dtbo \

		sdm845-v2-qvr-overlay.dtbo \

		sdm845-v2-cdp-overlay.dtbo \

		sdm845-v2-mtp-overlay.dtbo \

		sdm845-v2-qrd-overlay.dtbo \
@@ -46,11 +46,10 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
sdm845-cdp-overlay.dtbo-base := sdm845.dtb

sdm845-mtp-overlay.dtbo-base := sdm845.dtb

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

sdm845-qvr-overlay.dtbo-base := sdm845-v2.dtb

sdm845-qvr-overlay.dtbo-base := sdm845.dtb

sdm845-4k-panel-mtp-overlay.dtbo-base := sdm845.dtb

sdm845-4k-panel-cdp-overlay.dtbo-base := sdm845.dtb

sdm845-4k-panel-qrd-overlay.dtbo-base := sdm845.dtb

sdm845-v2-qvr-overlay.dtbo-base := sdm845-v2.dtb

sdm845-v2-cdp-overlay.dtbo-base := sdm845-v2.dtb

sdm845-v2-mtp-overlay.dtbo-base := sdm845-v2.dtb

sdm845-v2-qrd-overlay.dtbo-base := sdm845-v2.dtb
@@ -92,7 +91,7 @@ dtb-$(CONFIG_ARCH_SDM845) += sdm845-sim.dtb \ 
	sdm845-v2-cdp.dtb \

	sdm845-qrd.dtb \

	sdm845-v2-qrd.dtb \

	sdm845-qvr.dtb \

	sdm845-v2-qvr.dtb \

	sdm845-4k-panel-mtp.dtb \

	sdm845-4k-panel-cdp.dtb \

	sdm845-4k-panel-qrd.dtb \

arch/arm64/boot/dts/qcom/sdm845-qvr-overlay.dts→arch/arm64/boot/dts/qcom/sdm845-v2-qvr-overlay.dts

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include "sdm845-camera-sensor-qvr.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM845 v2 QVR";

	model = "Qualcomm Technologies, Inc. SDM845 V2 QVR";

	compatible = "qcom,sdm845-qvr", "qcom,sdm845", "qcom,qvr";

	qcom,msm-id = <321 0x20000>;

	qcom,board-id = <0x01000B 0x20>;

arch/arm64/boot/dts/qcom/sdm845-qvr.dts→arch/arm64/boot/dts/qcom/sdm845-v2-qvr.dts

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include "sdm845-camera-sensor-qvr.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM845 QVR";

	model = "Qualcomm Technologies, Inc. SDM845 V2 QVR";

	compatible = "qcom,sdm845-qvr", "qcom,sdm845", "qcom,qvr";

	qcom,board-id = <0x01000B 0x20>;

};