From patchwork Tue Mar 29 03:37:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 8681851 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 53E59C0554 for ; Tue, 29 Mar 2016 03:37:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5C75720108 for ; Tue, 29 Mar 2016 03:37:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 632AE20220 for ; Tue, 29 Mar 2016 03:37:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755679AbcC2Dhb (ORCPT ); Mon, 28 Mar 2016 23:37:31 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:34740 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755779AbcC2DhR (ORCPT ); Mon, 28 Mar 2016 23:37:17 -0400 Received: by mail-pf0-f169.google.com with SMTP id x3so3781381pfb.1 for ; Mon, 28 Mar 2016 20:37:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=50nqR71cjaX4gqi9QfiTJdi2LTsgFWhQrqhX7arvNKA=; b=UIAKCIAx3qA5VNXOLPPkaPaBYssM/gNvRM4lii8BxFOvWJRLmBhkwwoyp6K6+Ddub3 06ikkj7if4Nq1nX3naj/3QM7fFnIifnqFUSWeKs0r25Fvr09Mvgb/H4WL9JVnFKYT3bg MkbC39uScS3lvz5YVqKg9lEJzZpU0xSdvW7tw= 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:in-reply-to :references; bh=50nqR71cjaX4gqi9QfiTJdi2LTsgFWhQrqhX7arvNKA=; b=TxdTJQjxcojfziTsU111i56bt6khEocxl/PDeApRnZ98wH+xthemlUopwOyOSC8it/ ZLjYSQniTzKfhTf3Jk4SVjBwVI6l1EPNvCM0aV7t9cVJOT8TyY9CuwYSbIYkkyzL2pHU zqSpjxagFU5JgJmIUIovQu/lpwJZadJucDiEz4aOlaIoldeVXZwXyn2wape2zEiFT5Gb ZrKnaURSwnh85yhumgBC7RBIhqXXd1TLAkTgSi5be7m+daKQt/HTZybECJC+wEDvdyLq xa5a9Ve9PlcoaSa36n9hJ3LGVGiN88pwJOcHTq0IoV7mfotZALWlmP40GN5Y/v9DxOuo Fs6A== X-Gm-Message-State: AD7BkJJ+tqydu44LAndmGdGydiBpjVEX7MapK6rKXunEuFrbaXMXi2wdgqZi3s3O6dQQvr7d X-Received: by 10.98.7.135 with SMTP id 7mr47856236pfh.124.1459222637006; Mon, 28 Mar 2016 20:37:17 -0700 (PDT) Received: from localhost.localdomain (ip68-111-223-48.sd.sd.cox.net. [68.111.223.48]) by smtp.gmail.com with ESMTPSA id 85sm38851600pfl.18.2016.03.28.20.37.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Mar 2016 20:37:16 -0700 (PDT) From: Bjorn Andersson To: Andy Gross , Rob Herring Cc: linux-arm-msm@vger.kernel.org, John Stultz , linux-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org, Bjorn Andersson Subject: [PATCH v2 5/9] ARM: dts: qcom: msm8974: Introduce the wcnss remoteproc node Date: Mon, 28 Mar 2016 20:37:01 -0700 Message-Id: <1459222625-11440-6-git-send-email-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459222625-11440-1-git-send-email-bjorn.andersson@linaro.org> References: <1459222625-11440-1-git-send-email-bjorn.andersson@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bjorn Andersson Signed-off-by: Bjorn Andersson Signed-off-by: Bjorn Andersson --- Changes since v1: - Added dts patches .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 32 +++++++++++++++++++ arch/arm/boot/dts/qcom-msm8974.dtsi | 36 +++++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts index a0398b69f4f2..74faa291d213 100644 --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts @@ -311,6 +311,13 @@ pinctrl-0 = <&blsp1_uart2_pin_a>; }; + wcnss-rproc@fb21b000 { + status = "ok"; + + pinctrl-names = "default"; + pinctrl-0 = <&wcnss_pin_a>; + }; + pinctrl@fd510000 { blsp1_uart2_pin_a: blsp1-uart2-pin-active { rx { @@ -366,6 +373,31 @@ }; }; + wcnss_pin_a: wcnss-pin-active { + wlan { + pins = "gpio36", "gpio37", "gpio38", "gpio39", "gpio40"; + function = "wlan"; + + drive-strength = <6>; + bias-pull-down; + }; + + bt { + pins = "gpio35", "gpio43", "gpio44"; + function = "bt"; + + drive-strength = <2>; + bias-pull-down; + }; + + fm { + pins = "gpio41", "gpio42"; + function = "fm"; + + drive-strength = <2>; + bias-pull-down; + }; + }; }; }; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index ef5330578431..5c0d1a46baeb 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -2,6 +2,7 @@ #include #include +#include #include "skeleton.dtsi" / { @@ -24,7 +25,7 @@ no-map; }; - reserved@0d200000 { + wcnss_region: wcnss@0d200000 { reg = <0x0d200000 0xa00000>; no-map; }; @@ -430,6 +431,39 @@ clock-names = "core"; }; + wcnss-rproc@fb21b000 { + compatible = "qcom,pronto-v2-pil"; + reg = <0xfb21b000 0x3000>; + + memory-region = <&wcnss_region>; + + 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"; + + vddpx-supply = <&pm8941_s3>; + + qcom,state = <&wcnss_smp2p_out 0>; + qcom,state-names = "stop"; + + status = "disabled"; + + iris { + compatible = "qcom,wcn3680"; + + clocks = <&rpmcc RPM_CXO_A2>; + clock-names = "xo"; + + vddxo-supply = <&pm8941_l6>; + vddrfa-supply = <&pm8941_l11>; + vddpa-supply = <&pm8941_l19>; + vdddig-supply = <&pm8941_s3>; + }; + }; + msmgpio: pinctrl@fd510000 { compatible = "qcom,msm8974-pinctrl"; reg = <0xfd510000 0x4000>;