mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-23 13:09:04 -04:00
Merge "ARM: dts: msm: disable IPA entry for blair APQ targets"
This commit is contained in:
commit
f46dd20b1c
25 changed files with 348 additions and 2 deletions
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
44
qcom/blairp-atp-overlay.dts
Normal file
44
qcom/blairp-atp-overlay.dts
Normal file
|
|
@ -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";
|
||||
};
|
||||
10
qcom/blairp-atp.dts
Normal file
10
qcom/blairp-atp.dts
Normal file
|
|
@ -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>;
|
||||
};
|
||||
1
qcom/blairp-atp.dtsi
Normal file
1
qcom/blairp-atp.dtsi
Normal file
|
|
@ -0,0 +1 @@
|
|||
#include "blair-atp.dtsi"
|
||||
16
qcom/blairp-cdp-overlay.dts
Normal file
16
qcom/blairp-cdp-overlay.dts
Normal file
|
|
@ -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>;
|
||||
};
|
||||
10
qcom/blairp-cdp.dts
Normal file
10
qcom/blairp-cdp.dts
Normal file
|
|
@ -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>;
|
||||
};
|
||||
1
qcom/blairp-cdp.dtsi
Normal file
1
qcom/blairp-cdp.dtsi
Normal file
|
|
@ -0,0 +1 @@
|
|||
#include "blair-cdp.dtsi"
|
||||
14
qcom/blairp-mtp-nopmi-overlay.dts
Normal file
14
qcom/blairp-mtp-nopmi-overlay.dts
Normal file
|
|
@ -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>;
|
||||
};
|
||||
|
||||
13
qcom/blairp-mtp-nopmi.dts
Normal file
13
qcom/blairp-mtp-nopmi.dts
Normal file
|
|
@ -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>;
|
||||
};
|
||||
|
||||
2
qcom/blairp-mtp-nopmi.dtsi
Normal file
2
qcom/blairp-mtp-nopmi.dtsi
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
#include "blair-mtp-nopmi.dtsi"
|
||||
|
||||
18
qcom/blairp-mtp-overlay.dts
Normal file
18
qcom/blairp-mtp-overlay.dts
Normal file
|
|
@ -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>;
|
||||
};
|
||||
53
qcom/blairp-mtp-usbc-overlay.dts
Normal file
53
qcom/blairp-mtp-usbc-overlay.dts
Normal file
|
|
@ -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";
|
||||
};
|
||||
15
qcom/blairp-mtp-usbc.dts
Normal file
15
qcom/blairp-mtp-usbc.dts
Normal file
|
|
@ -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>;
|
||||
};
|
||||
1
qcom/blairp-mtp-usbc.dtsi
Normal file
1
qcom/blairp-mtp-usbc.dtsi
Normal file
|
|
@ -0,0 +1 @@
|
|||
#include "blair-mtp-usbc.dtsi"
|
||||
17
qcom/blairp-mtp.dts
Normal file
17
qcom/blairp-mtp.dts
Normal file
|
|
@ -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>;
|
||||
};
|
||||
1
qcom/blairp-mtp.dtsi
Normal file
1
qcom/blairp-mtp.dtsi
Normal file
|
|
@ -0,0 +1 @@
|
|||
#include "blair-mtp.dtsi"
|
||||
14
qcom/blairp-qrd-nopmi-overlay.dts
Normal file
14
qcom/blairp-qrd-nopmi-overlay.dts
Normal file
|
|
@ -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>;
|
||||
};
|
||||
|
||||
13
qcom/blairp-qrd-nopmi.dts
Normal file
13
qcom/blairp-qrd-nopmi.dts
Normal file
|
|
@ -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>;
|
||||
};
|
||||
|
||||
2
qcom/blairp-qrd-nopmi.dtsi
Normal file
2
qcom/blairp-qrd-nopmi.dtsi
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
#include "blair-qrd-nopmi.dtsi"
|
||||
|
||||
18
qcom/blairp-qrd-overlay.dts
Normal file
18
qcom/blairp-qrd-overlay.dts
Normal file
|
|
@ -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>;
|
||||
};
|
||||
17
qcom/blairp-qrd.dts
Normal file
17
qcom/blairp-qrd.dts
Normal file
|
|
@ -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>;
|
||||
};
|
||||
1
qcom/blairp-qrd.dtsi
Normal file
1
qcom/blairp-qrd.dtsi
Normal file
|
|
@ -0,0 +1 @@
|
|||
#include "blair-qrd.dtsi"
|
||||
9
qcom/blairp.dts
Normal file
9
qcom/blairp.dts
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
/dts-v1/;
|
||||
|
||||
#include "blairp.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Blairp SoC";
|
||||
compatible = "qcom,blairp";
|
||||
qcom,board-id = <0 0>;
|
||||
};
|
||||
28
qcom/blairp.dtsi
Normal file
28
qcom/blairp.dtsi
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
/dts-v1/;
|
||||
|
||||
#include "blair.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Blairp SoC";
|
||||
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";
|
||||
};
|
||||
|
||||
};
|
||||
Loading…
Reference in a new issue