From patchwork Mon Nov 5 13:08:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Govind Singh X-Patchwork-Id: 10668255 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 4F94C14BD for ; Mon, 5 Nov 2018 13:09:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40F4929795 for ; Mon, 5 Nov 2018 13:09:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35789297C0; Mon, 5 Nov 2018 13:09:16 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C06B029795 for ; Mon, 5 Nov 2018 13:09:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728094AbeKEW2d (ORCPT ); Mon, 5 Nov 2018 17:28:33 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:39626 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729228AbeKEW2d (ORCPT ); Mon, 5 Nov 2018 17:28:33 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3371061374; Mon, 5 Nov 2018 13:08:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1541423331; bh=v/yCb6KJRhz5JTPTuGjIacBs0I1J8aW3YqhhGZNAjeA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=loDNsaRAejyigYp9z3MGhX5Www/Gj2eK0kpqocz59ZRWluHp5I4XAbSce0CY1q3kG QbBMOTAwfgNzZzmDnYRHOjt/9w4irv//jdXEegFx8RBEOGh5y+53BYQxNYv6Dn43qJ GIclMsE31Vq8Jsyyo8Ly2IGCWesnjTrxI/+OKzJI= Received: from svishnoi-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 9589A61317; Mon, 5 Nov 2018 13:08:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1541423330; bh=v/yCb6KJRhz5JTPTuGjIacBs0I1J8aW3YqhhGZNAjeA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jp/tSRfd0XzBejazKIca12xkrKzjG1flm3BknXcwukpBhj/cAwMXRqAwXpWgmxezT uyd1YWZoOgA4QOMxvC24sUu+fJnYPWiO+GHoK5MACVF/jrZ6GRhc/L4Luj9eZvElVu k9c1e5PCPHjeV3lfQ3X1dR5x1xb7MRnNG4lupu1U= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 9589A61317 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: briannorris@chromium.org, andy.gross@linaro.org, ath10k@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-wireless@vger.kernel.org, robh+dt@kernel.org, sboyd@kernel.org, dianders@chromium.org, linux-kernel@vger.kernel.org Cc: Govind Singh Subject: [PATCH v4 1/3] dt: bindings: add missing dt properties for WCN3990 wifi node Date: Mon, 5 Nov 2018 18:38:36 +0530 Message-Id: <1541423318-19312-2-git-send-email-govinds@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1541423318-19312-1-git-send-email-govinds@codeaurora.org> References: <1541423318-19312-1-git-send-email-govinds@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add missing optional properties in WCN3990 wifi node. Signed-off-by: Govind Singh Reviewed-by: Rob Herring Reviewed-by: Brian Norris Tested-by: Brian Norris --- .../bindings/net/wireless/qcom,ath10k.txt | 57 +++++++++++++--------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt b/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt index 7fd4e8c..55d255c 100644 --- a/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt +++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt @@ -21,10 +21,22 @@ can be provided per device. SNOC based devices (i.e. wcn3990) uses compatible string "qcom,wcn3990-wifi". -Optional properties: - reg: Address and length of the register set for the device. - reg-names: Must include the list of following reg names, "membase" +- interrupts: reference to the list of 17 interrupt numbers for "qcom,ipq4019-wifi" + compatible target. + reference to the list of 12 interrupt numbers for "qcom,wcn3990-wifi" + compatible target. + Must contain interrupt-names property per entry for + "qcom,ath10k", "qcom,ipq4019-wifi" compatible targets. + +- interrupt-names: Must include the entries for MSI interrupt + names ("msi0" to "msi15") and legacy interrupt + name ("legacy") for "qcom,ath10k", "qcom,ipq4019-wifi" + compatible targets. + +Optional properties: - resets: Must contain an entry for each entry in reset-names. See ../reset/reseti.txt for details. - reset-names: Must include the list of following reset names, @@ -37,12 +49,9 @@ Optional properties: - clocks: List of clock specifiers, must contain an entry for each required entry in clock-names. - clock-names: Should contain the clock names "wifi_wcss_cmd", "wifi_wcss_ref", - "wifi_wcss_rtc". -- interrupts: List of interrupt lines. Must contain an entry - for each entry in the interrupt-names property. -- interrupt-names: Must include the entries for MSI interrupt - names ("msi0" to "msi15") and legacy interrupt - name ("legacy"), + "wifi_wcss_rtc" for "qcom,ipq4019-wifi" compatible target and + "cxo_ref_clk_pin" for "qcom,wcn3990-wifi" + compatible target. - qcom,msi_addr: MSI interrupt address. - qcom,msi_base: Base value to add before writing MSI data into MSI address register. @@ -55,7 +64,8 @@ Optional properties: - qcom,ath10k-pre-calibration-data : pre calibration data as an array, the length can vary between hw versions. - -supply: handle to the regulator device tree node - optional "supply-name" is "vdd-0.8-cx-mx". + optional "supply-name" are "vdd-0.8-cx-mx", + "vdd-1.8-xo", "vdd-1.3-rfa" and "vdd-3.3-ch0". Example (to supply the calibration data alone): @@ -133,20 +143,23 @@ wifi@18000000 { compatible = "qcom,wcn3990-wifi"; reg = <0x18800000 0x800000>; reg-names = "membase"; - clocks = <&clock_gcc clk_aggre2_noc_clk>; - clock-names = "smmu_aggre2_noc_clk" + clocks = <&clock_gcc clk_rf_clk2_pin>; + clock-names = "cxo_ref_clk_pin"; interrupts = - <0 130 0 /* CE0 */ >, - <0 131 0 /* CE1 */ >, - <0 132 0 /* CE2 */ >, - <0 133 0 /* CE3 */ >, - <0 134 0 /* CE4 */ >, - <0 135 0 /* CE5 */ >, - <0 136 0 /* CE6 */ >, - <0 137 0 /* CE7 */ >, - <0 138 0 /* CE8 */ >, - <0 139 0 /* CE9 */ >, - <0 140 0 /* CE10 */ >, - <0 141 0 /* CE11 */ >; + , + , + , + , + , + , + , + , + , + , + , + ; vdd-0.8-cx-mx-supply = <&pm8998_l5>; + vdd-1.8-xo-supply = <&vreg_l7a_1p8>; + vdd-1.3-rfa-supply = <&vreg_l17a_1p3>; + vdd-3.3-ch0-supply = <&vreg_l25a_3p3>; }; From patchwork Mon Nov 5 13:08:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Govind Singh X-Patchwork-Id: 10668251 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 3F97215E9 for ; Mon, 5 Nov 2018 13:09:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3059B2957F for ; Mon, 5 Nov 2018 13:09:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2404B297A1; Mon, 5 Nov 2018 13:09:14 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5C5B2957F for ; Mon, 5 Nov 2018 13:09:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729759AbeKEW2j (ORCPT ); Mon, 5 Nov 2018 17:28:39 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:40518 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729228AbeKEW2i (ORCPT ); Mon, 5 Nov 2018 17:28:38 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 414C461359; Mon, 5 Nov 2018 13:08:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1541423337; bh=1w9PcEo2AEM6ciEmzopxhnYhqKyAQIJsIXl0C7DxP1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OlxG4vU6KB8Vkg+2F0hMmEMy4A1iRWteEEmAANbJKOk32H9NPl88x0ur0jF8O52hM BxpllL889NdzuT1U43ew4c2PfUkiDOmqiHpB9ocbcqugckT5TOlA+dZsy1wlFeFVXY i+CrEk3mtqIG7f/1NQUSgS+BSR0TgOEDYbyikAZQ= Received: from svishnoi-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 9E23761343; Mon, 5 Nov 2018 13:08:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1541423334; bh=1w9PcEo2AEM6ciEmzopxhnYhqKyAQIJsIXl0C7DxP1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QP07V2v94ou6eCW5upLN+D49faBdWlSwT5qF8lDAAvDxjjtp4WFDEmP8j9FOv9Uuz VkBblUYD4gvShJo7W9LatRYH10EeDsb7SSOOQl0B11iXHcuTH1hh1pF4SGgW02Miz2 NjreMDfj+6FtWxPLSZOgXt5/Xz2UZgT+JDV/7OzU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 9E23761343 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: briannorris@chromium.org, andy.gross@linaro.org, ath10k@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-wireless@vger.kernel.org, robh+dt@kernel.org, sboyd@kernel.org, dianders@chromium.org, linux-kernel@vger.kernel.org Cc: Govind Singh Subject: [PATCH v4 2/3] dts: arm64/sdm845: Add WCN3990 WLAN module device node Date: Mon, 5 Nov 2018 18:38:37 +0530 Message-Id: <1541423318-19312-3-git-send-email-govinds@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1541423318-19312-1-git-send-email-govinds@codeaurora.org> References: <1541423318-19312-1-git-send-email-govinds@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add device node for the ath10k SNOC platform driver probe and add resources required for WCN3990 on SDM845 soc. Signed-off-by: Govind Singh Reviewed-by: Brian Norris Tested-by: Brian Norris --- arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 8 ++++++++ arch/arm64/boot/dts/qcom/sdm845.dtsi | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts index eedfaf8..c062c5c 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts @@ -440,3 +440,11 @@ bias-pull-up; }; }; + +&wifi { + status = "okay"; + vdd-0.8-cx-mx-supply = <&vreg_l5a_0p8>; + vdd-1.8-xo-supply = <&vreg_l7a_1p8>; + vdd-1.3-rfa-supply = <&vreg_l17a_1p3>; + vdd-3.3-ch0-supply = <&vreg_l25a_3p3>; +}; diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index b72bdb0..324be5b 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -87,6 +87,11 @@ reg = <0 0x86200000 0 0x2d00000>; no-map; }; + + wlan_msa_mem: memory@96700000 { + reg = <0 0x96700000 0 0x100000>; + no-map; + }; }; cpus { @@ -1403,5 +1408,26 @@ status = "disabled"; }; }; + + wifi: wifi@18800000 { + compatible = "qcom,wcn3990-wifi"; + status = "disabled"; + reg = <0x18800000 0x800000>; + reg-names = "membase"; + memory-region = <&wlan_msa_mem>; + interrupts = + , + , + , + , + , + , + , + , + , + , + , + ; + }; }; }; From patchwork Mon Nov 5 13:08:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Govind Singh X-Patchwork-Id: 10668243 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 0B99B14BD for ; Mon, 5 Nov 2018 13:09:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F00452957F for ; Mon, 5 Nov 2018 13:09:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4182297A1; Mon, 5 Nov 2018 13:09:03 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8526C2957F for ; Mon, 5 Nov 2018 13:09:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729568AbeKEW2n (ORCPT ); Mon, 5 Nov 2018 17:28:43 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:40894 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729228AbeKEW2m (ORCPT ); Mon, 5 Nov 2018 17:28:42 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id A04796149D; Mon, 5 Nov 2018 13:08:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1541423340; bh=8W6e1wuTPzIOLy2jXkqxvCLb1nFN33D/z9pXvTcJFqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nsuOEswK1IRKTGJUFDDjXbWjzKyJpcHTUr3d5f5X5KwmMxZpqmEg2ewbLMjazG64m oXbiMjlLLXzNJ6VO0d27T6jcC/DjMc915LHr8OyEPeaGHlIjQVZfoOW5KtNS5ONjKq qA4F7nhso4RgaJFzztvxw4eI10R/xcew4FRx1zGY= Received: from svishnoi-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 C61F3614BA; Mon, 5 Nov 2018 13:08:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1541423338; bh=8W6e1wuTPzIOLy2jXkqxvCLb1nFN33D/z9pXvTcJFqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cVldJ2JnEbXB4lpSgLR/BLrzc2CXuF1uGNhDDNV3Z7hyggWgkbhCI96i+4nNPZKWj 4Ga3ky6abag9/UevTBoZ4SD8RXT/VEN04wGdUNDuKXV8uncwvCqo37DnBDA1r1h4nm DnPX3Yk7LMdG/R6i70z/zqz081wetHZ3/akPXt/Q= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org C61F3614BA 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: briannorris@chromium.org, andy.gross@linaro.org, ath10k@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-wireless@vger.kernel.org, robh+dt@kernel.org, sboyd@kernel.org, dianders@chromium.org, linux-kernel@vger.kernel.org Cc: Govind Singh Subject: [PATCH v4 3/3] dt: bindings: add bindings for wifi iommu node Date: Mon, 5 Nov 2018 18:38:38 +0530 Message-Id: <1541423318-19312-4-git-send-email-govinds@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1541423318-19312-1-git-send-email-govinds@codeaurora.org> References: <1541423318-19312-1-git-send-email-govinds@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP WCN3990 wifi module can optionally make use of the IOMMU. Add binding documentation for phandle to the IOMMU and the stream id of wifi iommu block. Signed-off-by: Govind Singh Reviewed-by: Rob Herring Reviewed-by: Brian Norris Tested-by: Brian Norris --- Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt b/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt index 55d255c..78fb56a 100644 --- a/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt +++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt @@ -66,6 +66,10 @@ Optional properties: - -supply: handle to the regulator device tree node optional "supply-name" are "vdd-0.8-cx-mx", "vdd-1.8-xo", "vdd-1.3-rfa" and "vdd-3.3-ch0". +- iommus: + Usage: optional + Value type: + Definition: A list of phandle and IOMMU specifier pairs. Example (to supply the calibration data alone): @@ -162,4 +166,5 @@ wifi@18000000 { vdd-1.8-xo-supply = <&vreg_l7a_1p8>; vdd-1.3-rfa-supply = <&vreg_l17a_1p3>; vdd-3.3-ch0-supply = <&vreg_l25a_3p3>; + iommus = <&apps_smmu 0x0040 0x1>; };