REVERTME: arm64: dts: qcom: msm8916-*-modem: Disable memshare for unt…

…ested devices Any breakages introduced by this commit may or may not be sponsored by third-party interested in tracking you with GPS. Signed-off-by: Nikita Travkin <nikitos.tr@gmail.com>
msm8916-mainline · Feb 3, 2021 · 1b0c3b3 · 1b0c3b3
1 parent be36862
commit 1b0c3b3
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 9 deletions.
diff --git a/arch/arm/boot/dts/qcom-msm8916-samsung-serranovelte-modem.dts b/arch/arm/boot/dts/qcom-msm8916-samsung-serranovelte-modem.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "qcom-msm8916-samsung-serranovelte.dts"
-#include "arm64/qcom/msm8916-modem.dtsi"
+#include "arm64/qcom/msm8916-modem-please-test-memshare.dtsi"
 
 &sound {
 	/delete-node/ dai-link-primary;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l-modem.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l-modem.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "msm8916-asus-z00l.dts"
-#include "msm8916-modem.dtsi"
+#include "msm8916-modem-please-test-memshare.dtsi"
 
 &sound {
 	/delete-node/ dai-link-primary;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z010d-modem.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z010d-modem.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "msm8916-asus-z010d.dts"
-#include "msm8916-modem.dtsi"
+#include "msm8916-modem-please-test-memshare.dtsi"
 
 &sound {
 	/delete-node/ dai-link-primary;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-lg-m216-modem.dts b/arch/arm64/boot/dts/qcom/msm8916-lg-m216-modem.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "msm8916-lg-m216.dts"
-#include "msm8916-modem.dtsi"
+#include "msm8916-modem-please-test-memshare.dtsi"
 
 &sound {
 	/delete-node/ dai-link-primary;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910-modem.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910-modem.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "msm8916-longcheer-l8910.dts"
-#include "msm8916-modem.dtsi"
+#include "msm8916-modem-please-test-memshare.dtsi"
 
 &sound {
 	/delete-node/ dai-link-primary;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-modem-please-test-memshare.dtsi b/arch/arm64/boot/dts/qcom/msm8916-modem-please-test-memshare.dtsi
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+gps_mem: &mpss_mem {};
+
+#include "msm8916-modem.dtsi"
+
+&memshare {
+	status = "disabled";
+};
+
+
diff --git a/arch/arm64/boot/dts/qcom/msm8916-motorola-harpia-modem.dts b/arch/arm64/boot/dts/qcom/msm8916-motorola-harpia-modem.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "msm8916-motorola-harpia.dts"
-#include "msm8916-modem.dtsi"
+#include "msm8916-modem-please-test-memshare.dtsi"
 
 &sound {
 	/delete-node/ dai-link-primary;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-motorola-osprey-modem.dts b/arch/arm64/boot/dts/qcom/msm8916-motorola-osprey-modem.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "msm8916-motorola-osprey.dts"
-#include "msm8916-modem.dtsi"
+#include "msm8916-modem-please-test-memshare.dtsi"
 
 &sound {
 	/delete-node/ dai-link-primary;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8-modem.dtsi b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8-modem.dtsi
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-#include "msm8916-modem.dtsi"
+#include "msm8916-modem-please-test-memshare.dtsi"
 
 &sound {
 	/delete-node/ dai-link-primary;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047-modem.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047-modem.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "msm8916-wingtech-wt88047.dts"
-#include "msm8916-modem.dtsi"
+#include "msm8916-modem-please-test-memshare.dtsi"
 
 &sound {
 	/delete-node/ dai-link-primary;