From patchwork Thu Nov 7 04:33:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffrey Hugo X-Patchwork-Id: 11231869 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 33AB31864 for ; Thu, 7 Nov 2019 04:33:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11D2121D6C for ; Thu, 7 Nov 2019 04:33:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aAC5niyD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733111AbfKGEdn (ORCPT ); Wed, 6 Nov 2019 23:33:43 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:42108 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727279AbfKGEdn (ORCPT ); Wed, 6 Nov 2019 23:33:43 -0500 Received: by mail-pg1-f195.google.com with SMTP id q17so1022835pgt.9; Wed, 06 Nov 2019 20:33:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LbE/xztA3ca2HrMOMcgsagRjWaGT50SCwVvLyRPFO1c=; b=aAC5niyDARYhrLAtyaeZJo9oy8uyfnQnL+aF4Dzb9EcD41+3+bBi+8jKmH5AYiJUtj vxPBoSwpfUF0PxgdpYqpwSGq6egWCsNzweLzCCqObsMNoWSQ3iFqP1vJpn22f1zfPuKk ngrLVdTWQTpi6M+sfaRvxKtmL+kWog3zJr9GueQ3FAGWOFv7cerJdGPVyAFopsSJ33Mr YzmvpB5MAAuZD6TlRIq4Jmu5DQRhu1JTj0F08YmGyVjhsHWWP4fkhL40JD/gNuBn4r1r onwTTW4yfkllZ4OSHvi1MdV5qyVVaOZLwfZpPJJXr/ihd1ZcQ+at9j4D7GIcfh+0ah2u Zgmg== 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:in-reply-to :references; bh=LbE/xztA3ca2HrMOMcgsagRjWaGT50SCwVvLyRPFO1c=; b=UXEemioofVRGWg0VV/GkWI5xR9t9oDBmq5Usi8sKTLCnrwxHOLy9mlwm+HH3AwwcGS XBc2HzTxTbIu4RmWbnSst2U/RG3cCxCA7c1gPjvYVEeNANiB/adJaPqKWyD1QT2doJjd U87Ii+a+6KSyV9XR9fQ7KfJ1KNSavD1y2tliH7T7J3UzANN398vk/1I8T50ctAmOSzk9 Ax/J8jllEE7sZhtTHSifTwkx09Xel1xxRl82uciuoafyPs24ak6QMHlSQrkm9KGk2Wij qS+Kcf4wIEQgvqvPSj8FiOFSQmzEnsnQ58GYg/y+z2Zhp0eDFDjNCEbHjwsFYmuBTTic NtFA== X-Gm-Message-State: APjAAAWlw48+HQRyxpVb+QDWAHCznTISgG/eKdm+z2eDDPqVeycrWDZE g9BTa1VT3A4hEGZQqJO4+yc= X-Google-Smtp-Source: APXvYqzhYy1x4uC0FvOvzJynRkccru6DiTHLCV7TuUBp1qqEiDMitG/5HGkY3uhj7QoryAgLZ6DLBw== X-Received: by 2002:a63:f34f:: with SMTP id t15mr1960823pgj.453.1573101222181; Wed, 06 Nov 2019 20:33:42 -0800 (PST) Received: from aw-bldr-10.qualcomm.com (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id r22sm737524pfg.54.2019.11.06.20.33.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2019 20:33:41 -0800 (PST) From: Jeffrey Hugo To: agross@kernel.org, bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Jeffrey Hugo Subject: [PATCH 1/2] arm64: dts: qcom: msm8998: Add anoc2 smmu node Date: Wed, 6 Nov 2019 20:33:12 -0800 Message-Id: <20191107043313.4055-2-jeffrey.l.hugo@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191107043313.4055-1-jeffrey.l.hugo@gmail.com> References: <20191107043313.4055-1-jeffrey.l.hugo@gmail.com> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org While there are several peripherals on the anoc2, most are not behind the smmu. However, the SoC integrated wlan block is behind the smmu, so we'll need to control the smmu inorder to enable wifi. Signed-off-by: Jeffrey Hugo --- arch/arm64/boot/dts/qcom/msm8998.dtsi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index fc7838ea9a01..d5263e4f64ce 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -847,6 +847,25 @@ ; }; + anoc2_smmu: iommu@16c0000 { + compatible = "qcom,msm8998-smmu-v2", "qcom,smmu-v2"; + reg = <0x016c0000 0x40000>; + #iommu-cells = <1>; + + #global-interrupts = <0>; + interrupts = + , + , + , + , + , + , + , + , + , + ; + }; + pcie0: pci@1c00000 { compatible = "qcom,pcie-msm8996"; reg = <0x01c00000 0x2000>, From patchwork Thu Nov 7 04:33:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffrey Hugo X-Patchwork-Id: 11231871 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5ECCE1986 for ; Thu, 7 Nov 2019 04:33:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D8E421D79 for ; Thu, 7 Nov 2019 04:33:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UJzQf/fT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733152AbfKGEdp (ORCPT ); Wed, 6 Nov 2019 23:33:45 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:40004 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727279AbfKGEdp (ORCPT ); Wed, 6 Nov 2019 23:33:45 -0500 Received: by mail-pl1-f194.google.com with SMTP id e3so548981plt.7; Wed, 06 Nov 2019 20:33:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WGFqHVbK1SfENXofL3oDwndtYsDfptUfRJZYF1mpT5k=; b=UJzQf/fTNaLBclIKMN3E2ogMM6IA1yL3zApsm5XIu33j8J/CdaDWqobIs/lYuH+yUg LeUfuGjMLjpZRqB3kOAJRPMhTxxpwOXgL2m7n3glqriMi+60kiOBzMbBw2IC/wicUBsC XU5d+s6DsZt3keCMCF9hzY5Vh2nhUlNmjDDpMoDpFmH9/rmVBc+TG5HaykHjgkhL6WpC R6GGEM+e4fIF96pCl7Ay4/lUiai3+Bu+UFqTrJtCs4YuaDZVlVHkLCw9rq0//upCKq53 yjYe3ZvOK26cvU36wV1KsYcdgrnQlnwqi2kaKpInr17dezRIZAKSx8KGtj18NnV0AHeB MuEw== 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:in-reply-to :references; bh=WGFqHVbK1SfENXofL3oDwndtYsDfptUfRJZYF1mpT5k=; b=ggJpB3DyZ3G9kPhDr5F5l04q6J9nXl1ywa5rHYIGgd4pkU6EXB5HXSbTJsmAGjSnKH muYwRAC1AwvC0Qdu7lGRb1TtQueFj5wySLwZ7PXLsb2EdR2RQNnStky5J+E29Dd/aWNZ PjDCosxUVFc0y9+QdY9m8CjIfUS1qWlLDW77hyA5KFRVfrEdvnFr4eJDEitPWBDOocSn pPh3ypUOJJeNIOu/sNU7CGgYA8choxJppLKqec3WCBfKcsX8c2yCY0rDxdKW24tRKbbK 9Av3YwhB5ku9Fkhlmuxx435p6YPeFMpGzGofu4hzS5p3wEHVh/1wMFIeOZNa4P+H4CcY wH2w== X-Gm-Message-State: APjAAAWa4q2tqffsdVY1kBYEaZBAj+JyUUsf/O5IRVNM+9rq3jtOS/Em mr0oP4QVnJuEc+eMClXRQMw= X-Google-Smtp-Source: APXvYqymJu8QOi3PbALe/ALDO0m2ctz1BVzVAFa9xo8MYft/YaykeD5BRJmMUse7od3Jzo6tXkxzTw== X-Received: by 2002:a17:902:4e:: with SMTP id 72mr1549152pla.270.1573101224534; Wed, 06 Nov 2019 20:33:44 -0800 (PST) Received: from aw-bldr-10.qualcomm.com (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id r22sm737524pfg.54.2019.11.06.20.33.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2019 20:33:44 -0800 (PST) From: Jeffrey Hugo To: agross@kernel.org, bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Jeffrey Hugo Subject: [PATCH 2/2] arm64: dts: qcom: msm8998: Add wifi node Date: Wed, 6 Nov 2019 20:33:13 -0800 Message-Id: <20191107043313.4055-3-jeffrey.l.hugo@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191107043313.4055-1-jeffrey.l.hugo@gmail.com> References: <20191107043313.4055-1-jeffrey.l.hugo@gmail.com> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add the wifi node and required reserved memory to enable the wlan hardware. Enable the wifi node in both the mtp and clamshell platforms after adding the relevant regulators for each platform. Signed-off-by: Jeffrey Hugo --- .../boot/dts/qcom/msm8998-clamshell.dtsi | 9 ++++++ arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 9 ++++++ arch/arm64/boot/dts/qcom/msm8998.dtsi | 31 +++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi b/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi index 6138b58db6d2..0f84fa0894a4 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi @@ -292,3 +292,12 @@ vdda-phy-supply = <&vreg_l1a_0p875>; vdda-pll-supply = <&vreg_l2a_1p2>; }; + +&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/msm8998-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi index 5f101a20a20a..1220756fb5b3 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi @@ -364,3 +364,12 @@ vdda-phy-supply = <&vreg_l1a_0p875>; vdda-pll-supply = <&vreg_l2a_1p2>; }; + +&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/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index d5263e4f64ce..e624f0323d23 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -43,6 +43,11 @@ no-map; }; + wlan_msa_mem: memory@95700000 { + reg = <0x0 0x95700000 0x0 0x100000>; + no-map; + }; + rmtfs { compatible = "qcom,rmtfs-mem"; @@ -1889,6 +1894,32 @@ redistributor-stride = <0x0 0x20000>; interrupts = ; }; + + wifi: wifi@18800000 { + compatible = "qcom,wcn3990-wifi"; + status = "disabled"; + reg = <0x18800000 0x800000>; + reg-names = "membase"; + memory-region = <&wlan_msa_mem>; + clocks = <&rpmcc RPM_SMD_RF_CLK2_PIN>; + clock-names = "cxo_ref_clk_pin"; + interrupts = + , + , + , + , + , + , + , + , + , + , + , + ; + iommus = <&anoc2_smmu 0x1900>, + <&anoc2_smmu 0x1901>; + qcom,snoc-host-cap-8bit-quirk; + }; }; };