From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E98EC5B578 for ; Wed, 3 Jul 2019 03:57:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A4FB2085A for ; Wed, 3 Jul 2019 03:57:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="VxWJRkxG"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="VxWJRkxG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727168AbfGCD5X (ORCPT ); Tue, 2 Jul 2019 23:57:23 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:38476 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727025AbfGCD5X (ORCPT ); Tue, 2 Jul 2019 23:57:23 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id E8118609EF; 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=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= 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 Cc: linux-wireless@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Govind Singh 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 Content-Transfer-Encoding: 8bit Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project