From 8dd3972d77b0e6457821b1483c7dc4285fe4d4a1 Mon Sep 17 00:00:00 2001 From: Naina Mehta Date: Wed, 1 Sep 2021 15:29:50 +0530 Subject: [PATCH 1/3] ARM: dts: msm: Remove separate DT for digital mics for Yupik Remove separate DT support for digital mics for Yupik, YupikP and Yupik LTE on IDPS. Change-Id: Ic2b527efa014078bcd13279d9570dcfc6be41166 --- qcom/Makefile | 6 ------ qcom/yupik-idps-digital-mics-overlay.dts | 11 ----------- qcom/yupik-idps-digital-mics.dts | 10 ---------- qcom/yupik-idps-digital-mics.dtsi | 4 ---- qcom/yupikp-idps-digital-mics-overlay.dts | 11 ----------- qcom/yupikp-idps-digital-mics.dts | 10 ---------- qcom/yupikp-idps-digital-mics.dtsi | 1 - 7 files changed, 53 deletions(-) delete mode 100644 qcom/yupik-idps-digital-mics-overlay.dts delete mode 100644 qcom/yupik-idps-digital-mics.dts delete mode 100644 qcom/yupik-idps-digital-mics.dtsi delete mode 100644 qcom/yupikp-idps-digital-mics-overlay.dts delete mode 100644 qcom/yupikp-idps-digital-mics.dts delete mode 100644 qcom/yupikp-idps-digital-mics.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index 0e4c4c177b6a..c556c7a8e8dc 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -204,13 +204,11 @@ dtbo-$(CONFIG_ARCH_YUPIK) += \ yupik-idp-overlay.dtbo \ yupik-atp-overlay.dtbo \ yupik-qrd-overlay.dtbo \ - yupik-idps-digital-mics-overlay.dtbo \ yupik-idps-amoled-overlay.dtbo \ yupik-idp-pm7250b-overlay.dtbo \ yupikp-idp-overlay.dtbo \ yupikp-atp-overlay.dtbo \ yupikp-qrd-overlay.dtbo \ - yupikp-idps-digital-mics-overlay.dtbo \ yupikp-idps-amoled-overlay.dtbo \ yupik-iot-idp-overlay.dtbo \ yupik-iot-qrd-overlay.dtbo \ @@ -226,13 +224,11 @@ yupik-rumi-overlay.dtbo-base := yupik.dtb yupik-idp-overlay.dtbo-base := yupik.dtb yupik-atp-overlay.dtbo-base := yupik.dtb yupik-qrd-overlay.dtbo-base := yupik.dtb -yupik-idps-digital-mics-overlay.dtbo-base := yupik.dtb yupik-idps-amoled-overlay.dtbo-base := yupik.dtb yupik-idp-pm7250b-overlay.dtbo-base := yupik.dtb yupikp-idp-overlay.dtbo-base := yupikp.dtb yupikp-atp-overlay.dtbo-base := yupikp.dtb yupikp-qrd-overlay.dtbo-base := yupikp.dtb -yupikp-idps-digital-mics-overlay.dtbo-base := yupikp.dtb yupikp-idps-amoled-overlay.dtbo-base := yupikp.dtb yupik-iot-idp-overlay.dtbo-base := yupik-iot.dtb yupik-iot-qrd-overlay.dtbo-base := yupik-iot.dtb @@ -247,13 +243,11 @@ dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \ yupik-idp.dtb \ yupik-atp.dtb \ yupik-qrd.dtb \ - yupik-idps-digital-mics.dtb \ yupik-idps-amoled.dtb \ yupik-idp-pm7250b.dtb \ yupikp-idp.dtb \ yupikp-atp.dtb \ yupikp-qrd.dtb \ - yupikp-idps-digital-mics.dtb \ yupikp-idps-amoled.dtb \ yupik-iot-idp.dtb \ yupik-iot-qrd.dtb \ diff --git a/qcom/yupik-idps-digital-mics-overlay.dts b/qcom/yupik-idps-digital-mics-overlay.dts deleted file mode 100644 index 4f1b65e661ff..000000000000 --- a/qcom/yupik-idps-digital-mics-overlay.dts +++ /dev/null @@ -1,11 +0,0 @@ -/dts-v1/; -/plugin/; - -#include "yupik-idps-digital-mics.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Yupik IDPS + DIGITAL MICS"; - compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp"; - qcom,msm-id = <475 0x10000>, <515 0x10000>; - qcom,board-id = <34 1>; -}; diff --git a/qcom/yupik-idps-digital-mics.dts b/qcom/yupik-idps-digital-mics.dts deleted file mode 100644 index 0adab7cdd2c4..000000000000 --- a/qcom/yupik-idps-digital-mics.dts +++ /dev/null @@ -1,10 +0,0 @@ -/dts-v1/; - -#include "yupik.dtsi" -#include "yupik-idps-digital-mics.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Yupik IDPS + DIGITAL MICS"; - compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp"; - qcom,board-id = <34 1>; -}; diff --git a/qcom/yupik-idps-digital-mics.dtsi b/qcom/yupik-idps-digital-mics.dtsi deleted file mode 100644 index 885e5af51402..000000000000 --- a/qcom/yupik-idps-digital-mics.dtsi +++ /dev/null @@ -1,4 +0,0 @@ -#include "yupik-idp.dtsi" - -&soc { -}; diff --git a/qcom/yupikp-idps-digital-mics-overlay.dts b/qcom/yupikp-idps-digital-mics-overlay.dts deleted file mode 100644 index ede5df06f0b6..000000000000 --- a/qcom/yupikp-idps-digital-mics-overlay.dts +++ /dev/null @@ -1,11 +0,0 @@ -/dts-v1/; -/plugin/; - -#include "yupikp-idps-digital-mics.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. YupikP IDPS + DIGITAL MICS"; - compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp"; - qcom,msm-id = <499 0x10000>; - qcom,board-id = <34 1>; -}; diff --git a/qcom/yupikp-idps-digital-mics.dts b/qcom/yupikp-idps-digital-mics.dts deleted file mode 100644 index d798a6a6a2d0..000000000000 --- a/qcom/yupikp-idps-digital-mics.dts +++ /dev/null @@ -1,10 +0,0 @@ -/dts-v1/; - -#include "yupikp.dtsi" -#include "yupikp-idps-digital-mics.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. YupikP IDPS + DIGITAL MICS"; - compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp"; - qcom,board-id = <34 1>; -}; diff --git a/qcom/yupikp-idps-digital-mics.dtsi b/qcom/yupikp-idps-digital-mics.dtsi deleted file mode 100644 index 12c906256483..000000000000 --- a/qcom/yupikp-idps-digital-mics.dtsi +++ /dev/null @@ -1 +0,0 @@ -#include "yupik-idps-digital-mics.dtsi" From 2d0f9b43c2b4336839754c1c035568332a7c3bd5 Mon Sep 17 00:00:00 2001 From: Naina Mehta Date: Wed, 1 Sep 2021 15:36:25 +0530 Subject: [PATCH 2/3] ARM: dts: msm: Add support for HSP for Yupik Add device tree support for HSP for Yupik, YupikP and Yupik LTE platform. Change-Id: Ie51b2c20afb0e5ae824d1948f85da8437fe7928e --- qcom/Makefile | 6 ++++++ qcom/yupik-hsp.dts | 9 +++++++++ qcom/yupik-hsp.dtsi | 3 +++ qcom/yupik-idp-hsp-overlay.dts | 11 +++++++++++ qcom/yupik-idp-hsp.dts | 10 ++++++++++ qcom/yupik-idp-hsp.dtsi | 4 ++++ qcom/yupikp-hsp.dts | 9 +++++++++ qcom/yupikp-hsp.dtsi | 3 +++ qcom/yupikp-idp-hsp-overlay.dts | 11 +++++++++++ qcom/yupikp-idp-hsp.dts | 10 ++++++++++ qcom/yupikp-idp-hsp.dtsi | 2 ++ 11 files changed, 78 insertions(+) create mode 100644 qcom/yupik-hsp.dts create mode 100644 qcom/yupik-hsp.dtsi create mode 100644 qcom/yupik-idp-hsp-overlay.dts create mode 100644 qcom/yupik-idp-hsp.dts create mode 100644 qcom/yupik-idp-hsp.dtsi create mode 100644 qcom/yupikp-hsp.dts create mode 100644 qcom/yupikp-hsp.dtsi create mode 100644 qcom/yupikp-idp-hsp-overlay.dts create mode 100644 qcom/yupikp-idp-hsp.dts create mode 100644 qcom/yupikp-idp-hsp.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index c556c7a8e8dc..5e0161ebb276 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -206,10 +206,12 @@ dtbo-$(CONFIG_ARCH_YUPIK) += \ yupik-qrd-overlay.dtbo \ yupik-idps-amoled-overlay.dtbo \ yupik-idp-pm7250b-overlay.dtbo \ + yupik-idp-hsp-overlay.dtbo \ yupikp-idp-overlay.dtbo \ yupikp-atp-overlay.dtbo \ yupikp-qrd-overlay.dtbo \ yupikp-idps-amoled-overlay.dtbo \ + yupikp-idp-hsp-overlay.dtbo \ yupik-iot-idp-overlay.dtbo \ yupik-iot-qrd-overlay.dtbo \ yupik-iot-hsp-overlay.dtbo \ @@ -226,10 +228,12 @@ yupik-atp-overlay.dtbo-base := yupik.dtb yupik-qrd-overlay.dtbo-base := yupik.dtb yupik-idps-amoled-overlay.dtbo-base := yupik.dtb yupik-idp-pm7250b-overlay.dtbo-base := yupik.dtb +yupik-idp-hsp-overlay.dtbo-base := yupik-hsp.dtb yupikp-idp-overlay.dtbo-base := yupikp.dtb yupikp-atp-overlay.dtbo-base := yupikp.dtb yupikp-qrd-overlay.dtbo-base := yupikp.dtb yupikp-idps-amoled-overlay.dtbo-base := yupikp.dtb +yupikp-idp-hsp-overlay.dtbo-base := yupikp-hsp.dtb yupik-iot-idp-overlay.dtbo-base := yupik-iot.dtb yupik-iot-qrd-overlay.dtbo-base := yupik-iot.dtb yupik-iot-hsp-overlay.dtbo-base := yupik-iot.dtb @@ -245,10 +249,12 @@ dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \ yupik-qrd.dtb \ yupik-idps-amoled.dtb \ yupik-idp-pm7250b.dtb \ + yupik-idp-hsp.dtb \ yupikp-idp.dtb \ yupikp-atp.dtb \ yupikp-qrd.dtb \ yupikp-idps-amoled.dtb \ + yupikp-idp-hsp.dtb \ yupik-iot-idp.dtb \ yupik-iot-qrd.dtb \ yupik-iot-hsp.dtb \ diff --git a/qcom/yupik-hsp.dts b/qcom/yupik-hsp.dts new file mode 100644 index 000000000000..da97abe6dc64 --- /dev/null +++ b/qcom/yupik-hsp.dts @@ -0,0 +1,9 @@ +/dts-v1/; + +#include "yupik-hsp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Yupik IDP HSP + SoC"; + compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp"; + qcom,board-id = <0 1>; +}; diff --git a/qcom/yupik-hsp.dtsi b/qcom/yupik-hsp.dtsi new file mode 100644 index 000000000000..662c0725b7ae --- /dev/null +++ b/qcom/yupik-hsp.dtsi @@ -0,0 +1,3 @@ +#include "yupik.dtsi" +/ { +}; diff --git a/qcom/yupik-idp-hsp-overlay.dts b/qcom/yupik-idp-hsp-overlay.dts new file mode 100644 index 000000000000..f0dfb995e4a4 --- /dev/null +++ b/qcom/yupik-idp-hsp-overlay.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "yupik-idp-hsp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Yupik IDP + HSP"; + compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp"; + qcom,msm-id = <475 0x10000>, <515 0x10000>; + qcom,board-id = <34 1>; +}; diff --git a/qcom/yupik-idp-hsp.dts b/qcom/yupik-idp-hsp.dts new file mode 100644 index 000000000000..4ab8c6224e2c --- /dev/null +++ b/qcom/yupik-idp-hsp.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "yupik-hsp.dtsi" +#include "yupik-idp-hsp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Yupik IDP + HSP"; + compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp"; + qcom,board-id = <34 1>; +}; diff --git a/qcom/yupik-idp-hsp.dtsi b/qcom/yupik-idp-hsp.dtsi new file mode 100644 index 000000000000..885e5af51402 --- /dev/null +++ b/qcom/yupik-idp-hsp.dtsi @@ -0,0 +1,4 @@ +#include "yupik-idp.dtsi" + +&soc { +}; diff --git a/qcom/yupikp-hsp.dts b/qcom/yupikp-hsp.dts new file mode 100644 index 000000000000..4d0392c3605f --- /dev/null +++ b/qcom/yupikp-hsp.dts @@ -0,0 +1,9 @@ +/dts-v1/; + +#include "yupikp-hsp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. YupikP IDP HSP + SoC"; + compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp"; + qcom,board-id = <0 1>; +}; diff --git a/qcom/yupikp-hsp.dtsi b/qcom/yupikp-hsp.dtsi new file mode 100644 index 000000000000..0bbe35be28d2 --- /dev/null +++ b/qcom/yupikp-hsp.dtsi @@ -0,0 +1,3 @@ +#include "yupikp.dtsi" +/ { +}; diff --git a/qcom/yupikp-idp-hsp-overlay.dts b/qcom/yupikp-idp-hsp-overlay.dts new file mode 100644 index 000000000000..44bc8f59298f --- /dev/null +++ b/qcom/yupikp-idp-hsp-overlay.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "yupikp-idp-hsp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. YupikP IDP + HSP"; + compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp"; + qcom,msm-id = <499 0x10000>; + qcom,board-id = <34 1>; +}; diff --git a/qcom/yupikp-idp-hsp.dts b/qcom/yupikp-idp-hsp.dts new file mode 100644 index 000000000000..bee755e4726d --- /dev/null +++ b/qcom/yupikp-idp-hsp.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "yupikp-hsp.dtsi" +#include "yupikp-idp-hsp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. YupikP IDP + HSP"; + compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp"; + qcom,board-id = <34 1>; +}; diff --git a/qcom/yupikp-idp-hsp.dtsi b/qcom/yupikp-idp-hsp.dtsi new file mode 100644 index 000000000000..eb5f4b6d646a --- /dev/null +++ b/qcom/yupikp-idp-hsp.dtsi @@ -0,0 +1,2 @@ +#include "yupik-idp-hsp.dtsi" + From 4d38d75d6359969399fff005096440f0b5728d6d Mon Sep 17 00:00:00 2001 From: Naman Padhiar Date: Fri, 3 Sep 2021 18:19:44 +0530 Subject: [PATCH 3/3] ARM: dts: msm: Add CNSS DT Node for HSP support Add CNSS DT node and enable other nodes for HSP support in Yupik MCC. Change-Id: Ica348afd9cf3a9973b187171485d0f0518662a60 --- qcom/yupik-hsp.dtsi | 23 ++++++++++++ qcom/yupik-idp-hsp-overlay.dts | 1 + qcom/yupik-idp-hsp.dtsi | 62 +++++++++++++++++++++++++++++++++ qcom/yupikp-idp-hsp-overlay.dts | 1 + 4 files changed, 87 insertions(+) diff --git a/qcom/yupik-hsp.dtsi b/qcom/yupik-hsp.dtsi index 662c0725b7ae..cc8df8e0eb0f 100644 --- a/qcom/yupik-hsp.dtsi +++ b/qcom/yupik-hsp.dtsi @@ -1,3 +1,26 @@ #include "yupik.dtsi" / { }; + +&gcc { + clocks = <&rpmhcc RPMH_CXO_CLK>, <&sleep_clk>, + <&usb3_phy_wrapper_gcc_usb30_pipe_clk>, + <&pcie_0_pipe_clk>, <&pcie_1_pipe_clk>; + clock-names = "bi_tcxo", "sleep_clk", + "usb3_phy_wrapper_gcc_usb30_pipe_clk", + "pcie_0_pipe_clk", "pcie_1_pipe_clk"; + + /delete-property/ protected-clocks; +}; + +&gcc_pcie_0_gdsc { + status = "ok"; +}; + +&gcc_pcie_1_gdsc { + status = "ok"; +}; + +&gcc_usb30_sec_gdsc { + status = "ok"; +}; diff --git a/qcom/yupik-idp-hsp-overlay.dts b/qcom/yupik-idp-hsp-overlay.dts index f0dfb995e4a4..0b78f806c06b 100644 --- a/qcom/yupik-idp-hsp-overlay.dts +++ b/qcom/yupik-idp-hsp-overlay.dts @@ -1,6 +1,7 @@ /dts-v1/; /plugin/; +#include #include "yupik-idp-hsp.dtsi" / { diff --git a/qcom/yupik-idp-hsp.dtsi b/qcom/yupik-idp-hsp.dtsi index 885e5af51402..2bcd7f793027 100644 --- a/qcom/yupik-idp-hsp.dtsi +++ b/qcom/yupik-idp-hsp.dtsi @@ -1,4 +1,66 @@ #include "yupik-idp.dtsi" +#include "qcx6490-cnss.dtsi" + +&wlan { + qcom,same-dt-multi-dev; +}; + +&pcie0 { + status = "ok"; +}; + +&pcie0_msi { + status = "ok"; +}; + +&pcie1 { + status = "ok"; + qcom,boot-option = <0x0>; + qcom,ep-gpio = <&tlmm 19 0>; + pinctrl-0 = <&pcie1_perst_default + &pcie1_clkreq_default + &pcie1_wake_default + &pcie1_ep_default>; + pinctrl-1 = <&pcie1_perst_default + &pcie1_clkreq_sleep + &pcie1_wake_default + &pcie1_ep_default>; +}; + +&pcie1_msi { + status = "ok"; +}; + +&pm7325_gpios { + usb2_vbus_boost { + usb2_vbus_boost_default: usb2_vbus_boost_default { + pins = "gpio8"; + function = "normal"; + output-low; + power-source = <0>; /* 1.8V input supply */ + }; + }; +}; &soc { + usb2_vbus_boost_reg: usb2_vbus_boost_reg { + compatible = "regulator-fixed"; + regulator-name = "usb2_vbus_boost_vreg"; + startup-delay-us = <4000>; + enable-active-high; + gpios = <&pm7325_gpios 8 0>; + + pinctrl-names = "default"; + pinctrl-0 = <&usb2_vbus_boost_default>; + }; +}; + +&usb1 { + vbus_dwc3-supply = <&usb2_vbus_boost_reg>; + qcom,default-mode-none; + status = "ok"; +}; + +&usb2_phy1 { + status = "ok"; }; diff --git a/qcom/yupikp-idp-hsp-overlay.dts b/qcom/yupikp-idp-hsp-overlay.dts index 44bc8f59298f..da2b428bc2ed 100644 --- a/qcom/yupikp-idp-hsp-overlay.dts +++ b/qcom/yupikp-idp-hsp-overlay.dts @@ -1,6 +1,7 @@ /dts-v1/; /plugin/; +#include #include "yupikp-idp-hsp.dtsi" / {