diff --git a/qcom/Makefile b/qcom/Makefile index 247431d9..26d44652 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -44,8 +44,8 @@ waipio-overlays-dtb-$(CONFIG_ARCH_WAIPIO) += $(WAIPIO_BOARDS) $(NOAPQ_WAIPIO_BOA dtb-y += $(waipio-dtb-y) -KALAMA_BASE_DTB += kalama.dtb kalama-v2.dtb -KALAMA_APQ_BASE_DTB += kalamap.dtb kalamap-v2.dtb +KALAMA_BASE_DTB += kalama.dtb kalama-v2.dtb kalama-sg.dtb +KALAMA_APQ_BASE_DTB += kalamap.dtb kalamap-v2.dtb kalamap-sg.dtb KALAMA_BOARDS += \ kalama-mtp-overlay.dtbo \ @@ -56,6 +56,7 @@ KALAMA_BOARDS += \ kalama-atp-overlay.dtbo \ kalama-rcm-overlay.dtbo \ kalama-qrd-overlay.dtbo \ + kalama-sg-hhg-overlay.dtbo \ kalamap-hdk-overlay.dtbo \ kalamap-hhg-overlay.dtbo diff --git a/qcom/kalama-atp-overlay.dts b/qcom/kalama-atp-overlay.dts index 2f64321f..fc77e033 100644 --- a/qcom/kalama-atp-overlay.dts +++ b/qcom/kalama-atp-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama ATP"; compatible = "qcom,kalama-atp", "qcom,kalama", "qcom,atp"; - qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>, <600 0x20000>, <601 0x20000>; qcom,board-id = <0x10021 0>; }; diff --git a/qcom/kalama-cdp-nfc-overlay.dts b/qcom/kalama-cdp-nfc-overlay.dts index 9cafe658..3466ee6a 100644 --- a/qcom/kalama-cdp-nfc-overlay.dts +++ b/qcom/kalama-cdp-nfc-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama CDP ST54K NFC"; compatible = "qcom,kalama-cdp", "qcom,kalama", "qcom,cdp"; - qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>, <600 0x20000>, <601 0x20000>; qcom,board-id = <0x02010001 0>; }; diff --git a/qcom/kalama-cdp-overlay.dts b/qcom/kalama-cdp-overlay.dts index 82ad1a09..0b0e2b26 100644 --- a/qcom/kalama-cdp-overlay.dts +++ b/qcom/kalama-cdp-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama CDP"; compatible = "qcom,kalama-cdp", "qcom,kalama", "qcom,cdp"; - qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>, <600 0x20000>, <601 0x20000>; qcom,board-id = <0x10001 0>; }; diff --git a/qcom/kalama-cdp-wsa883x-overlay.dts b/qcom/kalama-cdp-wsa883x-overlay.dts index 8a543a9e..e211712a 100644 --- a/qcom/kalama-cdp-wsa883x-overlay.dts +++ b/qcom/kalama-cdp-wsa883x-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama CDP WSA883x"; compatible = "qcom,kalama-cdp", "qcom,kalama", "qcom,cdp"; - qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>, <600 0x20000>, <601 0x20000>; qcom,board-id = <0x1010001 0>; }; diff --git a/qcom/kalama-mtp-nfc-overlay.dts b/qcom/kalama-mtp-nfc-overlay.dts index 71538323..608bc9ce 100644 --- a/qcom/kalama-mtp-nfc-overlay.dts +++ b/qcom/kalama-mtp-nfc-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama MTP ST54K NFC"; compatible = "qcom,kalama-mtp", "qcom,kalama", "qcom,mtp"; - qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>, <600 0x20000>, <601 0x20000>; qcom,board-id = <0x1010008 0>; }; diff --git a/qcom/kalama-mtp-overlay.dts b/qcom/kalama-mtp-overlay.dts index 10a9811c..b4305ec3 100644 --- a/qcom/kalama-mtp-overlay.dts +++ b/qcom/kalama-mtp-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama MTP"; compatible = "qcom,kalama-mtp", "qcom,kalama", "qcom,mtp"; - qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>, <600 0x20000>, <601 0x20000>; qcom,board-id = <0x10008 0>; }; diff --git a/qcom/kalama-qrd-overlay.dts b/qcom/kalama-qrd-overlay.dts index 2f02956d..01867938 100644 --- a/qcom/kalama-qrd-overlay.dts +++ b/qcom/kalama-qrd-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama QRD"; compatible = "qcom,kalama-qrd", "qcom,kalama", "qcom,qrd"; - qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>, <600 0x20000>, <601 0x20000>; qcom,board-id = <0x1000B 0>; }; diff --git a/qcom/kalama-rcm-overlay.dts b/qcom/kalama-rcm-overlay.dts index 1f7ed769..c58064d5 100644 --- a/qcom/kalama-rcm-overlay.dts +++ b/qcom/kalama-rcm-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama RCM"; compatible = "qcom,kalama-rcm", "qcom,kalama", "qcom,rcm"; - qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>, <600 0x20000>, <601 0x20000>; qcom,board-id = <0x10015 0>; }; diff --git a/qcom/kalama-sg-hhg-overlay.dts b/qcom/kalama-sg-hhg-overlay.dts new file mode 100644 index 00000000..e1f2f437 --- /dev/null +++ b/qcom/kalama-sg-hhg-overlay.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "kalama-sg-hhg.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kalama SG HHG"; + compatible = "qcom,kalama", "qcom,hhg"; + qcom,msm-id = <600 0x20000>; + qcom,board-id = <0x1001f 0x1>; +}; diff --git a/qcom/kalama-sg-hhg.dtsi b/qcom/kalama-sg-hhg.dtsi new file mode 100644 index 00000000..e68c7c5b --- /dev/null +++ b/qcom/kalama-sg-hhg.dtsi @@ -0,0 +1 @@ +#include "kalama-qrd.dtsi" diff --git a/qcom/kalama-sg.dts b/qcom/kalama-sg.dts new file mode 100644 index 00000000..7bd46be1 --- /dev/null +++ b/qcom/kalama-sg.dts @@ -0,0 +1,9 @@ +/dts-v1/; + +#include "kalama-sg.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kalama SG SoC"; + compatible = "qcom,kalama"; + qcom,board-id = <0 0>; +}; diff --git a/qcom/kalama-sg.dtsi b/qcom/kalama-sg.dtsi new file mode 100644 index 00000000..93360974 --- /dev/null +++ b/qcom/kalama-sg.dtsi @@ -0,0 +1,7 @@ +#include "kalama-v2.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kalama SG"; + compatible = "qcom,kalama"; + qcom,msm-id = <600 0x20000>; +}; diff --git a/qcom/kalamap-hdk-overlay.dts b/qcom/kalamap-hdk-overlay.dts index 746ac3c8..09cdcb8e 100644 --- a/qcom/kalamap-hdk-overlay.dts +++ b/qcom/kalamap-hdk-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. KalamaP HDK"; compatible = "qcom,kalamap-hdk", "qcom,kalamap", "qcom,hdk"; - qcom,msm-id = <536 0x10000>, <536 0x20000>; + qcom,msm-id = <536 0x10000>, <536 0x20000>, <601 0x20000>; qcom,board-id = <0x1001f 0>; }; diff --git a/qcom/kalamap-hhg-overlay.dts b/qcom/kalamap-hhg-overlay.dts index 4bb03193..ba83f50e 100644 --- a/qcom/kalamap-hhg-overlay.dts +++ b/qcom/kalamap-hhg-overlay.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. KalamaP HHG"; compatible = "qcom,kalamap-hhg", "qcom,kalamap", "qcom,hhg"; - qcom,msm-id = <536 0x10000>, <536 0x20000>; + qcom,msm-id = <536 0x10000>, <536 0x20000>, <601 0x20000>; qcom,board-id = <0x1001f 0x1>; }; diff --git a/qcom/kalamap-sg.dts b/qcom/kalamap-sg.dts new file mode 100644 index 00000000..0d1fe755 --- /dev/null +++ b/qcom/kalamap-sg.dts @@ -0,0 +1,9 @@ +/dts-v1/; + +#include "kalamap-sg.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. KalamaP SG SoC"; + compatible = "qcom,kalamap"; + qcom,board-id = <0 0>; +}; diff --git a/qcom/kalamap-sg.dtsi b/qcom/kalamap-sg.dtsi new file mode 100644 index 00000000..1e403e5a --- /dev/null +++ b/qcom/kalamap-sg.dtsi @@ -0,0 +1,7 @@ +#include "kalamap-v2.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. KalamaP SG"; + compatible = "qcom,kalamap"; + qcom,msm-id = <601 0x20000>; +};