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

Commit 9caa20d0 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: Split qcom,msm-id for 8226"

parents a2b80b3c 95144ad1

arch/arm/boot/dts/apq8026-v1-cdp.dts

+1 −2
Original line number Original line Diff line number Diff line
@@ -18,6 +18,5 @@ 
/ {

/ {

	model = "Qualcomm APQ 8026 CDP";

	model = "Qualcomm APQ 8026 CDP";

	compatible = "qcom,apq8026-cdp", "qcom,apq8026", "qcom,cdp";

	compatible = "qcom,apq8026-cdp", "qcom,apq8026", "qcom,cdp";

	qcom,msm-id = <199 1 0>,

	qcom,board-id = <1 0>;

		      <219 1 0>;

};
 
};

arch/arm/boot/dts/apq8026-v1-mtp.dts

+1 −2
Original line number Original line Diff line number Diff line
@@ -18,8 +18,7 @@ 
/ {

/ {

	model = "Qualcomm APQ 8026 MTP";

	model = "Qualcomm APQ 8026 MTP";

	compatible = "qcom,apq8026-mtp", "qcom,apq8026", "qcom,mtp";

	compatible = "qcom,apq8026-mtp", "qcom,apq8026", "qcom,mtp";

	qcom,msm-id = <199 8 0>,

	qcom,board-id = <8 0>;

		      <219 8 0>;

};

};





&cci {

&cci {

arch/arm/boot/dts/apq8026-v1-xpm.dts

+1 −2
Original line number Original line Diff line number Diff line
@@ -18,6 +18,5 @@ 
/ {

/ {

	model = "Qualcomm APQ 8026 XPM";

	model = "Qualcomm APQ 8026 XPM";

	compatible = "qcom,apq8026-xpm", "qcom,apq8026", "qcom,xpm";

	compatible = "qcom,apq8026-xpm", "qcom,apq8026", "qcom,xpm";

	qcom,msm-id = <199 14 0>,

	qcom,board-id = <14 0>;

		      <219 14 0>;

};
 
};

arch/arm/boot/dts/apq8026-v1.dtsi

+2 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,8 @@ 
/ {

/ {

	model = "Qualcomm APQ 8026";

	model = "Qualcomm APQ 8026";

	compatible = "qcom,apq8026";

	compatible = "qcom,apq8026";

	qcom,msm-id = <199 0>,

		      <219 0x20000>;

};

};





&tsens {

&tsens {

arch/arm/boot/dts/apq8026-v2-cdp.dts

+1 −2
Original line number Original line Diff line number Diff line
@@ -18,6 +18,5 @@ 
/ {

/ {

	model = "Qualcomm APQ 8026v2 CDP";

	model = "Qualcomm APQ 8026v2 CDP";

	compatible = "qcom,apq8026-cdp", "qcom,apq8026", "qcom,cdp";

	compatible = "qcom,apq8026-cdp", "qcom,apq8026", "qcom,cdp";

	qcom,msm-id = <199 1 0x20000>,

	qcom,board-id = <1 0>;

		      <219 1 0x20000>;

};
 
};