From patchwork Sat Nov 19 06:42:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 83059 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp469434qge; Fri, 18 Nov 2016 22:42:39 -0800 (PST) X-Received: by 10.129.156.2 with SMTP id t2mr3481931ywg.325.1479537759383; Fri, 18 Nov 2016 22:42:39 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p66si2477768ywc.130.2016.11.18.22.42.39; Fri, 18 Nov 2016 22:42:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752652AbcKSGmh (ORCPT + 7 others); Sat, 19 Nov 2016 01:42:37 -0500 Received: from mail-pf0-f169.google.com ([209.85.192.169]:35210 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751465AbcKSGmg (ORCPT ); Sat, 19 Nov 2016 01:42:36 -0500 Received: by mail-pf0-f169.google.com with SMTP id i88so57447901pfk.2 for ; Fri, 18 Nov 2016 22:42:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=tMtN7EbG1zZLrSXnhX90tIa0O7K1PXMzMuxMDEfN3yw=; b=EuZbVcYmuXUgCkbsSzq5MU0VPyg/fIH6tevIuiMd1CueLpbB+uHDZ6y7hMM1nPWsQ4 DfOS+o64f4PHbz/6BHVBerfJZFvyMuVv3gHBHbgAGA6J7JpS0CE1zDXbMuQqxQ90co2V YeZeAMeIUl/y6LRkuR5wSBoNawqHQr7kQ0vDw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=tMtN7EbG1zZLrSXnhX90tIa0O7K1PXMzMuxMDEfN3yw=; b=dvfgM3f7IGbFy+D+4+ugWCtxjzVMmI4A4FiV9o1VWsB2crUvuYdFnxeBkeiJ0mAwAV 7V66TTNfCGr5NU1DT4f1t4LHOnlS7Q/CVTFK3Ggu7ViH+wikX01ypKvMNEuyLYxdQ6e4 M6jH1UQxAYw+71QyhSNAQXh9e2qz8JOQcnafYpB1Tq9oTSLoHxgUN4hIgCNV8pKv8AZe BILGq6Rl2jyxNZ7HwNEzq9tf5Bdtff84eNMN0FNfoWbU9EI9SR32CRs96bPEd0daW9sK 2os8PYzWBFtSCX58QJulljwWubGmaQDOePqMXfd0SZ+Ygg4q+HXNG0AjjWl+ZJGbXa1a 7iJw== X-Gm-Message-State: AKaTC02rS0aQtxWQzhKBk0lnVBasyRgnu3l3qAseOFZ0BVHVHbSLt7j6JHUb7e1kbmbC7RSZ X-Received: by 10.99.95.86 with SMTP id t83mr7834570pgb.0.1479537755795; Fri, 18 Nov 2016 22:42:35 -0800 (PST) Received: from localhost.localdomain (ip68-111-223-48.sd.sd.cox.net. [68.111.223.48]) by smtp.gmail.com with ESMTPSA id g22sm4154437pgn.20.2016.11.18.22.42.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Nov 2016 22:42:34 -0800 (PST) From: Bjorn Andersson To: Andy Gross , David Brown Cc: linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: dts: msm8916: Add and enable wcnss node Date: Fri, 18 Nov 2016 22:42:32 -0800 Message-Id: <1479537752-28567-1-git-send-email-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.5.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add the wcnss remoteproc node the SMD edge and the wcnss ctrl, bluetooth and wifi nodes specified and enable this on db410c. Signed-off-by: Bjorn Andersson --- This still require the last wcn36xx and scm-interrupted patches to land, but as those won't affect the dts I'm posting this anyway. arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 4 ++ arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 13 ++++++ arch/arm64/boot/dts/qcom/msm8916.dtsi | 73 +++++++++++++++++++++++++++++- 3 files changed, 89 insertions(+), 1 deletion(-) -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index 08bd5ebafb4e..716d3ccbc309 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -306,6 +306,10 @@ }; }; }; + + wcnss@a21b000 { + status = "okay"; + }; }; usb2513 { diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi index 10c83e11c272..4cb0b5834143 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi @@ -720,4 +720,17 @@ }; }; }; + + wcnss_pin_a: wcnss-active { + pinmux { + pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44"; + function = "wcss_wlan"; + }; + + pinconf { + pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44"; + drive-strength = <6>; + bias-pull-up; + }; + }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 4221b7d2c0ce..2c692650ae43 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -14,6 +14,7 @@ #include #include #include +#include / { model = "Qualcomm Technologies, Inc. MSM8916"; @@ -82,7 +83,7 @@ no-map; }; - wcnss@89300000 { + wcnss_mem: wcnss@89300000 { reg = <0x0 0x89300000 0x0 0x600000>; no-map; }; @@ -853,6 +854,76 @@ memory-region = <&mpss_mem>; }; }; + + pronto: wcnss@a21b000 { + compatible = "qcom,pronto-v2-pil", "qcom,pronto"; + reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>; + reg-names = "ccu", "dxe", "pmu"; + + memory-region = <&wcnss_mem>; + + interrupts-extended = <&intc 0 149 IRQ_TYPE_EDGE_RISING>, + <&wcnss_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&wcnss_smp2p_in 1 IRQ_TYPE_EDGE_RISING>, + <&wcnss_smp2p_in 2 IRQ_TYPE_EDGE_RISING>, + <&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack"; + + vddmx-supply = <&pm8916_l3>; + vddpx-supply = <&pm8916_l7>; + + qcom,state = <&wcnss_smp2p_out 0>; + qcom,state-names = "stop"; + + pinctrl-names = "default"; + pinctrl-0 = <&wcnss_pin_a>; + + status = "disabled"; + + iris { + compatible = "qcom,wcn3620"; + + clocks = <&rpmcc RPM_SMD_RF_CLK2>; + clock-names = "xo"; + + vddxo-supply = <&pm8916_l7>; + vddrfa-supply = <&pm8916_s3>; + vddpa-supply = <&pm8916_l9>; + vdddig-supply = <&pm8916_l5>; + }; + + smd-edge { + interrupts = <0 142 1>; + + qcom,ipc = <&apcs 8 17>; + qcom,smd-edge = <6>; + qcom,remote-pid = <4>; + + label = "pronto"; + + wcnss { + compatible = "qcom,wcnss"; + qcom,smd-channels = "WCNSS_CTRL"; + + qcom,mmio = <&pronto>; + + bt { + compatible = "qcom,wcnss-bt"; + }; + + wifi { + compatible = "qcom,wcnss-wlan"; + + interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>, + <0 146 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "tx", "rx"; + + qcom,smem-states = <&apps_smsm 10>, <&apps_smsm 9>; + qcom,smem-state-names = "tx-enable", "tx-rings-empty"; + }; + }; + }; + }; }; smd {