diff --git a/Kbuild b/Kbuild index 3bf79516..f11d6541 100644 --- a/Kbuild +++ b/Kbuild @@ -53,6 +53,9 @@ dtbo-y += kera-atp-qca6750.dtbo dtbo-y += kera-cdp-qca6750.dtbo dtbo-y += kera-mtp-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 always-y := $(dtb-y) $(dtbo-y) diff --git a/canoe-kiwi-cnss.dts b/canoe-kiwi-cnss.dts index 8848ff2a..8f8d5e5c 100644 --- a/canoe-kiwi-cnss.dts +++ b/canoe-kiwi-cnss.dts @@ -15,5 +15,5 @@ qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>, <0x1000294 0x10000>, <0x1000294 0x20000>, <0x1000295 0x10000>, <0x1000295 0x20000>; - qcom,board-id = <0x1000001 0>, <0x1000008 0>, <0x1000015 0>; + qcom,board-id = <0x30001 0>, <0x20008 0>, <0x30015 0>; }; diff --git a/canoe-peach-cnss.dts b/canoe-peach-cnss.dts index be41a1ac..37059bc1 100644 --- a/canoe-peach-cnss.dts +++ b/canoe-peach-cnss.dts @@ -15,5 +15,7 @@ qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>, <0x1000294 0x10000>, <0x1000294 0x20000>, <0x1000295 0x10000>, <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>; }; diff --git a/kera-rcm-qca6750.dts b/kera-rcm-qca6750.dts index c2f8023d..2d85e58a 100644 --- a/kera-rcm-qca6750.dts +++ b/kera-rcm-qca6750.dts @@ -12,5 +12,5 @@ model = "Qualcomm Technologies, Inc. Kera RCM"; compatible = "qcom,kera-rcm", "qcom,kera", "qcom,rcm"; qcom,msm-id = <686 0x10000>, <659 0x10000>; - qcom,board-id = <0x010015 0>, <0x020015 0>; + qcom,board-id = <0x010015 0>, <0x020015 0>, <0x030015 0>; }; diff --git a/kera-rcm-wcn7750.dts b/kera-rcm-wcn7750.dts index a9932d75..8fac3c24 100644 --- a/kera-rcm-wcn7750.dts +++ b/kera-rcm-wcn7750.dts @@ -12,5 +12,5 @@ model = "Qualcomm Technologies, Inc. Kera RCM"; compatible = "qcom,kera-rcm", "qcom,kera", "qcom,rcm"; qcom,msm-id = <686 0x10000>, <659 0x10000>; - qcom,board-id = <0x010015 1>, <0x020015 1>; + qcom,board-id = <0x010015 1>, <0x020015 1>, <0x030015 1>; }; diff --git a/tuna-atp-kiwi.dts b/tuna-atp-kiwi.dts index f0384004..8592d5d0 100644 --- a/tuna-atp-kiwi.dts +++ b/tuna-atp-kiwi.dts @@ -10,7 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna ATP + kiwi WLAN"; - compatible = "qcom,tuna-atp", "qcom,tuna", "qcom,atp"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-atp", "qcom,tuna", "qcom,atp", "qcom,tunap-atp", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <33 0>; }; diff --git a/tuna-cdp-wcn7750.dts b/tuna-cdp-wcn7750.dts index 429f4fdc..4bd9ce24 100644 --- a/tuna-cdp-wcn7750.dts +++ b/tuna-cdp-wcn7750.dts @@ -11,7 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna CDP"; - compatible = "qcom,tuna-cdp", "qcom,tuna", "qcom,cdp"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-cdp", "qcom,tuna", "qcom,cdp", "qcom,tunap-cdp", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <1 0>; }; diff --git a/tuna-mtp-kiwi.dts b/tuna-mtp-kiwi.dts index 4930b69c..9312da4e 100644 --- a/tuna-mtp-kiwi.dts +++ b/tuna-mtp-kiwi.dts @@ -10,7 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna MTP + kiwi WLAN"; - compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp", "qcom,tunap-mtp", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <8 2>, <8 3>; }; diff --git a/tuna-mtp-qmp1000-wcn7750.dts b/tuna-mtp-qmp1000-wcn7750.dts index aca592ef..483dd0a8 100644 --- a/tuna-mtp-qmp1000-wcn7750.dts +++ b/tuna-mtp-qmp1000-wcn7750.dts @@ -11,7 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna MTP QMP1000"; - compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp", "qcom,tunap-mtp", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <8 1>; }; diff --git a/tuna-mtp-wcn7750.dts b/tuna-mtp-wcn7750.dts index 78379e2f..bace5da0 100644 --- a/tuna-mtp-wcn7750.dts +++ b/tuna-mtp-wcn7750.dts @@ -11,7 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna MTP"; - compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp", "qcom,tunap-mtp", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <8 0>, <8 4>; }; diff --git a/tuna-qrd-wcn7750.dts b/tuna-qrd-wcn7750.dts index dfd9ea29..f4df9fe5 100644 --- a/tuna-qrd-wcn7750.dts +++ b/tuna-qrd-wcn7750.dts @@ -11,7 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna QRD"; - compatible = "qcom,tuna-qrd", "qcom,tuna", "qcom,qrd"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-qrd", "qcom,tuna", "qcom,qrd", "qcom,tunap-qrd", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <11 0>; }; diff --git a/tuna-rcm-kiwi.dts b/tuna-rcm-kiwi.dts index ab921bac..4d432b0e 100644 --- a/tuna-rcm-kiwi.dts +++ b/tuna-rcm-kiwi.dts @@ -10,7 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna RCM + kiwi WLAN"; - compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm", "qcom,tunap-rcm", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <21 1>; }; diff --git a/tuna-rcm-wcn7750.dts b/tuna-rcm-wcn7750.dts index c2796916..8647ad3e 100644 --- a/tuna-rcm-wcn7750.dts +++ b/tuna-rcm-wcn7750.dts @@ -11,7 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna RCM"; - compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm", "qcom,tunap-rcm", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <21 0>; }; diff --git a/volcano-qca6750.dts b/volcano-qca6750.dts index 385ad760..66f08a9b 100644 --- a/volcano-qca6750.dts +++ b/volcano-qca6750.dts @@ -13,5 +13,5 @@ model = "Qualcomm Technologies, Inc. Volcano SoC"; 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,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>; }; diff --git a/volcano-qca6750.dtsi b/volcano-qca6750.dtsi index f0755dec..e1b2faf3 100644 --- a/volcano-qca6750.dtsi +++ b/volcano-qca6750.dtsi @@ -43,7 +43,6 @@ reg-names = "msi_addr", "smmu_iova_ipa"; qcom,rproc-handle = <&wpss_pas>; iommus = <&apps_smmu 0x1400 0x1>; - status = "disabled"; interrupts = , , , diff --git a/volcano6i-peach-cnss.dtsi b/volcano6i-peach-cnss.dtsi index b5444e2c..7ef1b8e5 100644 --- a/volcano6i-peach-cnss.dtsi +++ b/volcano6i-peach-cnss.dtsi @@ -96,9 +96,9 @@ vdd-wlan-io12-supply = <&L5B>; qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; 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>; - 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>; qcom,vdd-wlan-rfa1-config = <1860000 2000000 0 0 1>; vdd-wlan-rfa2-supply = <&S2B>;