From 98303fba4034b2ce6969c7b9a24b7997f440b1cb Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Thu, 30 Jan 2020 11:27:37 -0800 Subject: [PATCH 1/2] dt-bindings: msm: Add compatible strings for lahainap Add compatible stings for lahainap. Change-Id: I3412619f8423ef3ed4c0055f1041cc9e0c531efe --- bindings/arm/msm/msm.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bindings/arm/msm/msm.txt b/bindings/arm/msm/msm.txt index 73a8262969cf..ce417ccb0988 100644 --- a/bindings/arm/msm/msm.txt +++ b/bindings/arm/msm/msm.txt @@ -50,6 +50,9 @@ SoCs: - LAHAINA compatible = "qcom,lahaina" +- LAHAINAP + compatible = "qcom,lahainap" + - SHIMA compatible = "qcom,shima" @@ -185,6 +188,9 @@ compatible = "qcom,lahaina-cdp" compatible = "qcom,lahaina-qrd" compatible = "qcom,lahaina-qrd-module" compatible = "qcom,shima-rumi" +compatible = "qcom,lahainap-mtp" +compatible = "qcom,lahainap-cdp" +compatible = "qcom,lahainap-qrd" compatible = "qcom,lito-rumi" compatible = "qcom,lito-mtp" compatible = "qcom,lito-cdp" From 295665f6fd6758787e36be0e8c9ce8b849d1bf5a Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Fri, 24 Jan 2020 13:16:00 -0800 Subject: [PATCH 2/2] ARM: dts: msm: Add device trees for LahainaP variant Add device tree support for LahainaP variant (no modem). Change-Id: I9bafe2b27653041831bc424cbda1167f3948e65b --- qcom/Makefile | 13 +++++++++++-- qcom/lahainap-cdp-overlay.dts | 10 ++++++++++ qcom/lahainap-cdp.dts | 10 ++++++++++ qcom/lahainap-cdp.dtsi | 1 + qcom/lahainap-mtp-overlay.dts | 10 ++++++++++ qcom/lahainap-mtp.dts | 10 ++++++++++ qcom/lahainap-mtp.dtsi | 1 + qcom/lahainap-qrd-overlay.dts | 10 ++++++++++ qcom/lahainap-qrd.dts | 10 ++++++++++ qcom/lahainap-qrd.dtsi | 1 + qcom/lahainap.dts | 9 +++++++++ qcom/lahainap.dtsi | 15 +++++++++++++++ 12 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 qcom/lahainap-cdp-overlay.dts create mode 100644 qcom/lahainap-cdp.dts create mode 100644 qcom/lahainap-cdp.dtsi create mode 100644 qcom/lahainap-mtp-overlay.dts create mode 100644 qcom/lahainap-mtp.dts create mode 100644 qcom/lahainap-mtp.dtsi create mode 100644 qcom/lahainap-qrd-overlay.dts create mode 100644 qcom/lahainap-qrd.dts create mode 100644 qcom/lahainap-qrd.dtsi create mode 100644 qcom/lahainap.dts create mode 100644 qcom/lahainap.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index edd1f2747964..214919f701de 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -5,7 +5,10 @@ dtbo-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi-overlay.dtbo \ lahaina-cdp-overlay.dtbo \ lahaina-qrd-overlay.dtbo \ lahaina-qrd-hsp-overlay.dtbo \ - lahaina-qrd-module-overlay.dtbo + lahaina-qrd-module-overlay.dtbo \ + lahainap-mtp-overlay.dtbo \ + lahainap-cdp-overlay.dtbo \ + lahainap-qrd-overlay.dtbo lahaina-rumi-overlay.dtbo-base := lahaina.dtb lahaina-mtp-hsp-overlay.dtbo-base := lahaina.dtb @@ -14,6 +17,9 @@ lahaina-cdp-overlay.dtbo-base := lahaina.dtb lahaina-qrd-hsp-overlay.dtbo-base := lahaina.dtb lahaina-qrd-overlay.dtbo-base := lahaina.dtb lahaina-qrd-module-overlay.dtbo-base := lahaina.dtb +lahainap-mtp-overlay.dtbo-base := lahainap.dtb +lahainap-cdp-overlay.dtbo-base := lahainap.dtb +lahainap-qrd-overlay.dtbo-base := lahainap.dtb else dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \ lahaina-mtp-hsp.dtb \ @@ -21,7 +27,10 @@ dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \ lahaina-cdp.dtb \ lahaina-qrd-hsp.dtb \ lahaina-qrd.dtb \ - lahaina-qrd-module.dtb + lahaina-qrd-module.dtb \ + lahainap-mtp.dtb \ + lahainap-cdp.dtb \ + lahainap-qrd.dtb endif dtb-$(CONFIG_ARCH_QTI_VM) += trustedvm.dtb diff --git a/qcom/lahainap-cdp-overlay.dts b/qcom/lahainap-cdp-overlay.dts new file mode 100644 index 000000000000..5612edbd3783 --- /dev/null +++ b/qcom/lahainap-cdp-overlay.dts @@ -0,0 +1,10 @@ +/dts-v1/; +/plugin/; + +#include "lahainap-cdp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. LahainaP CDP"; + compatible = "qcom,lahainap-cdp", "qcom,lahainap", "qcom,cdp"; + qcom,board-id = <0x10001 0>; +}; diff --git a/qcom/lahainap-cdp.dts b/qcom/lahainap-cdp.dts new file mode 100644 index 000000000000..c8dbdd3dee15 --- /dev/null +++ b/qcom/lahainap-cdp.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "lahainap.dtsi" +#include "lahainap-cdp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. LahainaP CDP"; + compatible = "qcom,lahainap-cdp", "qcom,lahainap", "qcom,cdp"; + qcom,board-id = <0x10001 0>; +}; diff --git a/qcom/lahainap-cdp.dtsi b/qcom/lahainap-cdp.dtsi new file mode 100644 index 000000000000..fdf9ed586642 --- /dev/null +++ b/qcom/lahainap-cdp.dtsi @@ -0,0 +1 @@ +#include "lahaina-cdp.dtsi" diff --git a/qcom/lahainap-mtp-overlay.dts b/qcom/lahainap-mtp-overlay.dts new file mode 100644 index 000000000000..798c41e9d14a --- /dev/null +++ b/qcom/lahainap-mtp-overlay.dts @@ -0,0 +1,10 @@ +/dts-v1/; +/plugin/; + +#include "lahainap-mtp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. LahainaP MTP"; + compatible = "qcom,lahainap-mtp", "qcom,lahainap", "qcom,mtp"; + qcom,board-id = <0x10008 0>; +}; diff --git a/qcom/lahainap-mtp.dts b/qcom/lahainap-mtp.dts new file mode 100644 index 000000000000..4d9171ec2be1 --- /dev/null +++ b/qcom/lahainap-mtp.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "lahainap.dtsi" +#include "lahainap-mtp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. LahainaP MTP"; + compatible = "qcom,lahainap-mtp", "qcom,lahainap", "qcom,mtp"; + qcom,board-id = <0x10008 0>; +}; diff --git a/qcom/lahainap-mtp.dtsi b/qcom/lahainap-mtp.dtsi new file mode 100644 index 000000000000..af2a598d00ab --- /dev/null +++ b/qcom/lahainap-mtp.dtsi @@ -0,0 +1 @@ +#include "lahaina-mtp.dtsi" diff --git a/qcom/lahainap-qrd-overlay.dts b/qcom/lahainap-qrd-overlay.dts new file mode 100644 index 000000000000..b7f2f4f34acc --- /dev/null +++ b/qcom/lahainap-qrd-overlay.dts @@ -0,0 +1,10 @@ +/dts-v1/; +/plugin/; + +#include "lahainap-qrd.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. LahainaP QRD"; + compatible = "qcom,lahainap-qrd", "qcom,lahainap", "qcom,qrd"; + qcom,board-id = <0x1000B 0>; +}; diff --git a/qcom/lahainap-qrd.dts b/qcom/lahainap-qrd.dts new file mode 100644 index 000000000000..36001772af4b --- /dev/null +++ b/qcom/lahainap-qrd.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "lahainap.dtsi" +#include "lahainap-cdp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. LahainaP QRD"; + compatible = "qcom,lahainap-qrd", "qcom,lahainap", "qcom,qrd"; + qcom,board-id = <0x1000B 0>; +}; diff --git a/qcom/lahainap-qrd.dtsi b/qcom/lahainap-qrd.dtsi new file mode 100644 index 000000000000..74843fc49873 --- /dev/null +++ b/qcom/lahainap-qrd.dtsi @@ -0,0 +1 @@ +#include "lahaina-qrd.dtsi" diff --git a/qcom/lahainap.dts b/qcom/lahainap.dts new file mode 100644 index 000000000000..65810ec25d02 --- /dev/null +++ b/qcom/lahainap.dts @@ -0,0 +1,9 @@ +/dts-v1/; + +#include "lahainap.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. LahianaP SoC"; + compatible = "qcom,lahainap"; + qcom,board-id = <0 0>; +}; diff --git a/qcom/lahainap.dtsi b/qcom/lahainap.dtsi new file mode 100644 index 000000000000..4f3acd3069f6 --- /dev/null +++ b/qcom/lahainap.dtsi @@ -0,0 +1,15 @@ +#include "lahaina.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. LahainaP"; + compatible = "qcom,lahainap"; + qcom,msm-id = <439 0x10000>; +}; + +&pil_modem { + status = "disabled"; +}; + +&ipa_hw { + status = "disabled"; +};