From patchwork Wed Jul 3 03:57:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Govind Singh X-Patchwork-Id: 11028911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E301C14DB for ; Wed, 3 Jul 2019 03:57:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D71BF28896 for ; Wed, 3 Jul 2019 03:57:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CAF062893C; Wed, 3 Jul 2019 03:57:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7F1CF28896 for ; Wed, 3 Jul 2019 03:57:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/+9Hlw0McXoiSlIelI0b2MzOdHMrRYSXPAQZv7laFMk=; b=cuqcXY4IyZKp9+ Fxv4zQRE4IRHAmIcQmbhoJOeScGFYJ9kBn5xgr/fRjI2pzu4cb/7GM/U0vR3L5gREcPQXXZTPAZwb ME2w6lVtkZne0Ozn7yg1+5ce11MVUJepx/G6f4pg7ui9aK4RmMJKESSbfytBxig5mA1I3NHE66GI0 XlxSc8NntOnGj9feRXa0DTAt0AXVjbCZVejZyNYLrc9sj9FtB77FwmAdKLsOYc/d705AXZaUVCl9r OD9mhuYtnHcxYFTGxSutPsInR0XBhvGN5RwmeMszYQcTXFDHpnppO19OdN0/vaK+3lCxSeIBs4JBp HD6910nSek/FDrz2AKPQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hiWOd-0002qW-Ei; Wed, 03 Jul 2019 03:57:27 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hiWOV-0002no-Mp for ath10k@lists.infradead.org; Wed, 03 Jul 2019 03:57:20 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 76C3D607EB; Wed, 3 Jul 2019 03:57:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1562126239; bh=swA+By0KKqoGjcIDAfeGafYPVgkUut5vD1yu9dPbk6Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eY0N3cfJlRy2Gg+Uy6ransk3hDgDsftv8b92JZz+umrw998ZUddTR6YqA4tSqeJNv 2MT8zneUfDFzV6DDgtImTvSs1oa8TbWu7a1xPXSmukI5tzs6pnSXgsvx9E+jvQnV7x aVwFGk/jLp3kPzN7k7gYA4e+8jeVOwqE/71cJd8Y= Received: from govinds-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: govinds@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 7499360770; Wed, 3 Jul 2019 03:57:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1562126239; bh=swA+By0KKqoGjcIDAfeGafYPVgkUut5vD1yu9dPbk6Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eY0N3cfJlRy2Gg+Uy6ransk3hDgDsftv8b92JZz+umrw998ZUddTR6YqA4tSqeJNv 2MT8zneUfDFzV6DDgtImTvSs1oa8TbWu7a1xPXSmukI5tzs6pnSXgsvx9E+jvQnV7x aVwFGk/jLp3kPzN7k7gYA4e+8jeVOwqE/71cJd8Y= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 7499360770 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=govinds@codeaurora.org From: Govind Singh To: ath10k@lists.infradead.org Subject: [PATCH 1/3] dt: bindings: update compatible dt properties for WCN3990 wifi node Date: Wed, 3 Jul 2019 09:27:09 +0530 Message-Id: <20190703035711.25592-2-govinds@codeaurora.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190703035711.25592-1-govinds@codeaurora.org> References: <20190703035711.25592-1-govinds@codeaurora.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190702_205719_766035_86D2C5CA X-CRM114-Status: UNSURE ( 8.90 ) X-CRM114-Notice: Please train this message. X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-msm@vger.kernel.org, Govind Singh , linux-wireless@vger.kernel.org, devicetree@vger.kernel.org Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP update compatible dt properties for WCN3990 wifi node to be compatible across different MSM platforms. Signed-off-by: Govind Singh Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt b/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt index ae661e65354e..baaa3f32ae44 100644 --- a/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt +++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt @@ -5,6 +5,8 @@ Required properties: * "qcom,ath10k" * "qcom,ipq4019-wifi" * "qcom,wcn3990-wifi" + * "qcom,sdm845-wcn39xx-wifi" + * "qcom,qcs40x-wcn39xx-wifi" PCI based devices uses compatible string "qcom,ath10k" and takes calibration data along with board specific data via "qcom,ath10k-calibration-data". From patchwork Wed Jul 3 03:57:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Govind Singh X-Patchwork-Id: 11028913 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4454B14DB for ; Wed, 3 Jul 2019 03:57:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 363D728896 for ; Wed, 3 Jul 2019 03:57:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A8062893C; Wed, 3 Jul 2019 03:57:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B4F3A28896 for ; Wed, 3 Jul 2019 03:57:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4H6/orItk3YZXsLIdIaeFZ7o2VfP9xszX8p9kk+51Q8=; b=HR0SKXKNOCluCR w3HaCMTdCgUdEa5jUu0YCb9G3NmVw9Xiyos4wXEVK6obSO0EFOWEU0tjUdOeCT2wswYkF93M2sxnU PwotESYXFdk+m/U6YFv1TVtsLw0XP9f07WGLmFoVUXGnPsn4sRqL+XOWuVfXWIw6hqSuyJp+oKg7C NNugYfhG8HSipcpE+LbKFBXfU7ybyNVLKUtlcLMsc1zVo0KWOt4YESaT5Hmt0lqF+fP1MWn7K/at4 xsHnQLIX4RmFSFUYcDvCqtK/6Ok5Nya4EabTSe9CUiWb6O5p8KcgugvZw0MttzYx8D/Qy4ZxpGp5W zFJlI2lziOZocS/WrMfw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hiWOi-0002vr-5T; Wed, 03 Jul 2019 03:57:32 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hiWOY-0002oV-B6 for ath10k@lists.infradead.org; Wed, 03 Jul 2019 03:57:23 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 1C02C609D4; Wed, 3 Jul 2019 03:57:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1562126242; bh=yr6IvrVD/cRJPtxwBir+7ZAgmidrGFl4s3DIpOgm038=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G1UZVvqicseUnZttZ2XuZ8+IrMEvubRjYrzmKJlfePgmgZekQjpOiwbMLwHiRvP6C ymmJmNY90PP2MBZxVIFsggHUnbXcKGG4R5yr15Pez2hVMS0dZ9K1+skMiAt/phu7GW 4IkmfB5ppFPZFVvg22lnFt8tNT7u9SjLRWvShuro= Received: from govinds-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: govinds@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id B42DC6087F; Wed, 3 Jul 2019 03:57:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1562126241; bh=yr6IvrVD/cRJPtxwBir+7ZAgmidrGFl4s3DIpOgm038=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VxWJRkxGfSZwWeQ6R2zpjKLSqQ4aneiIkdxDlPwia8hwxZ+hSrgEsff2cpesguIsQ L5nRDe7F33hM5GD1UOqgwo7O3VNmLfc63H2DLr7E4P4dYC3/4FQJVWNTyklm//Clgi 3JsoxpfLpmYz5eY+el+L3JbtRwptnj9CAmTQH/fs= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org B42DC6087F Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=govinds@codeaurora.org From: Govind Singh To: ath10k@lists.infradead.org Subject: [PATCH 2/3] ath10k: Move regulator config to driver private data Date: Wed, 3 Jul 2019 09:27:10 +0530 Message-Id: <20190703035711.25592-3-govinds@codeaurora.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190703035711.25592-1-govinds@codeaurora.org> References: <20190703035711.25592-1-govinds@codeaurora.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190702_205722_504833_55348968 X-CRM114-Status: GOOD ( 13.51 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-msm@vger.kernel.org, Govind Singh , linux-wireless@vger.kernel.org, devicetree@vger.kernel.org Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP WCN3990 Regulator config is varying b/w different MSM platforms. In order to have scalable config, move regulator config to driver private data. Signed-off-by: Govind Singh --- drivers/net/wireless/ath/ath10k/snoc.c | 38 +++++++++++++++++++++----- drivers/net/wireless/ath/ath10k/snoc.h | 23 +++++++++------- 2 files changed, 44 insertions(+), 17 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c index ca1186ec4129..bd7d97924fe0 100644 --- a/drivers/net/wireless/ath/ath10k/snoc.c +++ b/drivers/net/wireless/ath/ath10k/snoc.c @@ -36,13 +36,20 @@ static char *const ce_name[] = { "WLAN_CE_11", }; -static struct ath10k_vreg_info vreg_cfg[] = { +static struct ath10k_vreg_info sdm845_reg_cfg[] = { {NULL, "vdd-0.8-cx-mx", 800000, 850000, 0, 0, false}, {NULL, "vdd-1.8-xo", 1800000, 1850000, 0, 0, false}, {NULL, "vdd-1.3-rfa", 1300000, 1350000, 0, 0, false}, {NULL, "vdd-3.3-ch0", 3300000, 3350000, 0, 0, false}, }; +static struct ath10k_vreg_info qcs40x_reg_cfg[] = { + {NULL, "vdd-0.8-cx-mx", 1224000, 1224000, 0, 0, false}, + {NULL, "vdd-1.8-xo", 1800000, 1850000, 0, 0, false}, + {NULL, "vdd-1.3-rfa", 1300000, 1350000, 0, 0, false}, + {NULL, "vdd-3.3-ch0", 3300000, 3350000, 0, 0, false}, +}; + static struct ath10k_clk_info clk_cfg[] = { {NULL, "cxo_ref_clk_pin", 0, false}, }; @@ -54,10 +61,20 @@ static void ath10k_snoc_htt_rx_cb(struct ath10k_ce_pipe *ce_state); static void ath10k_snoc_htt_htc_rx_cb(struct ath10k_ce_pipe *ce_state); static void ath10k_snoc_pktlog_rx_cb(struct ath10k_ce_pipe *ce_state); -static const struct ath10k_snoc_drv_priv drv_priv = { +static const struct ath10k_snoc_drv_priv sdm845_wcn39xx_drv_priv = { + .hw_rev = ATH10K_HW_WCN3990, + .dma_mask = DMA_BIT_MASK(35), + .msa_size = 0x100000, + .vreg_cfg = sdm845_reg_cfg, + .vreg_count = ARRAY_SIZE(sdm845_reg_cfg), +}; + +static const struct ath10k_snoc_drv_priv qcs40x_wcn39xx_drv_priv = { .hw_rev = ATH10K_HW_WCN3990, .dma_mask = DMA_BIT_MASK(35), .msa_size = 0x100000, + .vreg_cfg = qcs40x_reg_cfg, + .vreg_count = ARRAY_SIZE(qcs40x_reg_cfg), }; #define WCN3990_SRC_WR_IDX_OFFSET 0x3C @@ -1465,7 +1482,7 @@ static int ath10k_snoc_vreg_on(struct ath10k *ar) int ret = 0; int i; - for (i = 0; i < ARRAY_SIZE(vreg_cfg); i++) { + for (i = 0; i < ar_snoc->vreg_count; i++) { vreg_info = &ar_snoc->vreg[i]; if (!vreg_info->reg) @@ -1498,7 +1515,7 @@ static int ath10k_snoc_vreg_off(struct ath10k *ar) int ret = 0; int i; - for (i = ARRAY_SIZE(vreg_cfg) - 1; i >= 0; i--) { + for (i = ar_snoc->vreg_count - 1; i >= 0; i--) { vreg_info = &ar_snoc->vreg[i]; if (!vreg_info->reg) @@ -1616,7 +1633,13 @@ static int ath10k_hw_power_off(struct ath10k *ar) static const struct of_device_id ath10k_snoc_dt_match[] = { { .compatible = "qcom,wcn3990-wifi", - .data = &drv_priv, + .data = &sdm845_wcn39xx_drv_priv, + }, + { .compatible = "qcom,sdm845-wcn39xx-wifi", + .data = &sdm845_wcn39xx_drv_priv, + }, + { .compatible = "qcom,qcs40x-wcn39xx-wifi", + .data = &qcs40x_wcn39xx_drv_priv, }, { } }; @@ -1680,8 +1703,9 @@ static int ath10k_snoc_probe(struct platform_device *pdev) goto err_release_resource; } - ar_snoc->vreg = vreg_cfg; - for (i = 0; i < ARRAY_SIZE(vreg_cfg); i++) { + ar_snoc->vreg = drv_data->vreg_cfg; + ar_snoc->vreg_count = drv_data->vreg_count; + for (i = 0; i < ar_snoc->vreg_count; i++) { ret = ath10k_get_vreg_info(ar, dev, &ar_snoc->vreg[i]); if (ret) goto err_free_irq; diff --git a/drivers/net/wireless/ath/ath10k/snoc.h b/drivers/net/wireless/ath/ath10k/snoc.h index d62f53501fbb..0bdada11985c 100644 --- a/drivers/net/wireless/ath/ath10k/snoc.h +++ b/drivers/net/wireless/ath/ath10k/snoc.h @@ -10,10 +10,22 @@ #include "ce.h" #include "qmi.h" +struct ath10k_vreg_info { + struct regulator *reg; + const char *name; + u32 min_v; + u32 max_v; + u32 load_ua; + unsigned long settle_delay; + bool required; +}; + struct ath10k_snoc_drv_priv { enum ath10k_hw_rev hw_rev; u64 dma_mask; u32 msa_size; + struct ath10k_vreg_info *vreg_cfg; + u8 vreg_count; }; struct snoc_state { @@ -42,16 +54,6 @@ struct ath10k_snoc_ce_irq { u32 irq_line; }; -struct ath10k_vreg_info { - struct regulator *reg; - const char *name; - u32 min_v; - u32 max_v; - u32 load_ua; - unsigned long settle_delay; - bool required; -}; - struct ath10k_clk_info { struct clk *handle; const char *name; @@ -77,6 +79,7 @@ struct ath10k_snoc { struct ath10k_ce ce; struct timer_list rx_post_retry; struct ath10k_vreg_info *vreg; + u8 vreg_count; struct ath10k_clk_info *clk; struct ath10k_qmi *qmi; unsigned long flags; From patchwork Wed Jul 3 03:57:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Govind Singh X-Patchwork-Id: 11028915 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F3EF113A4 for ; Wed, 3 Jul 2019 03:57:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E730428896 for ; Wed, 3 Jul 2019 03:57:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBB8A2893C; Wed, 3 Jul 2019 03:57:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7B17528896 for ; Wed, 3 Jul 2019 03:57:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=u6kug5Hbag2jmoFNPwyFi5U685Wbh7Uvj47vJcOZSQU=; b=jqg+Mzw+stGFlZ Af5ldKEA2zgE/Zm88XUs31jqUnBh/J9TLrXqbgV+6HE7jPdSB8NcvRKqcewBV1e97SGTlhNhA5Kxw qKa05PuT/1P25/29kpajC4NKfeEDXo7F9GfNc0JRm6xA1IyBwTXZ5HS6NvvBRPmZB05r0mXT5i2ic 2YYb/3WeLxj7gQTsTWVG2esM3iUO7QQZsgqJO6uvYxbRvHmZFum/M4cVDC7Iyl9OwSiDo5PSYrTRV jB94dJ6lkZBm03d+cbnE2lUc7iZYfUby9UZH12sB2MioNxzglAg1uCutj6/ADMWxsESkxuG5DRksY QxpxpaJfgtnT3d7KufTQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hiWOn-00030n-R5; Wed, 03 Jul 2019 03:57:38 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hiWOa-0002pS-76 for ath10k@lists.infradead.org; Wed, 03 Jul 2019 03:57:26 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 0130F60A24; Wed, 3 Jul 2019 03:57:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1562126244; bh=lT+3JP6Q5Qzd8cH72nFr7WWzGlN+4tb3P640dP5zzwo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MiNwKyVlmQvbxlJnk/JXOUsAy9aC0fwQsvvKHsHPUz+eT6cMTjFfRyX2RpzvOwlh3 ijymBO0F5V5hNsJMZAvifj/OyM6qCrLX54JBkFMl/M9l5+4rHfWDNzEIRjQoC7xwUq mLqADnJTIhf6GVBogPnV7D7nIHlSbjzLmDm1z3JY= Received: from govinds-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: govinds@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 0059D608FF; Wed, 3 Jul 2019 03:57:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1562126243; bh=lT+3JP6Q5Qzd8cH72nFr7WWzGlN+4tb3P640dP5zzwo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QzQJqv3gGuhq1avojbYfdCY5zmmXBQmXD+9r486Sd0P/gl21hRVDBnlkzBzmcG1RD wfMhLsGaiTPN0I15D41hrxLIEyttaa24+atCXSozWvjo7nVvOuK/rHrDDkGaXpTsGV lO1fhQrEFpVqlSHz+9OfIHC8RReNF+ozab5zEY+o= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 0059D608FF Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=govinds@codeaurora.org From: Govind Singh To: ath10k@lists.infradead.org Subject: [PATCH 3/3] arm64: dts: qcom: qcs404: Modify wifi dt node for SDM845/QCS404 devices Date: Wed, 3 Jul 2019 09:27:11 +0530 Message-Id: <20190703035711.25592-4-govinds@codeaurora.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190703035711.25592-1-govinds@codeaurora.org> References: <20190703035711.25592-1-govinds@codeaurora.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190702_205725_373602_397E1128 X-CRM114-Status: GOOD ( 11.65 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-msm@vger.kernel.org, Govind Singh , linux-wireless@vger.kernel.org, devicetree@vger.kernel.org Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Modify the compatible string of wifi node for SDM845/QCS404 devices. Add wifi regulators in qcs404 dt node for proxy vote. Proxy votes are required for handling driver recovery scenarios to prevent un-clocked register access during driver recovery. Signed-off-by: Govind Singh --- arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 3 +++ arch/arm64/boot/dts/qcom/qcs404.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi index 50b3589c7f15..ff81b9c5b057 100644 --- a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi @@ -190,6 +190,9 @@ &wifi { status = "okay"; + vdd-0.8-cx-mx-supply = <&vreg_l2_1p275>; + vdd-1.8-xo-supply = <&vreg_l5_1p8>; + vdd-1.3-rfa-supply = <&vreg_l1_1p3>; }; /* PINCTRL - additions to nodes defined in qcs404.dtsi */ diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi index e8fd26633d57..d9e2173cd3e9 100644 --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi @@ -480,7 +480,7 @@ }; wifi: wifi@a000000 { - compatible = "qcom,wcn3990-wifi"; + compatible = "qcom,qcs40x-wcn39xx-wifi"; reg = <0xa000000 0x800000>; reg-names = "membase"; memory-region = <&wlan_msa_mem>; diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 5308f1671824..fdb5fcd814f4 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -2235,7 +2235,7 @@ }; wifi: wifi@18800000 { - compatible = "qcom,wcn3990-wifi"; + compatible = "qcom,sdm845-wcn39xx-wifi"; status = "disabled"; reg = <0 0x18800000 0 0x800000>; reg-names = "membase";