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

Commit 5f5a902f 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: add support for MSM8974Pro-AC boards which use PM8941+PM8841"

parents 38c33759 1b6c9ec0

arch/arm/boot/dts/Makefile

+8 −5
Original line number Diff line number Diff line
@@ -109,11 +109,14 @@ dtb-$(CONFIG_ARCH_MSM8974) += msm8974-v1-cdp.dtb \ 
	msm8974-v2.2-fluid.dtb \

	msm8974-v2.2-liquid.dtb \

	msm8974-v2.2-mtp.dtb \

	msm8974pro-ab-cdp.dtb \

	msm8974pro-ab-fluid.dtb \

	msm8974pro-ab-liquid.dtb \

	msm8974pro-ab-mtp.dtb \

	msm8974pro-ac-mtp.dtb

	msm8974pro-ab-pm8941-cdp.dtb \

	msm8974pro-ab-pm8941-fluid.dtb \

	msm8974pro-ab-pm8941-liquid.dtb \

	msm8974pro-ab-pm8941-mtp.dtb \

	msm8974pro-ac-pm8941-cdp.dtb \

	msm8974pro-ac-pm8941-liquid.dtb \

	msm8974pro-ac-pm8941-mtp.dtb \

	msm8974pro-ac-pma8084-pm8941-mtp.dtb

dtb-$(CONFIG_ARCH_MSM9625) += msm9625-v1-cdp.dtb \

	msm9625-v1-mtp.dtb \

	msm9625-v1-rumi.dtb \

arch/arm/boot/dts/apq8084-interposer-cdp.dts

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


/dts-v1/;



/include/ "msm8974pro-ac.dtsi"

/include/ "msm8974pro-ac-pma8084.dtsi"



/ {

	model = "Qualcomm MSM 8974Pro-AC APQ8084 Interporser CDP / MTP";

arch/arm/boot/dts/msm8974pro-ab-cdp.dts→arch/arm/boot/dts/msm8974pro-ab-pm8941-cdp.dts

+3 −14
Original line number Diff line number Diff line
@@ -12,22 +12,11 @@ 


/dts-v1/;



/include/ "msm8974pro-ab.dtsi"

/include/ "msm8974pro-ab-pm8941.dtsi"

/include/ "msm8974-cdp.dtsi"



/ {

	model = "Qualcomm MSM 8974Pro CDP";

	model = "Qualcomm MSM 8974Pro-AA/AB CDP";

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

	qcom,msm-id = <208 1 0x10000>,

		      <209 1 0x10000>,

		      <211 1 0x10000>,

		      <212 1 0x10000>,

		      <214 1 0x10000>,

		      <215 1 0x10000>,

		      <217 1 0x10000>,

		      <218 1 0x10000>,

		      <194 1 0x10000>,	/* 8974Pro-AC IDs */

		      <210 1 0x10000>,

		      <213 1 0x10000>,

		      <216 1 0x10000>;

	qcom,board-id = <1 0>;

};

arch/arm/boot/dts/msm8974pro-ab-fluid.dts→arch/arm/boot/dts/msm8974pro-ab-pm8941-fluid.dts

+3 −9
Original line number Diff line number Diff line
@@ -12,17 +12,11 @@ 


/dts-v1/;



/include/ "msm8974pro-ab.dtsi"

/include/ "msm8974pro-ab-pm8941.dtsi"

/include/ "msm8974-fluid.dtsi"



/ {

	model = "Qualcomm MSM 8974Pro FLUID";

	model = "Qualcomm MSM 8974Pro-AA/AB FLUID";

	compatible = "qcom,msm8974-fluid", "qcom,msm8974", "qcom,fluid";

	qcom,msm-id = <209 3 0x10000>,

		      <211 3 0x10000>,

		      <212 3 0x10000>,

		      <214 3 0x10000>,

		      <215 3 0x10000>,

		      <217 3 0x10000>,

		      <218 3 0x10000>;

	qcom,board-id = <3 0>;

};

arch/arm/boot/dts/msm8974pro-ab-liquid.dts→arch/arm/boot/dts/msm8974pro-ab-pm8941-liquid.dts

+3 −9
Original line number Diff line number Diff line
@@ -12,17 +12,11 @@ 


/dts-v1/;



/include/ "msm8974pro-ab.dtsi"

/include/ "msm8974pro-ab-pm8941.dtsi"

/include/ "msm8974-liquid.dtsi"



/ {

	model = "Qualcomm MSM 8974Pro LIQUID";

	model = "Qualcomm MSM 8974Pro-AA/AB LIQUID";

	compatible = "qcom,msm8974-liquid", "qcom,msm8974", "qcom,liquid";

	qcom,msm-id = <209 9 0x10000>,

		      <211 9 0x10000>,

		      <212 9 0x10000>,

		      <214 9 0x10000>,

		      <215 9 0x10000>,

		      <217 9 0x10000>,

		      <218 9 0x10000>;

	qcom,board-id = <9 0>;

};