From 36e816f460b53ca4138546becf5ff37c8d4414f4 Mon Sep 17 00:00:00 2001 From: Jianmin Zhu Date: Mon, 27 Sep 2021 17:47:20 +0800 Subject: [PATCH] ARM: dts: qcom: Set default_gen_speed as gen3 for sdx65 Set pcie default_gen_speed as gen3 for sdx65. Disable device initiated BW scaling in sdxlemur-cnss.dtsi, then host can set pcie linkspeed as gen3, ignore gen2 request from hsp firmware event:MHI_ER_BW_SCALE_ELEMENT_TYPE. Change-Id: Ib0ecfdf68098decb5448ee692b63ef8ff52eacdc CRs-Fixed: 3044666 --- bindings/cnss/cnss-wlan.txt | 1 + qcom/sdxlemur-cnss.dtsi | 8 ++------ qcom/sdxlemur-mtp-cpe-hsp.dtsi | 25 ------------------------- qcom/sdxlemur-mtp-mbb-ntn3-pcie.dtsi | 25 ------------------------- 4 files changed, 3 insertions(+), 56 deletions(-) diff --git a/bindings/cnss/cnss-wlan.txt b/bindings/cnss/cnss-wlan.txt index 0309934b1cda..7be180ac82b5 100644 --- a/bindings/cnss/cnss-wlan.txt +++ b/bindings/cnss/cnss-wlan.txt @@ -92,6 +92,7 @@ Optional properties: regulator used in internal power amplifier for QCA6490 - cnss-enable-self-recovery: Boolean property to enable self recovery when recovery is trigeered with reason link down. + - default_gen_speed: U32 property to specify pcie default gen speed. - qcom,bt-en-gpio: QCA6490 requires synchronization for BT and WLAN GPIO enable to resolve PMU power up issues. Provide BT GPIO using this config param. diff --git a/qcom/sdxlemur-cnss.dtsi b/qcom/sdxlemur-cnss.dtsi index 8b2973d86491..776a7d66f1b3 100644 --- a/qcom/sdxlemur-cnss.dtsi +++ b/qcom/sdxlemur-cnss.dtsi @@ -30,6 +30,7 @@ use-pm-domain; cnss-enable-self-recovery; + default_gen_speed = <3>; vdd-wlan-aon-supply = <&S7B>; qcom,vdd-wlan-aon-config = <1012000 1012000 0 0 0>; @@ -169,12 +170,7 @@ }; mhi_event@2 { - mhi,num-elements = <32>; - mhi,intmod = <0>; - mhi,msi = <0>; - mhi,priority = <2>; - mhi,brstmode = <2>; - mhi,data-type = <3>; + status = "disabled"; }; }; diff --git a/qcom/sdxlemur-mtp-cpe-hsp.dtsi b/qcom/sdxlemur-mtp-cpe-hsp.dtsi index d9969be2f7be..e8ba2208d897 100644 --- a/qcom/sdxlemur-mtp-cpe-hsp.dtsi +++ b/qcom/sdxlemur-mtp-cpe-hsp.dtsi @@ -14,28 +14,3 @@ #size-cells = <1>; }; }; - -&wlan { - mhi_events { - mhi_event@0 { - mhi,num-elements = <32>; - mhi,intmod = <0>; - mhi,msi = <1>; - mhi,priority = <0>; - mhi,brstmode = <2>; - mhi,data-type = <1>; - }; - - mhi_event@1 { - mhi,num-elements = <256>; - mhi,intmod = <0>; - mhi,msi = <2>; - mhi,priority = <1>; - mhi,brstmode = <2>; - }; - - mhi_event@2 { - status = "disabled"; - }; - }; -}; diff --git a/qcom/sdxlemur-mtp-mbb-ntn3-pcie.dtsi b/qcom/sdxlemur-mtp-mbb-ntn3-pcie.dtsi index 004fbbf42322..c5230d9ff666 100644 --- a/qcom/sdxlemur-mtp-mbb-ntn3-pcie.dtsi +++ b/qcom/sdxlemur-mtp-mbb-ntn3-pcie.dtsi @@ -135,28 +135,3 @@ }; }; }; - -&wlan { - mhi_events { - mhi_event@0 { - mhi,num-elements = <32>; - mhi,intmod = <0>; - mhi,msi = <1>; - mhi,priority = <0>; - mhi,brstmode = <2>; - mhi,data-type = <1>; - }; - - mhi_event@1 { - mhi,num-elements = <256>; - mhi,intmod = <0>; - mhi,msi = <2>; - mhi,priority = <1>; - mhi,brstmode = <2>; - }; - - mhi_event@2 { - status = "disabled"; - }; - }; -};