From 95a9d5b65b23f667f7d7b2655390f2368615ad52 Mon Sep 17 00:00:00 2001 From: Ashish Bhimanpalliwar Date: Mon, 21 Feb 2022 12:05:02 +0530 Subject: [PATCH 1/2] ARM: dts: qcom: Add apq variant device tree support to Blair Add APQ variant device trees support for Blair. Change-Id: I10f716f061970b66570fbff6071632c8787954fb --- bindings/arm/msm/msm.txt | 7 ++++ qcom/Makefile | 25 +++++++++++++-- qcom/blairp-atp-overlay.dts | 44 +++++++++++++++++++++++++ qcom/blairp-atp.dts | 10 ++++++ qcom/blairp-atp.dtsi | 1 + qcom/blairp-cdp-overlay.dts | 16 ++++++++++ qcom/blairp-cdp.dts | 10 ++++++ qcom/blairp-cdp.dtsi | 1 + qcom/blairp-mtp-nopmi-overlay.dts | 14 ++++++++ qcom/blairp-mtp-nopmi.dts | 13 ++++++++ qcom/blairp-mtp-nopmi.dtsi | 2 ++ qcom/blairp-mtp-overlay.dts | 18 +++++++++++ qcom/blairp-mtp-usbc-overlay.dts | 53 +++++++++++++++++++++++++++++++ qcom/blairp-mtp-usbc.dts | 15 +++++++++ qcom/blairp-mtp-usbc.dtsi | 1 + qcom/blairp-mtp.dts | 17 ++++++++++ qcom/blairp-mtp.dtsi | 1 + qcom/blairp-qrd-nopmi-overlay.dts | 14 ++++++++ qcom/blairp-qrd-nopmi.dts | 13 ++++++++ qcom/blairp-qrd-nopmi.dtsi | 2 ++ qcom/blairp-qrd-overlay.dts | 18 +++++++++++ qcom/blairp-qrd.dts | 17 ++++++++++ qcom/blairp-qrd.dtsi | 1 + qcom/blairp.dts | 9 ++++++ qcom/blairp.dtsi | 9 ++++++ 25 files changed, 329 insertions(+), 2 deletions(-) create mode 100644 qcom/blairp-atp-overlay.dts create mode 100644 qcom/blairp-atp.dts create mode 100644 qcom/blairp-atp.dtsi create mode 100644 qcom/blairp-cdp-overlay.dts create mode 100644 qcom/blairp-cdp.dts create mode 100644 qcom/blairp-cdp.dtsi create mode 100644 qcom/blairp-mtp-nopmi-overlay.dts create mode 100644 qcom/blairp-mtp-nopmi.dts create mode 100644 qcom/blairp-mtp-nopmi.dtsi create mode 100644 qcom/blairp-mtp-overlay.dts create mode 100644 qcom/blairp-mtp-usbc-overlay.dts create mode 100644 qcom/blairp-mtp-usbc.dts create mode 100644 qcom/blairp-mtp-usbc.dtsi create mode 100644 qcom/blairp-mtp.dts create mode 100644 qcom/blairp-mtp.dtsi create mode 100644 qcom/blairp-qrd-nopmi-overlay.dts create mode 100644 qcom/blairp-qrd-nopmi.dts create mode 100644 qcom/blairp-qrd-nopmi.dtsi create mode 100644 qcom/blairp-qrd-overlay.dts create mode 100644 qcom/blairp-qrd.dts create mode 100644 qcom/blairp-qrd.dtsi create mode 100644 qcom/blairp.dts create mode 100644 qcom/blairp.dtsi diff --git a/bindings/arm/msm/msm.txt b/bindings/arm/msm/msm.txt index 013f38e3fe76..0cca021ae5f2 100644 --- a/bindings/arm/msm/msm.txt +++ b/bindings/arm/msm/msm.txt @@ -104,6 +104,9 @@ SoCs: - BLAIR compatible = "qcom,blair" +- BLAIRP + compatible = "qcom,blairp" + - MONACO compatible = "qcom,monaco" @@ -300,6 +303,10 @@ compatible = "qcom,blair-mtp" compatible = "qcom,blair-cdp" compatible = "qcom,blair-atp" compatible = "qcom,blair-qrd" +compatible = "qcom,blairp-mtp" +compatible = "qcom,blairp-cdp" +compatible = "qcom,blairp-atp" +compatible = "qcom,blairp-qrd" compatible = "qcom,scuba-idp" compatible = "qcom,monaco-rumi" compatible = "qcom,monaco" diff --git a/qcom/Makefile b/qcom/Makefile index cfe040cf7742..694208016e3c 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -150,7 +150,14 @@ dtbo-$(CONFIG_ARCH_BLAIR) += blair-rumi-overlay.dtbo \ blair-qrd-overlay.dtbo \ blair-mtp-usbc-overlay.dtbo \ blair-mtp-nopmi-overlay.dtbo \ - blair-qrd-nopmi-overlay.dtbo + blair-qrd-nopmi-overlay.dtbo \ + blairp-mtp-overlay.dtbo \ + blairp-cdp-overlay.dtbo \ + blairp-atp-overlay.dtbo \ + blairp-qrd-overlay.dtbo \ + blairp-mtp-usbc-overlay.dtbo \ + blairp-mtp-nopmi-overlay.dtbo \ + blairp-qrd-nopmi-overlay.dtbo blair-rumi-overlay.dtbo-base := blair.dtb blair-mtp-overlay.dtbo-base := blair.dtb @@ -160,6 +167,13 @@ blair-qrd-overlay.dtbo-base := blair.dtb blair-mtp-usbc-overlay.dtbo-base := blair.dtb blair-mtp-nopmi-overlay.dtbo-base := blair.dtb blair-qrd-nopmi-overlay.dtbo-base := blair.dtb +blairp-mtp-overlay.dtbo-base := blairp.dtb +blairp-cdp-overlay.dtbo-base := blairp.dtb +blairp-atp-overlay.dtbo-base := blairp.dtb +blairp-qrd-overlay.dtbo-base := blairp.dtb +blairp-mtp-usbc-overlay.dtbo-base := blairp.dtb +blairp-mtp-nopmi-overlay.dtbo-base := blairp.dtb +blairp-qrd-nopmi-overlay.dtbo-base := blairp.dtb else dtb-$(CONFIG_ARCH_BLAIR) += blair-rumi.dtb \ blair-mtp.dtb \ @@ -168,7 +182,14 @@ dtb-$(CONFIG_ARCH_BLAIR) += blair-rumi.dtb \ blair-qrd.dtb \ blair-mtp-usbc.dtb \ blair-mtp-nopmi.dtb \ - blair-qrd-nopmi.dtb + blair-qrd-nopmi.dtb \ + blairp-mtp.dtb \ + blairp-cdp.dtb \ + blairp-atp.dtb \ + blairp-qrd.dtb \ + blairp-mtp-usbc.dtb \ + blairp-mtp-nopmi.dtb \ + blairp-qrd-nopmi.dtb endif ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) diff --git a/qcom/blairp-atp-overlay.dts b/qcom/blairp-atp-overlay.dts new file mode 100644 index 000000000000..bb7b8787bdd3 --- /dev/null +++ b/qcom/blairp-atp-overlay.dts @@ -0,0 +1,44 @@ +/dts-v1/; +/plugin/; + +#include "blairp-atp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp ATP"; + compatible = "qcom,blairp-atp", "qcom,blairp", "qcom,atp"; + qcom,msm-id = <565 0x10000>; + qcom,board-id = <33 0>; +}; + +&wsa881x_i2c_e { + status = "disabled"; +}; + +&wsa881x_i2c_44 { + status = "disabled"; +}; + +&wcd937x_tx_slave { + status = "disabled"; +}; + +&wcd937x_rx_slave { + status = "disabled"; +}; + +&wcd937x_codec { + status = "disabled"; +}; + +&holi_snd { + qcom,wcd-disabled = <1>; + qcom,audio-routing = + "RX_TX DEC0_INP", "TX DEC0 MUX", + "RX_TX DEC1_INP", "TX DEC1 MUX", + "RX_TX DEC2_INP", "TX DEC2 MUX", + "RX_TX DEC3_INP", "TX DEC3 MUX", + "VA SWR_INPUT", "VA_SWR_CLK", + "VA_AIF1 CAP", "VA_SWR_CLK", + "VA_AIF2 CAP", "VA_SWR_CLK", + "VA_AIF3 CAP", "VA_SWR_CLK"; +}; diff --git a/qcom/blairp-atp.dts b/qcom/blairp-atp.dts new file mode 100644 index 000000000000..f428a1ce4008 --- /dev/null +++ b/qcom/blairp-atp.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "blairp.dtsi" +#include "blairp-atp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp ATP"; + compatible = "qcom,blairp-atp", "qcom,blairp", "qcom,atp"; + qcom,board-id = <33 0>; +}; diff --git a/qcom/blairp-atp.dtsi b/qcom/blairp-atp.dtsi new file mode 100644 index 000000000000..0655e61bdc13 --- /dev/null +++ b/qcom/blairp-atp.dtsi @@ -0,0 +1 @@ +#include "blair-atp.dtsi" diff --git a/qcom/blairp-cdp-overlay.dts b/qcom/blairp-cdp-overlay.dts new file mode 100644 index 000000000000..02704e07a2a9 --- /dev/null +++ b/qcom/blairp-cdp-overlay.dts @@ -0,0 +1,16 @@ +/dts-v1/; +/plugin/; + +#include "blairp-cdp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp CDP"; + compatible = "qcom,blairp-cdp", "qcom,blairp", "qcom,cdp"; + qcom,msm-id = <565 0x10000>; + qcom,board-id = <1 0>; +}; + +&wsa881x_analog_reset_gpio { + pinctrl-0 = <&spkr_1_sd_n_active>; + pinctrl-1 = <&spkr_1_sd_n_sleep>; +}; diff --git a/qcom/blairp-cdp.dts b/qcom/blairp-cdp.dts new file mode 100644 index 000000000000..0b6e0547abf3 --- /dev/null +++ b/qcom/blairp-cdp.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +#include "blairp.dtsi" +#include "blairp-cdp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp CDP"; + compatible = "qcom,blairp-cdp", "qcom,blairp", "qcom,cdp"; + qcom,board-id = <1 0>; +}; diff --git a/qcom/blairp-cdp.dtsi b/qcom/blairp-cdp.dtsi new file mode 100644 index 000000000000..048e3c5d9dd1 --- /dev/null +++ b/qcom/blairp-cdp.dtsi @@ -0,0 +1 @@ +#include "blair-cdp.dtsi" diff --git a/qcom/blairp-mtp-nopmi-overlay.dts b/qcom/blairp-mtp-nopmi-overlay.dts new file mode 100644 index 000000000000..58003066810b --- /dev/null +++ b/qcom/blairp-mtp-nopmi-overlay.dts @@ -0,0 +1,14 @@ +/dts-v1/; +/plugin/; + +#include "blairp-mtp-nopmi.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp MTP NOPMI"; + compatible = "qcom,blairp-mtp", "qcom,blairp", "qcom,mtp"; + qcom,msm-id = <565 0x10000>; + qcom,board-id = <8 0>; + qcom,pmic-id-size = <4>; + qcom,pmic-id = <0x2D 0x0 0x0 0x0>; +}; + diff --git a/qcom/blairp-mtp-nopmi.dts b/qcom/blairp-mtp-nopmi.dts new file mode 100644 index 000000000000..4f1cee09132a --- /dev/null +++ b/qcom/blairp-mtp-nopmi.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +#include "blairp.dtsi" +#include "blairp-mtp-nopmi.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp MTP NOPMI"; + compatible = "qcom,blairp-mtp", "qcom,blairp", "qcom,mtp"; + qcom,board-id = <8 0>; + qcom,pmic-id-size = <4>; + qcom,pmic-id = <0x2D 0x0 0x0 0x0>; +}; + diff --git a/qcom/blairp-mtp-nopmi.dtsi b/qcom/blairp-mtp-nopmi.dtsi new file mode 100644 index 000000000000..684585a2fa27 --- /dev/null +++ b/qcom/blairp-mtp-nopmi.dtsi @@ -0,0 +1,2 @@ +#include "blair-mtp-nopmi.dtsi" + diff --git a/qcom/blairp-mtp-overlay.dts b/qcom/blairp-mtp-overlay.dts new file mode 100644 index 000000000000..37651c24ece1 --- /dev/null +++ b/qcom/blairp-mtp-overlay.dts @@ -0,0 +1,18 @@ +/dts-v1/; +/plugin/; + +#include "blairp-mtp.dtsi" +#include "holi-mtp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp MTP"; + compatible = "qcom,blairp-mtp", "qcom,blairp", "qcom,mtp"; + qcom,msm-id = <565 0x10000>; + qcom,board-id = <8 0>; + qcom,pmic-id-size = <4>; + qcom,pmic-id = <0x2D 0x0 0x2E 0x0>; +}; + +&pm7250b_charger { + dpdm-supply = <&usb2_phy0>; +}; diff --git a/qcom/blairp-mtp-usbc-overlay.dts b/qcom/blairp-mtp-usbc-overlay.dts new file mode 100644 index 000000000000..8df452b841c0 --- /dev/null +++ b/qcom/blairp-mtp-usbc-overlay.dts @@ -0,0 +1,53 @@ +/dts-v1/; +/plugin/; + +#include "blairp-mtp-usbc.dtsi" +#include "holi-mtp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp MTP USBC audio"; + compatible = "qcom,blairp-mtp", "qcom,blairp", "qcom,mtp"; + qcom,msm-id = <565 0x10000>; + qcom,board-id = <8 1>; +}; + +&swr0 { + qcom,is_wcd937x = <0>; +}; + +&wcd937x_tx_slave { + status = "disabled"; +}; + +&wcd937x_rx_slave { + status = "disabled"; +}; + +&wcd937x_codec { + status = "disabled"; +}; + +&pm7250b_charger { + dpdm-supply = <&usb2_phy0>; +}; + +&wcd938x_tx_slave { + status = "ok"; +}; + +&wcd938x_rx_slave { + status = "ok"; +}; + +&wcd938x_codec { + status = "ok"; +}; + +&holi_snd { + asoc-codec = <&stub_codec>, <&bolero>, + <&wcd938x_codec>, <&wsa881x_i2c_e>, + <&wsa881x_i2c_f>; + asoc-codec-names = "msm-stub-codec.1", "bolero_codec", + "wcd938x_codec", "wsa-codec0", + "wsa-codec1"; +}; diff --git a/qcom/blairp-mtp-usbc.dts b/qcom/blairp-mtp-usbc.dts new file mode 100644 index 000000000000..4590d8e52055 --- /dev/null +++ b/qcom/blairp-mtp-usbc.dts @@ -0,0 +1,15 @@ +/dts-v1/; + +#include "blairp.dtsi" +#include "blairp-mtp-usbc.dtsi" +#include "holi-mtp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. BLAIRP MTP USBC audio"; + compatible = "qcom,blairp-mtp", "qcom,blairp", "qcom,mtp"; + qcom,board-id = <8 1>; +}; + +&pm7250b_charger { + dpdm-supply = <&usb2_phy0>; +}; diff --git a/qcom/blairp-mtp-usbc.dtsi b/qcom/blairp-mtp-usbc.dtsi new file mode 100644 index 000000000000..b90e9b1c0b19 --- /dev/null +++ b/qcom/blairp-mtp-usbc.dtsi @@ -0,0 +1 @@ +#include "blair-mtp-usbc.dtsi" diff --git a/qcom/blairp-mtp.dts b/qcom/blairp-mtp.dts new file mode 100644 index 000000000000..305dbd64a19e --- /dev/null +++ b/qcom/blairp-mtp.dts @@ -0,0 +1,17 @@ +/dts-v1/; + +#include "blairp.dtsi" +#include "blairp-mtp.dtsi" +#include "holi-mtp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp MTP"; + compatible = "qcom,blairp-mtp", "qcom,blairp", "qcom,mtp"; + qcom,board-id = <8 0>; + qcom,pmic-id-size = <4>; + qcom,pmic-id = <0x2D 0x0 0x2E 0x0>; +}; + +&pm7250b_charger { + dpdm-supply = <&usb2_phy0>; +}; diff --git a/qcom/blairp-mtp.dtsi b/qcom/blairp-mtp.dtsi new file mode 100644 index 000000000000..b8622d186cf9 --- /dev/null +++ b/qcom/blairp-mtp.dtsi @@ -0,0 +1 @@ +#include "blair-mtp.dtsi" diff --git a/qcom/blairp-qrd-nopmi-overlay.dts b/qcom/blairp-qrd-nopmi-overlay.dts new file mode 100644 index 000000000000..d3a8ca2f0c0b --- /dev/null +++ b/qcom/blairp-qrd-nopmi-overlay.dts @@ -0,0 +1,14 @@ +/dts-v1/; +/plugin/; + +#include "blairp-qrd-nopmi.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp QRD NOPMI"; + compatible = "qcom,blairp-qrd", "qcom,blairp", "qcom,qrd"; + qcom,msm-id = <565 0x10000>; + qcom,board-id = <0x1000B 0>; + qcom,pmic-id-size = <4>; + qcom,pmic-id = <0x2D 0x0 0x0 0x0>; +}; + diff --git a/qcom/blairp-qrd-nopmi.dts b/qcom/blairp-qrd-nopmi.dts new file mode 100644 index 000000000000..64cac8f5ccf5 --- /dev/null +++ b/qcom/blairp-qrd-nopmi.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +#include "blairp.dtsi" +#include "blairp-qrd-nopmi.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp QRD NOPMI"; + compatible = "qcom,blairp-qrd", "qcom,blairp", "qcom,qrd"; + qcom,board-id = <0x1000B 0>; + qcom,pmic-id-size = <4>; + qcom,pmic-id = <0x2D 0x0 0x0 0x0>; +}; + diff --git a/qcom/blairp-qrd-nopmi.dtsi b/qcom/blairp-qrd-nopmi.dtsi new file mode 100644 index 000000000000..c1ab5e75c7fb --- /dev/null +++ b/qcom/blairp-qrd-nopmi.dtsi @@ -0,0 +1,2 @@ +#include "blair-qrd-nopmi.dtsi" + diff --git a/qcom/blairp-qrd-overlay.dts b/qcom/blairp-qrd-overlay.dts new file mode 100644 index 000000000000..40c9baef8462 --- /dev/null +++ b/qcom/blairp-qrd-overlay.dts @@ -0,0 +1,18 @@ +/dts-v1/; +/plugin/; + +#include "blairp-qrd.dtsi" +#include "holi-qrd-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp QRD"; + compatible = "qcom,blairp-qrd", "qcom,blairp", "qcom,qrd"; + qcom,msm-id = <565 0x10000>; + qcom,board-id = <0x1000B 0>; + qcom,pmic-id-size = <4>; + qcom,pmic-id = <0x2D 0x0 0x2E 0x0>; +}; + +&pm7250b_charger { + dpdm-supply = <&usb2_phy0>; +}; diff --git a/qcom/blairp-qrd.dts b/qcom/blairp-qrd.dts new file mode 100644 index 000000000000..7f4730b19a02 --- /dev/null +++ b/qcom/blairp-qrd.dts @@ -0,0 +1,17 @@ +/dts-v1/; + +#include "blairp.dtsi" +#include "blairp-qrd.dtsi" +#include "holi-qrd-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp QRD"; + compatible = "qcom,blairp-qrd", "qcom,blairp", "qcom,qrd"; + qcom,board-id = <0x1000B 0>; + qcom,pmic-id-size = <4>; + qcom,pmic-id = <0x2D 0x0 0x2E 0x0>; +}; + +&pm7250b_charger { + dpdm-supply = <&usb2_phy0>; +}; diff --git a/qcom/blairp-qrd.dtsi b/qcom/blairp-qrd.dtsi new file mode 100644 index 000000000000..b35b4131b743 --- /dev/null +++ b/qcom/blairp-qrd.dtsi @@ -0,0 +1 @@ +#include "blair-qrd.dtsi" diff --git a/qcom/blairp.dts b/qcom/blairp.dts new file mode 100644 index 000000000000..0377d012c7c4 --- /dev/null +++ b/qcom/blairp.dts @@ -0,0 +1,9 @@ +/dts-v1/; + +#include "blairp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp SoC"; + compatible = "qcom,blairp"; + qcom,board-id = <0 0>; +}; diff --git a/qcom/blairp.dtsi b/qcom/blairp.dtsi new file mode 100644 index 000000000000..ebdbccee7d06 --- /dev/null +++ b/qcom/blairp.dtsi @@ -0,0 +1,9 @@ +/dts-v1/; + +#include "blair.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Blairp SoC"; + compatible = "qcom,blairp"; + qcom,msm-id = <565 0x10000>; +}; From 21e8c52dfc4a241fdec017c5d19012dbf0d3c349 Mon Sep 17 00:00:00 2001 From: Jagadeesh Ponduru Date: Fri, 25 Feb 2022 18:21:54 +0530 Subject: [PATCH 2/2] ARM: dts: msm: disable IPA entry for blair APQ targets Change to disable IPA through dtsi file for blairp target. Change-Id: I0a081cfeb3ecd1522415e4031bae2d55d5d2ec38 --- qcom/blairp.dtsi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/qcom/blairp.dtsi b/qcom/blairp.dtsi index ebdbccee7d06..c446a1e4d67d 100644 --- a/qcom/blairp.dtsi +++ b/qcom/blairp.dtsi @@ -7,3 +7,22 @@ compatible = "qcom,blairp"; qcom,msm-id = <565 0x10000>; }; + +&soc { + qcom,msm_gsi { + status = "disabled"; + }; + + qcom,rmnet-ipa { + status = "disabled"; + }; + + qcom,ipa_fws { + status = "disabled"; + }; + + ipa_hw: qcom,ipa@0x5800000 { + status = "disabled"; + }; + +};