From patchwork Sat Jul 22 21:27:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 9858197 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A0C86601C0 for ; Sat, 22 Jul 2017 21:27:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FD5F284FF for ; Sat, 22 Jul 2017 21:27:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 910332850E; Sat, 22 Jul 2017 21:27:18 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 DF9AC284FF for ; Sat, 22 Jul 2017 21:27:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751359AbdGVV1Q (ORCPT ); Sat, 22 Jul 2017 17:27:16 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34108 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750921AbdGVV1P (ORCPT ); Sat, 22 Jul 2017 17:27:15 -0400 Received: by mail-wm0-f66.google.com with SMTP id 79so646493wmg.1; Sat, 22 Jul 2017 14:27:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mKmeGQFDXH+DxDuGP3uqu+of+Bmo1fC1s3qyH/tiMvU=; b=Fh6IH5IM9tvgSaQWnUsrPiScOTAoV6akR8NZLUPeM2+Rhue5fIEMSQVCxSQmjQwrky BiCqaQuDV4gaGEZHeEbPG8JKeIFNbKMwcU6GWdEC3K/EYQKFmrBdbL0El3q/5TmRtpiN Jy1Tc+Qk+zmJqTl6/YdOIOPmPjSEt9sKpGA17PnH8NnuHbEVVvpKiAojqTAxTNiIx5ZC UXiU9vIAxS2UV6yPnRLbxVplxu470f0JllsO9k37brARoGoW9WMa+IxK/CTkHDXAdRNt zb0HKy/c+BKBcD1HFes17NJh+kHJn3DHQ7kELcJp5lUZ/SVXQ82CKv3BOYnOHJl03P4a R33g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mKmeGQFDXH+DxDuGP3uqu+of+Bmo1fC1s3qyH/tiMvU=; b=KiByrrLTmK/43rt2FvhIS7Mp5VAq4snwmDxPGYD8s+MZWzjeXaHs9kr23pmpx8eIZD 1IurXJIZPIKxCl7p4vkb67sBybpzJYxLavf/rh3uHtA2ej0QJFyjDW9ykggMbn+fwLXt 70XHaJQlyw1t0cBn9yZoanYCCVOYsI4qlMFzKftlCUw0uzX4U9qjfz/kvTdGK1dZ7vSb o+nqTMLSXl8mZkcgSt6OfZ04KGKDaOMJiGMsR9LxBtnzBwnKOC3sXTBfw1hLPC3g+t+v gNBIl5okTd6SY4kI8OoNSDj/R0SZwzHbeg5uObIbq2kXRoUpkHITKHCt500dvaS9xIxi qWtA== X-Gm-Message-State: AIVw110cF0YX3DZ4I8sP6tRstbDijNQKPQvCgWArVj20r9Ap7WTeTiUX Unv0kxrHQgrdgylA X-Received: by 10.28.99.11 with SMTP id x11mr1765586wmb.164.1500758833072; Sat, 22 Jul 2017 14:27:13 -0700 (PDT) Received: from debian64.daheim (p200300D5FBCFC7FCD63D7EFFFEBDE96E.dip0.t-ipconnect.de. [2003:d5:fbcf:c7fc:d63d:7eff:febd:e96e]) by smtp.gmail.com with ESMTPSA id j31sm10112662wre.67.2017.07.22.14.27.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 22 Jul 2017 14:27:12 -0700 (PDT) Received: from chuck by debian64.daheim with local (Exim 4.89) (envelope-from ) id 1dZ1vb-0004uz-9t; Sat, 22 Jul 2017 23:27:11 +0200 From: Christian Lamparter To: linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Andy Gross , David Brown Subject: [PATCH] arm: dts: qcom: add and enable both wifi blocks on the IPQ4019 Date: Sat, 22 Jul 2017 23:27:11 +0200 Message-Id: <20170722212711.18865-1-chunkeey@googlemail.com> X-Mailer: git-send-email 2.13.3 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 This patch adds and enables the device-tree definitions for both qcom,ipq4019-wifi blocks for the IPQ4019. Support for these have been added into the ath10k driver since: commit 280e762e9c72 ("ath10k: enable ipq4019 device probe in ahb module") The binding documentation was added in: commit a47aaa69de88 ("dt: bindings: add new dt entry for pre calibration in qcom, ath10k.txt") This has been tested on an ASUS RT-AC58U (IPQ4019), an AVM Fritz!Box 4040 (IPQ4018), a Compex WPJ428 (IPQ4028) and a Cisco Meraki MR33 (IPQ4029). | a000000.wifi: qca4019 hw1.0 target 0x01000000 chip_id 0x003b00ff [...] | a000000.wifi: kconfig debug 0 debugfs 1 tracing 0 dfs 1 testmode 1 | a000000.wifi: firmware ver 10.4-3.4-00082 api 5 features no-p2p,mfp,[...] | a000000.wifi: board_file api 2 bmi_id 0:16 crc32 5773b188 | a000000.wifi: htt-ver 2.2 wmi-op 6 htt-op 4 cal pre-cal-file [...] ... | a800000.wifi: qca4019 hw1.0 target 0x01000000 chip_id 0x003b00ff sub 0000:0000 | a800000.wifi: kconfig debug 0 debugfs 1 tracing 0 dfs 1 testmode 1 | a800000.wifi: firmware ver 10.4-3.4-00082 api 5 features no-p2p, [...] | a800000.wifi: board_file api 2 bmi_id 0:17 crc32 5773b188 | a800000.wifi: htt-ver 2.2 wmi-op 6 htt-op 4 cal pre-cal-file [...] Signed-off-by: Christian Lamparter --- arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 8 +++ arch/arm/boot/dts/qcom-ipq4019.dtsi | 84 +++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi index c25d8f5c669d..cfa0c9970d5b 100644 --- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi @@ -112,5 +112,13 @@ watchdog@b017000 { status = "ok"; }; + + wifi@a000000 { + status = "ok"; + }; + + wifi@a800000 { + status = "ok"; + }; }; }; diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi index d1a56331ce96..1ddcc96b510c 100644 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi @@ -291,5 +291,89 @@ compatible = "qcom,pshold"; reg = <0x4ab000 0x4>; }; + + wifi0: wifi@a000000 { + compatible = "qcom,ipq4019-wifi"; + reg = <0xa000000 0x200000>; + resets = <&gcc WIFI0_CPU_INIT_RESET>, + <&gcc WIFI0_RADIO_SRIF_RESET>, + <&gcc WIFI0_RADIO_WARM_RESET>, + <&gcc WIFI0_RADIO_COLD_RESET>, + <&gcc WIFI0_CORE_WARM_RESET>, + <&gcc WIFI0_CORE_COLD_RESET>; + reset-names = "wifi_cpu_init", "wifi_radio_srif", + "wifi_radio_warm", "wifi_radio_cold", + "wifi_core_warm", "wifi_core_cold"; + clocks = <&gcc GCC_WCSS2G_CLK>, + <&gcc GCC_WCSS2G_REF_CLK>, + <&gcc GCC_WCSS2G_RTC_CLK>; + clock-names = "wifi_wcss_cmd", "wifi_wcss_ref", + "wifi_wcss_rtc"; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-names = "msi0", "msi1", "msi2", "msi3", + "msi4", "msi5", "msi6", "msi7", + "msi8", "msi9", "msi10", "msi11", + "msi12", "msi13", "msi14", "msi15", + "legacy"; + status = "disabled"; + }; + + wifi1: wifi@a800000 { + compatible = "qcom,ipq4019-wifi"; + reg = <0xa800000 0x200000>; + resets = <&gcc WIFI1_CPU_INIT_RESET>, + <&gcc WIFI1_RADIO_SRIF_RESET>, + <&gcc WIFI1_RADIO_WARM_RESET>, + <&gcc WIFI1_RADIO_COLD_RESET>, + <&gcc WIFI1_CORE_WARM_RESET>, + <&gcc WIFI1_CORE_COLD_RESET>; + reset-names = "wifi_cpu_init", "wifi_radio_srif", + "wifi_radio_warm", "wifi_radio_cold", + "wifi_core_warm", "wifi_core_cold"; + clocks = <&gcc GCC_WCSS5G_CLK>, + <&gcc GCC_WCSS5G_REF_CLK>, + <&gcc GCC_WCSS5G_RTC_CLK>; + clock-names = "wifi_wcss_cmd", "wifi_wcss_ref", + "wifi_wcss_rtc"; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + interrupt-names = "msi0", "msi1", "msi2", "msi3", + "msi4", "msi5", "msi6", "msi7", + "msi8", "msi9", "msi10", "msi11", + "msi12", "msi13", "msi14", "msi15", + "legacy"; + status = "disabled"; + }; }; };