| Message ID | 20180329062058.31340-1-rfried@codeaurora.org |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | wcn36xx: Disable 5GHz for wcn3610 | expand |
On 03/29/2018 08:20 AM, Ramon Fried wrote: > wcn3610 can only operate on 2.4GHz band due to RF limitation. > If wcn36xx digital block is associated with an external IRIS > RF module, retrieve the id and disable 5GHz band in case of > wcn3610 id. > > Signed-off-by: Ramon Fried <rfried@codeaurora.org> > --- > drivers/net/wireless/ath/wcn36xx/main.c | 4 +++- > drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c > index ab5be6d2c691..833531a68c95 100644 > --- a/drivers/net/wireless/ath/wcn36xx/main.c > +++ b/drivers/net/wireless/ath/wcn36xx/main.c > @@ -1146,7 +1146,7 @@ static int wcn36xx_init_ieee80211(struct wcn36xx *wcn) > BIT(NL80211_IFTYPE_MESH_POINT); > > wcn->hw->wiphy->bands[NL80211_BAND_2GHZ] = &wcn_band_2ghz; > - if (wcn->rf_id != RF_IRIS_WCN3620) > + if (wcn->rf_id != RF_IRIS_WCN3610 && wcn->rf_id != RF_IRIS_WCN3620) > wcn->hw->wiphy->bands[NL80211_BAND_5GHZ] = &wcn_band_5ghz; > > wcn->hw->wiphy->max_scan_ssids = WCN36XX_MAX_SCAN_SSIDS; > @@ -1248,6 +1248,8 @@ static int wcn36xx_platform_get_resources(struct wcn36xx *wcn, > if (iris_node) { > if (of_device_is_compatible(iris_node, "qcom,wcn3620")) > wcn->rf_id = RF_IRIS_WCN3620; > + else if (of_device_is_compatible(iris_node, "qcom,wcn3610")) > + wcn->rf_id = RF_IRIS_WCN3620; RF_IRIS_WCN3610 ?
On 3/29/2018 9:58 AM, Rafał Miłecki wrote: > On 03/29/2018 08:20 AM, Ramon Fried wrote: >> wcn3610 can only operate on 2.4GHz band due to RF limitation. >> If wcn36xx digital block is associated with an external IRIS >> RF module, retrieve the id and disable 5GHz band in case of >> wcn3610 id. >> >> Signed-off-by: Ramon Fried <rfried@codeaurora.org> >> --- >> drivers/net/wireless/ath/wcn36xx/main.c | 4 +++- >> drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + >> 2 files changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c >> index ab5be6d2c691..833531a68c95 100644 >> --- a/drivers/net/wireless/ath/wcn36xx/main.c >> +++ b/drivers/net/wireless/ath/wcn36xx/main.c >> @@ -1146,7 +1146,7 @@ static int wcn36xx_init_ieee80211(struct wcn36xx *wcn) >> BIT(NL80211_IFTYPE_MESH_POINT); >> >> wcn->hw->wiphy->bands[NL80211_BAND_2GHZ] = &wcn_band_2ghz; >> - if (wcn->rf_id != RF_IRIS_WCN3620) >> + if (wcn->rf_id != RF_IRIS_WCN3610 && wcn->rf_id != RF_IRIS_WCN3620) >> wcn->hw->wiphy->bands[NL80211_BAND_5GHZ] = &wcn_band_5ghz; >> >> wcn->hw->wiphy->max_scan_ssids = WCN36XX_MAX_SCAN_SSIDS; >> @@ -1248,6 +1248,8 @@ static int wcn36xx_platform_get_resources(struct wcn36xx *wcn, >> if (iris_node) { >> if (of_device_is_compatible(iris_node, "qcom,wcn3620")) >> wcn->rf_id = RF_IRIS_WCN3620; >> + else if (of_device_is_compatible(iris_node, "qcom,wcn3610")) >> + wcn->rf_id = RF_IRIS_WCN3620; > > RF_IRIS_WCN3610 ? You're correct. I also noticed just now. Sent v2. Thanks. > > _______________________________________________ > wcn36xx mailing list > wcn36xx@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/wcn36xx
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c index ab5be6d2c691..833531a68c95 100644 --- a/drivers/net/wireless/ath/wcn36xx/main.c +++ b/drivers/net/wireless/ath/wcn36xx/main.c @@ -1146,7 +1146,7 @@ static int wcn36xx_init_ieee80211(struct wcn36xx *wcn) BIT(NL80211_IFTYPE_MESH_POINT); wcn->hw->wiphy->bands[NL80211_BAND_2GHZ] = &wcn_band_2ghz; - if (wcn->rf_id != RF_IRIS_WCN3620) + if (wcn->rf_id != RF_IRIS_WCN3610 && wcn->rf_id != RF_IRIS_WCN3620) wcn->hw->wiphy->bands[NL80211_BAND_5GHZ] = &wcn_band_5ghz; wcn->hw->wiphy->max_scan_ssids = WCN36XX_MAX_SCAN_SSIDS; @@ -1248,6 +1248,8 @@ static int wcn36xx_platform_get_resources(struct wcn36xx *wcn, if (iris_node) { if (of_device_is_compatible(iris_node, "qcom,wcn3620")) wcn->rf_id = RF_IRIS_WCN3620; + else if (of_device_is_compatible(iris_node, "qcom,wcn3610")) + wcn->rf_id = RF_IRIS_WCN3620; of_node_put(iris_node); } diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h index 81017e6703b4..bc4d1a10d90e 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h @@ -95,6 +95,7 @@ enum wcn36xx_ampdu_state { #define WCN36XX_MAX_POWER(__wcn) (__wcn->hw->conf.chandef.chan->max_power) #define RF_UNKNOWN 0x0000 +#define RF_IRIS_WCN3610 0x3610 #define RF_IRIS_WCN3620 0x3620 static inline void buff_to_be(u32 *buf, size_t len)
wcn3610 can only operate on 2.4GHz band due to RF limitation. If wcn36xx digital block is associated with an external IRIS RF module, retrieve the id and disable 5GHz band in case of wcn3610 id. Signed-off-by: Ramon Fried <rfried@codeaurora.org> --- drivers/net/wireless/ath/wcn36xx/main.c | 4 +++- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)