diff --git a/bindings/arm/msm/msm.txt b/bindings/arm/msm/msm.txt index e37c3714..e393d46e 100644 --- a/bindings/arm/msm/msm.txt +++ b/bindings/arm/msm/msm.txt @@ -315,8 +315,7 @@ compatible = "qcom,khaje-idp" compatible = "qcom,khaje-qrd" compatible = "qcom,khaje-atp" compatible = "qcom,sdxpinn-rumi" -compatible = "qcom,sdxpinn-mtp" -compatible = "qcom,sdxpinn-cdp" +compatible = "qcom,sdxpinn-idp" compatible = "qcom,sa410m-rumi" compatible = "qcom,quinvm" compatible = "qcom,sdxbaagha-rumi" diff --git a/qcom/Makefile b/qcom/Makefile index 247431d9..53f89157 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -170,10 +170,7 @@ gen4auto-overlays-dtb-$(CONFIG_ARCH_LEMANS) += \ dtb-y += $(gen4auto-dtb-y) sdxpinn-dtb-$(CONFIG_ARCH_SDXPINN) += sdxpinn-rumi.dtb sa525m-rumi.dtb \ - sdxpinn-mtp.dtb \ - sdxpinn-cdp.dtb - -sdxpinn-dtb-$(CONFIG_ARCH_SDXPINN) += sdxpinn-rumi.dtb sa525m-rumi.dtb + sdxpinn-idp-mbb.dtb dtb-y += $(sdxpinn-dtb-y) sa410m_auto-dtb-$(CONFIG_ARCH_SA410M) += \ diff --git a/qcom/sdxpinn-cdp.dts b/qcom/sdxpinn-cdp.dts deleted file mode 100644 index 8a380b0b..00000000 --- a/qcom/sdxpinn-cdp.dts +++ /dev/null @@ -1,11 +0,0 @@ -/dts-v1/; - -#include "sdxpinn.dtsi" -#include "sdxpinn-cdp.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. SDXPINN CDP"; - compatible = "qcom,sdxpinn-cdp", - "qcom,sdxpinn", "qcom,cdp"; - qcom,board-id = <0x10001 0x0>; -}; diff --git a/qcom/sdxpinn-idp-mbb.dts b/qcom/sdxpinn-idp-mbb.dts new file mode 100644 index 00000000..8f85e377 --- /dev/null +++ b/qcom/sdxpinn-idp-mbb.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +#include "sdxpinn.dtsi" +#include "sdxpinn-idp-mbb.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SDXPINN IDP MBB"; + compatible = "qcom,sdxpinn-idp", + "qcom,sdxpinn", "qcom,idp"; + qcom,board-id = <34 0>; +}; diff --git a/qcom/sdxpinn-cdp.dtsi b/qcom/sdxpinn-idp-mbb.dtsi similarity index 100% rename from qcom/sdxpinn-cdp.dtsi rename to qcom/sdxpinn-idp-mbb.dtsi diff --git a/qcom/sdxpinn-mtp.dts b/qcom/sdxpinn-mtp.dts deleted file mode 100644 index 674bfe95..00000000 --- a/qcom/sdxpinn-mtp.dts +++ /dev/null @@ -1,11 +0,0 @@ -/dts-v1/; - -#include "sdxpinn.dtsi" -#include "sdxpinn-mtp.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. SDXPINN MTP"; - compatible = "qcom,sdxpinn-mtp", - "qcom,sdxpinn", "qcom,mtp"; - qcom,board-id = <0x10008 0x0>; -}; diff --git a/qcom/sdxpinn-mtp.dtsi b/qcom/sdxpinn-mtp.dtsi deleted file mode 100644 index 17f1e228..00000000 --- a/qcom/sdxpinn-mtp.dtsi +++ /dev/null @@ -1,2 +0,0 @@ -&soc { -};