From c338bd73b2d39a7c10a168d0f59371ba0f7733fb Mon Sep 17 00:00:00 2001 From: Unnathi Chalicheemala Date: Tue, 28 Nov 2023 20:47:30 -0800 Subject: [PATCH] Revert "ARM: dts: msm: Support for APQ variant on Sun SoC" This reverts commit 3afa08eaed72019e2b65b0ebfde9445cf28b9c31. Reason for revert: Techpacks haven't added DT support for APQ variant. Change-Id: Id856d733375f3bf3fb5497855f2269b34c3f3dcd Signed-off-by: Unnathi Chalicheemala --- qcom/Makefile | 1 - qcom/platform_map.bzl | 8 -------- qcom/sun-cdp-kiwi-overlay.dts | 2 +- qcom/sun-cdp-nfc-overlay.dts | 2 +- qcom/sun-cdp-v8-overlay.dts | 2 +- qcom/sun-mtp-kiwi-overlay.dts | 2 +- qcom/sun-mtp-kiwi-v8-overlay.dts | 2 +- qcom/sun-mtp-nfc-overlay.dts | 2 +- qcom/sun-mtp-overlay.dts | 2 +- qcom/sun-mtp-v8-overlay.dts | 2 +- qcom/sun-oemvm.dtsi | 2 +- qcom/sun-qrd-sku1-overlay.dts | 2 +- qcom/sun-qrd-sku1-v8-overlay.dts | 2 +- qcom/sun-qrd-sku2-v8-overlay.dts | 2 +- qcom/sun-vm.dtsi | 2 +- 15 files changed, 13 insertions(+), 22 deletions(-) diff --git a/qcom/Makefile b/qcom/Makefile index 755a93d9..0af38109 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -16,7 +16,6 @@ add-overlays = $(foreach o,$1,$(foreach b,$2,$(eval $(basename $b)-$(basename $o ifneq ($(CONFIG_ARCH_QTI_VM), y) SUN_BASE_DTB += sun.dtb sun-v2.dtb -SUN_APQ_BASE_DTB += sunp.dtb sunp-v2.dtb SUN_BOARDS += \ sun-mtp-kiwi-overlay.dtbo \ diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl index 4fd30146..97e91abd 100644 --- a/qcom/platform_map.bzl +++ b/qcom/platform_map.bzl @@ -3,14 +3,6 @@ _platform_map = { "dtb_list": [ # keep sorted {"name": "sun.dtb"}, - { - "name": "sunp.dtb", - "apq": True, - }, - { - "name": "sunp-v2.dtb", - "apq": True, - }, {"name": "sun-v2.dtb"}, ], "dtbo_list": [ diff --git a/qcom/sun-cdp-kiwi-overlay.dts b/qcom/sun-cdp-kiwi-overlay.dts index d4e41ba8..b78d6ab2 100644 --- a/qcom/sun-cdp-kiwi-overlay.dts +++ b/qcom/sun-cdp-kiwi-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun CDP Kiwi WLAN"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x20001 0>; }; diff --git a/qcom/sun-cdp-nfc-overlay.dts b/qcom/sun-cdp-nfc-overlay.dts index d5929915..37a79eca 100644 --- a/qcom/sun-cdp-nfc-overlay.dts +++ b/qcom/sun-cdp-nfc-overlay.dts @@ -11,6 +11,6 @@ / { model = "Qualcomm Technologies, Inc. Sun CDP SN300 NFC"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x40001 0>; }; diff --git a/qcom/sun-cdp-v8-overlay.dts b/qcom/sun-cdp-v8-overlay.dts index 68c3aa4f..fed67a8a 100644 --- a/qcom/sun-cdp-v8-overlay.dts +++ b/qcom/sun-cdp-v8-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun CDP V8 Power Grid"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x50001 0>; }; diff --git a/qcom/sun-mtp-kiwi-overlay.dts b/qcom/sun-mtp-kiwi-overlay.dts index ce7816c1..dc4250ed 100644 --- a/qcom/sun-mtp-kiwi-overlay.dts +++ b/qcom/sun-mtp-kiwi-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun MTP Kiwi WLAN"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x20008 0>; }; diff --git a/qcom/sun-mtp-kiwi-v8-overlay.dts b/qcom/sun-mtp-kiwi-v8-overlay.dts index cd0d10f3..053221c0 100644 --- a/qcom/sun-mtp-kiwi-v8-overlay.dts +++ b/qcom/sun-mtp-kiwi-v8-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun MTP Kiwi WLAN V8 Power Grid"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x50008 0>; }; diff --git a/qcom/sun-mtp-nfc-overlay.dts b/qcom/sun-mtp-nfc-overlay.dts index 6aa03e84..a287787d 100644 --- a/qcom/sun-mtp-nfc-overlay.dts +++ b/qcom/sun-mtp-nfc-overlay.dts @@ -11,6 +11,6 @@ / { model = "Qualcomm Technologies, Inc. Sun MTP SN300 NFC"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x30008 0>; }; diff --git a/qcom/sun-mtp-overlay.dts b/qcom/sun-mtp-overlay.dts index 983d05f7..78ef967b 100644 --- a/qcom/sun-mtp-overlay.dts +++ b/qcom/sun-mtp-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun MTP"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <8 0>; }; diff --git a/qcom/sun-mtp-v8-overlay.dts b/qcom/sun-mtp-v8-overlay.dts index 45b44f41..3abd277a 100644 --- a/qcom/sun-mtp-v8-overlay.dts +++ b/qcom/sun-mtp-v8-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun MTP V8 Power Grid"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x40008 0>; }; diff --git a/qcom/sun-oemvm.dtsi b/qcom/sun-oemvm.dtsi index c22eb38a..30dc2576 100644 --- a/qcom/sun-oemvm.dtsi +++ b/qcom/sun-oemvm.dtsi @@ -8,7 +8,7 @@ / { #address-cells = <0x2>; #size-cells = <0x2>; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; interrupt-parent = <&vgic>; chosen { diff --git a/qcom/sun-qrd-sku1-overlay.dts b/qcom/sun-qrd-sku1-overlay.dts index 15d9cb96..f2c014de 100644 --- a/qcom/sun-qrd-sku1-overlay.dts +++ b/qcom/sun-qrd-sku1-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun QRD SKU1"; compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", "qcom,qrd"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x1000B 0>; }; diff --git a/qcom/sun-qrd-sku1-v8-overlay.dts b/qcom/sun-qrd-sku1-v8-overlay.dts index eea7ca7b..99de5ceb 100644 --- a/qcom/sun-qrd-sku1-v8-overlay.dts +++ b/qcom/sun-qrd-sku1-v8-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun QRD SKU1 V8 Power Grid"; compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", "qcom,qrd"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x3000B 0>; }; diff --git a/qcom/sun-qrd-sku2-v8-overlay.dts b/qcom/sun-qrd-sku2-v8-overlay.dts index da4cb58b..08b1c9e0 100644 --- a/qcom/sun-qrd-sku2-v8-overlay.dts +++ b/qcom/sun-qrd-sku2-v8-overlay.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun QRD SKU2 V8 Power Grid"; compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", "qcom,qrd"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x2000B 0>; }; diff --git a/qcom/sun-vm.dtsi b/qcom/sun-vm.dtsi index b8120848..32188e93 100644 --- a/qcom/sun-vm.dtsi +++ b/qcom/sun-vm.dtsi @@ -9,7 +9,7 @@ / { #address-cells = <0x2>; #size-cells = <0x2>; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; interrupt-parent = <&vgic>; chosen {