diff --git a/qcom/Makefile b/qcom/Makefile index 05ef47ad..6eed4dc2 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -490,7 +490,6 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) dtbo-$(CONFIG_ARCH_RAVELIN) += ravelin-rumi-overlay.dtbo \ ravelin-atp-overlay.dtbo \ ravelin-idp-overlay.dtbo \ - ravelin-idp-4gb-overlay.dtbo \ ravelin-idp-wcn3988-4gb-overlay.dtbo \ ravelin-idp-wcn3950-amoled-rcm-overlay.dtbo \ ravelin-qrd-overlay.dtbo \ @@ -507,7 +506,6 @@ ravelin-idp-overlay.dtbo-base := ravelin.dtb ravelinp.dtb ravelin-idp-wcn3988-4gb-overlay.dtbo-base := ravelin-4gb.dtb ravelinp-4gb.dtb ravelin-idp-wcn3950-amoled-rcm-overlay.dtbo-base := ravelin.dtb ravelinp.dtb ravelin-qrd-overlay.dtbo-base := ravelin.dtb ravelinp.dtb -ravelin-idp-4gb-overlay.dtbo-base := ravelin-4gb.dtb ravelinp-4gb.dtb ravelin-qrd-4gb-overlay.dtbo-base := ravelin-4gb.dtb ravelinp-4gb.dtb montague-rumi-overlay.dtbo-base := montague.dtb montaguep.dtb montague-qrd-overlay.dtbo-base := montague.dtb montaguep.dtb @@ -518,14 +516,12 @@ else dtb-$(CONFIG_ARCH_RAVELIN) += ravelin-rumi.dtb \ ravelin-atp.dtb \ ravelin-idp.dtb \ - ravelin-idp-4gb.dtb \ ravelin-idp-wcn3988-4gb.dtb \ ravelin-idp-wcn3950-amoled-rcm.dtb \ ravelin-qrd.dtb \ ravelin-qrd-4gb.dtb \ ravelinp-atp.dtb \ ravelinp-idp.dtb \ - ravelinp-idp-4gb.dtb \ ravelinp-idp-wcn3988-4gb.dtb \ ravelinp-idp-wcn3950-amoled-rcm.dtb \ ravelinp-qrd.dtb \ diff --git a/qcom/ravelin-idp-4gb-overlay.dts b/qcom/ravelin-idp-4gb-overlay.dts deleted file mode 100644 index e104ba19..00000000 --- a/qcom/ravelin-idp-4gb-overlay.dts +++ /dev/null @@ -1,11 +0,0 @@ -/dts-v1/; -/plugin/; - -#include "ravelin-idp-4gb.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Ravelin IDP 4GB DDR"; - compatible = "qcom,ravelin-idp", "qcom,ravelin", "qcom,idp"; - qcom,msm-id = <568 0x10000>, <602 0x10000>; - qcom,board-id = <34 0x600>; -}; diff --git a/qcom/ravelin-idp-4gb.dts b/qcom/ravelin-idp-4gb.dts deleted file mode 100644 index adddf173..00000000 --- a/qcom/ravelin-idp-4gb.dts +++ /dev/null @@ -1,10 +0,0 @@ -/dts-v1/; - -#include "ravelin-4gb.dtsi" -#include "ravelin-idp-4gb.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Ravelin IDP 4GB DDR"; - compatible = "qcom,ravelin-idp", "qcom,ravelin", "qcom,idp"; - qcom,board-id = <0x34 0x600>; -}; diff --git a/qcom/ravelin-idp-4gb.dtsi b/qcom/ravelin-idp-4gb.dtsi deleted file mode 100644 index b71ee48e..00000000 --- a/qcom/ravelin-idp-4gb.dtsi +++ /dev/null @@ -1 +0,0 @@ -#include "ravelin-idp.dtsi" diff --git a/qcom/ravelin-idp-wcn3988-4gb.dtsi b/qcom/ravelin-idp-wcn3988-4gb.dtsi index 881bf69f..9f35c99a 100644 --- a/qcom/ravelin-idp-wcn3988-4gb.dtsi +++ b/qcom/ravelin-idp-wcn3988-4gb.dtsi @@ -1,2 +1,2 @@ -#include "ravelin-idp-4gb.dtsi" +#include "ravelin-idp.dtsi" diff --git a/qcom/ravelinp-idp-4gb.dts b/qcom/ravelinp-idp-4gb.dts deleted file mode 100644 index 61246ae4..00000000 --- a/qcom/ravelinp-idp-4gb.dts +++ /dev/null @@ -1,10 +0,0 @@ -/dts-v1/; - -#include "ravelinp-4gb.dtsi" -#include "ravelinp-idp-4gb.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. RavelinP IDP 4GB DDR"; - compatible = "qcom,ravelinp-idp", "qcom,ravelinp", "qcom,idp"; - qcom,board-id = <0x34 0x600>; -}; diff --git a/qcom/ravelinp-idp-4gb.dtsi b/qcom/ravelinp-idp-4gb.dtsi deleted file mode 100644 index b71ee48e..00000000 --- a/qcom/ravelinp-idp-4gb.dtsi +++ /dev/null @@ -1 +0,0 @@ -#include "ravelin-idp.dtsi" diff --git a/qcom/ravelinp-idp-wcn3988-4gb.dtsi b/qcom/ravelinp-idp-wcn3988-4gb.dtsi index 3554893b..c6f80e58 100644 --- a/qcom/ravelinp-idp-wcn3988-4gb.dtsi +++ b/qcom/ravelinp-idp-wcn3988-4gb.dtsi @@ -1,2 +1,2 @@ -#include "ravelinp-idp-4gb.dtsi" +#include "ravelin-idp-wcn3988-4gb.dtsi"