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

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

Merge "msm: socinfo: Add board identification function for QRD OEM"

parents 4f7e2151 f34f96c2

arch/arm/boot/dts/msm8226-v1-qrd-skuf.dts

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


/ {

	model = "Qualcomm MSM 8226v1 QRD";

	compatible = "qcom,msm8226-qrd", "qcom,msm8226", "qcom,qrd";

	compatible = "qcom,msm8226-qrd", "qcom,msm8226", "qcom,skuf", "qcom,qrd";

	qcom,board-id = <11 2>;

};

arch/arm/boot/dts/msm8226-v2-qrd-skuf.dts

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


/ {

	model = "Qualcomm MSM 8226v2 QRD";

	compatible = "qcom,msm8226-qrd", "qcom,msm8226", "qcom,qrd";

	compatible = "qcom,msm8226-qrd", "qcom,msm8226", "qcom,skuf", "qcom,qrd";

	qcom,board-id = <0xb 0x2>;

};

arch/arm/mach-msm/include/mach/socinfo.h

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#define of_board_is_mtp()	of_machine_is_compatible("qcom,mtp")

#define of_board_is_qrd()	of_machine_is_compatible("qcom,qrd")

#define of_board_is_xpm()	of_machine_is_compatible("qcom,xpm")

#define of_board_is_skuf()	of_machine_is_compatible("qcom,skuf")



#define machine_is_msm8974()	of_machine_is_compatible("qcom,msm8974")

#define machine_is_msm9625()	of_machine_is_compatible("qcom,msm9625")
@@ -72,6 +73,7 @@ 
#define of_board_is_mtp()		0

#define of_board_is_qrd()		0

#define of_board_is_xpm()		0

#define of_board_is_skuf()		0



#define machine_is_msm8974()		0

#define machine_is_msm9625()		0