Merge 829d426e90 on remote branch

Change-Id: If5fb88e036f784efe0efe17ce5df5f2f26782adf
This commit is contained in:
Linux Build Service Account
2024-12-13 21:38:28 -08:00
16 changed files with 36 additions and 24 deletions

3
Kbuild
View File

@@ -53,6 +53,9 @@ dtbo-y += kera-atp-qca6750.dtbo
dtbo-y += kera-cdp-qca6750.dtbo dtbo-y += kera-cdp-qca6750.dtbo
dtbo-y += kera-mtp-qca6750.dtbo dtbo-y += kera-mtp-qca6750.dtbo
dtbo-y += kera-rcm-qca6750.dtbo dtbo-y += kera-rcm-qca6750.dtbo
dtbo-y += kera-mtp-wcn7750.dtbo
dtbo-y += kera-qrd-wcn7750.dtbo
dtbo-y += kera-rcm-wcn7750.dtbo
endif endif
always-y := $(dtb-y) $(dtbo-y) always-y := $(dtb-y) $(dtbo-y)

View File

@@ -15,5 +15,5 @@
qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>, qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>,
<0x1000294 0x10000>, <0x1000294 0x20000>, <0x1000294 0x10000>, <0x1000294 0x20000>,
<0x1000295 0x10000>, <0x1000295 0x20000>; <0x1000295 0x10000>, <0x1000295 0x20000>;
qcom,board-id = <0x1000001 0>, <0x1000008 0>, <0x1000015 0>; qcom,board-id = <0x30001 0>, <0x20008 0>, <0x30015 0>;
}; };

View File

@@ -15,5 +15,7 @@
qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>, qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>,
<0x1000294 0x10000>, <0x1000294 0x20000>, <0x1000295 0x10000>, <0x1000294 0x10000>, <0x1000294 0x20000>, <0x1000295 0x10000>,
<0x1000295 0x20000>; <0x1000295 0x20000>;
qcom,board-id = <1 0>, <8 0>, <0x10021 0>, <11 0>, <0x15 0>, <0x208 0>, <0x108 0>; qcom,board-id = <1 0>, <0x20001 0>, <8 0>, <0x30008 0>, <0x40008 0>,
<0x50008 0>, <0x60008 0>, <0x70008 0>, <0x21 0>, <11 0>,
<0x2000B 0>, <0x15 0>, <0x20015 0>, <0x30015 0>;
}; };

View File

@@ -12,5 +12,5 @@
model = "Qualcomm Technologies, Inc. Kera RCM"; model = "Qualcomm Technologies, Inc. Kera RCM";
compatible = "qcom,kera-rcm", "qcom,kera", "qcom,rcm"; compatible = "qcom,kera-rcm", "qcom,kera", "qcom,rcm";
qcom,msm-id = <686 0x10000>, <659 0x10000>; qcom,msm-id = <686 0x10000>, <659 0x10000>;
qcom,board-id = <0x010015 0>, <0x020015 0>; qcom,board-id = <0x010015 0>, <0x020015 0>, <0x030015 0>;
}; };

View File

@@ -12,5 +12,5 @@
model = "Qualcomm Technologies, Inc. Kera RCM"; model = "Qualcomm Technologies, Inc. Kera RCM";
compatible = "qcom,kera-rcm", "qcom,kera", "qcom,rcm"; compatible = "qcom,kera-rcm", "qcom,kera", "qcom,rcm";
qcom,msm-id = <686 0x10000>, <659 0x10000>; qcom,msm-id = <686 0x10000>, <659 0x10000>;
qcom,board-id = <0x010015 1>, <0x020015 1>; qcom,board-id = <0x010015 1>, <0x020015 1>, <0x030015 1>;
}; };

View File

@@ -10,7 +10,8 @@
/ { / {
model = "Qualcomm Technologies, Inc. Tuna ATP + kiwi WLAN"; model = "Qualcomm Technologies, Inc. Tuna ATP + kiwi WLAN";
compatible = "qcom,tuna-atp", "qcom,tuna", "qcom,atp"; compatible = "qcom,tuna-atp", "qcom,tuna", "qcom,atp", "qcom,tunap-atp",
qcom,msm-id = <655 0x10000>, <681 0x10000>; "qcom,tunap";
qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>;
qcom,board-id = <33 0>; qcom,board-id = <33 0>;
}; };

View File

@@ -11,7 +11,8 @@
/ { / {
model = "Qualcomm Technologies, Inc. Tuna CDP"; model = "Qualcomm Technologies, Inc. Tuna CDP";
compatible = "qcom,tuna-cdp", "qcom,tuna", "qcom,cdp"; compatible = "qcom,tuna-cdp", "qcom,tuna", "qcom,cdp", "qcom,tunap-cdp",
qcom,msm-id = <655 0x10000>, <681 0x10000>; "qcom,tunap";
qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>;
qcom,board-id = <1 0>; qcom,board-id = <1 0>;
}; };

View File

@@ -10,7 +10,8 @@
/ { / {
model = "Qualcomm Technologies, Inc. Tuna MTP + kiwi WLAN"; model = "Qualcomm Technologies, Inc. Tuna MTP + kiwi WLAN";
compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp", "qcom,tunap-mtp",
qcom,msm-id = <655 0x10000>, <681 0x10000>; "qcom,tunap";
qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>;
qcom,board-id = <8 2>, <8 3>; qcom,board-id = <8 2>, <8 3>;
}; };

View File

@@ -11,7 +11,8 @@
/ { / {
model = "Qualcomm Technologies, Inc. Tuna MTP QMP1000"; model = "Qualcomm Technologies, Inc. Tuna MTP QMP1000";
compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp", "qcom,tunap-mtp",
qcom,msm-id = <655 0x10000>, <681 0x10000>; "qcom,tunap";
qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>;
qcom,board-id = <8 1>; qcom,board-id = <8 1>;
}; };

View File

@@ -11,7 +11,8 @@
/ { / {
model = "Qualcomm Technologies, Inc. Tuna MTP"; model = "Qualcomm Technologies, Inc. Tuna MTP";
compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp", "qcom,tunap-mtp",
qcom,msm-id = <655 0x10000>, <681 0x10000>; "qcom,tunap";
qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>;
qcom,board-id = <8 0>, <8 4>; qcom,board-id = <8 0>, <8 4>;
}; };

View File

@@ -11,7 +11,8 @@
/ { / {
model = "Qualcomm Technologies, Inc. Tuna QRD"; model = "Qualcomm Technologies, Inc. Tuna QRD";
compatible = "qcom,tuna-qrd", "qcom,tuna", "qcom,qrd"; compatible = "qcom,tuna-qrd", "qcom,tuna", "qcom,qrd", "qcom,tunap-qrd",
qcom,msm-id = <655 0x10000>, <681 0x10000>; "qcom,tunap";
qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>;
qcom,board-id = <11 0>; qcom,board-id = <11 0>;
}; };

View File

@@ -10,7 +10,8 @@
/ { / {
model = "Qualcomm Technologies, Inc. Tuna RCM + kiwi WLAN"; model = "Qualcomm Technologies, Inc. Tuna RCM + kiwi WLAN";
compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm"; compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm", "qcom,tunap-rcm",
qcom,msm-id = <655 0x10000>, <681 0x10000>; "qcom,tunap";
qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>;
qcom,board-id = <21 1>; qcom,board-id = <21 1>;
}; };

View File

@@ -11,7 +11,8 @@
/ { / {
model = "Qualcomm Technologies, Inc. Tuna RCM"; model = "Qualcomm Technologies, Inc. Tuna RCM";
compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm"; compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm", "qcom,tunap-rcm",
qcom,msm-id = <655 0x10000>, <681 0x10000>; "qcom,tunap";
qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>;
qcom,board-id = <21 0>; qcom,board-id = <21 0>;
}; };

View File

@@ -13,5 +13,5 @@
model = "Qualcomm Technologies, Inc. Volcano SoC"; model = "Qualcomm Technologies, Inc. Volcano SoC";
compatible = "qcom,volcano"; compatible = "qcom,volcano";
qcom,msm-id = <636 0x10000>, <640 0x10000>, <0x4000291 0x10000>, <0x8000291 0x10000>, <0xc000291 0x10000>, <0x10000291 0x10000>, <0x4000292 0x10000>, <0x8000292 0x10000>, <0xc000292 0x10000>, <0x10000292 0x10000>; qcom,msm-id = <636 0x10000>, <640 0x10000>, <0x4000291 0x10000>, <0x8000291 0x10000>, <0xc000291 0x10000>, <0x10000291 0x10000>, <0x4000292 0x10000>, <0x8000292 0x10000>, <0xc000292 0x10000>, <0x10000292 0x10000>;
qcom,board-id = <0 0>; qcom,board-id = <33 0>, <34 0>, <34 1>, <8 0>, <8 1>, <8 7>, <8 8>, <11 0>, <11 1>;
}; };

View File

@@ -43,7 +43,6 @@
reg-names = "msi_addr", "smmu_iova_ipa"; reg-names = "msi_addr", "smmu_iova_ipa";
qcom,rproc-handle = <&wpss_pas>; qcom,rproc-handle = <&wpss_pas>;
iommus = <&apps_smmu 0x1400 0x1>; iommus = <&apps_smmu 0x1400 0x1>;
status = "disabled";
interrupts = <GIC_SPI 768 IRQ_TYPE_EDGE_RISING>, interrupts = <GIC_SPI 768 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 769 IRQ_TYPE_EDGE_RISING>, <GIC_SPI 769 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 770 IRQ_TYPE_EDGE_RISING>, <GIC_SPI 770 IRQ_TYPE_EDGE_RISING>,

View File

@@ -96,9 +96,9 @@
vdd-wlan-io12-supply = <&L5B>; vdd-wlan-io12-supply = <&L5B>;
qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>;
vdd-wlan-aon-supply = <&S1K>; vdd-wlan-aon-supply = <&S1K>;
qcom,vdd-wlan-aon-config = <876000 1004000 0 0 1>; qcom,vdd-wlan-aon-config = <876000 1004000 0 0 0>;
vdd-wlan-dig-supply = <&S1L>; vdd-wlan-dig-supply = <&S1L>;
qcom,vdd-wlan-dig-config = <876000 1000000 0 0 1>; qcom,vdd-wlan-dig-config = <876000 1000000 0 0 0>;
vdd-wlan-rfa1-supply = <&S1B>; vdd-wlan-rfa1-supply = <&S1B>;
qcom,vdd-wlan-rfa1-config = <1860000 2000000 0 0 1>; qcom,vdd-wlan-rfa1-config = <1860000 2000000 0 0 1>;
vdd-wlan-rfa2-supply = <&S2B>; vdd-wlan-rfa2-supply = <&S2B>;