From patchwork Mon Nov 4 21:23:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 11226545 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 1129113BD for ; Mon, 4 Nov 2019 21:23:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3FCC20B7C for ; Mon, 4 Nov 2019 21:23:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b="kNiUbnAN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728940AbfKDVXN (ORCPT ); Mon, 4 Nov 2019 16:23:13 -0500 Received: from mail.z3ntu.xyz ([128.199.32.197]:35388 "EHLO mail.z3ntu.xyz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728377AbfKDVXN (ORCPT ); Mon, 4 Nov 2019 16:23:13 -0500 Received: from localhost.localdomain (80-110-127-196.cgn.dynamic.surfer.at [80.110.127.196]) by mail.z3ntu.xyz (Postfix) with ESMTPSA id C497BC570F; Mon, 4 Nov 2019 21:23:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=z3ntu.xyz; s=z3ntu; t=1572902591; bh=NJnSBKmA72MqyUk/PTfk9jPOk+kUpspS2ov0N6AeDl8=; h=From:To:Cc:Subject:Date; b=kNiUbnANzZ+MwV/Q9K16ALcsHLsHSuZBFX95KZ4Ln+bqm4uo3J6czW1k4vWGxlIYl IwtkKSX6/9CyWpZ1ULp5HrvnEQ4kKVdrlDlS9nL5WUZb48v6C3Q+s7tdOiD4/lqBbR Tq4BTkCSZ5QESlBOI/HmbAdhOX0itRjUtyIMS2S4= From: Luca Weiss To: linux-arm-msm@vger.kernel.org Cc: Bjorn Andersson , Bjorn Andersson , Luca Weiss , Andy Gross , Rob Herring , Mark Rutland , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] ARM: dts: msm8974: Introduce the wcnss remoteproc node Date: Mon, 4 Nov 2019 22:23:01 +0100 Message-Id: <20191104212302.105469-1-luca@z3ntu.xyz> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Bjorn Andersson Signed-off-by: Bjorn Andersson Signed-off-by: Bjorn Andersson Signed-off-by: Luca Weiss --- arch/arm/boot/dts/qcom-msm8974.dtsi | 66 ++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index 9a84eb0cbbe6..f8f02342c53d 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -30,7 +30,7 @@ no-map; }; - reserved@d200000 { + wcnss_region: wcnss@d200000 { reg = <0x0d200000 0xa00000>; no-map; }; @@ -795,6 +795,70 @@ clock-names = "core"; }; + pronto: remoteproc@fb21b000 { + compatible = "qcom,pronto-v2-pil", "qcom,pronto"; + reg = <0xfb204000 0x2000>, <0xfb202000 0x1000>, <0xfb21b000 0x3000>; + reg-names = "ccu", "dxe", "pmu"; + + memory-region = <&wcnss_region>; + + interrupts-extended = <&intc GIC_SPI 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,smem-states = <&wcnss_smp2p_out 0>; + qcom,smem-state-names = "stop"; + + status = "disabled"; + + iris { + compatible = "qcom,wcn3680"; + + clocks = <&rpmcc RPM_SMD_CXO_A2>; + clock-names = "xo"; + + vddxo-supply = <&pm8941_l6>; + vddrfa-supply = <&pm8941_l11>; + vddpa-supply = <&pm8941_l19>; + vdddig-supply = <&pm8941_s3>; + }; + + smd-edge { + interrupts = ; + + qcom,ipc = <&apcs 8 17>; + qcom,smd-edge = <6>; + + wcnss { + compatible = "qcom,wcnss"; + qcom,smd-channels = "WCNSS_CTRL"; + status = "disabled"; + + qcom,mmio = <&pronto>; + + bt { + compatible = "qcom,wcnss-bt"; + }; + + wifi { + compatible = "qcom,wcnss-wlan"; + + interrupts = , + ; + interrupt-names = "tx", "rx"; + + qcom,smem-states = <&apps_smsm 10>, <&apps_smsm 9>; + qcom,smem-state-names = "tx-enable", "tx-rings-empty"; + }; + }; + }; + }; + msmgpio: pinctrl@fd510000 { compatible = "qcom,msm8974-pinctrl"; reg = <0xfd510000 0x4000>; From patchwork Mon Nov 4 21:23:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 11226547 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 6B85C13BD for ; Mon, 4 Nov 2019 21:23:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49EDE20B7C for ; Mon, 4 Nov 2019 21:23:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b="k7ivHT3I" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728377AbfKDVXO (ORCPT ); Mon, 4 Nov 2019 16:23:14 -0500 Received: from mail.z3ntu.xyz ([128.199.32.197]:35398 "EHLO mail.z3ntu.xyz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728634AbfKDVXN (ORCPT ); Mon, 4 Nov 2019 16:23:13 -0500 Received: from localhost.localdomain (80-110-127-196.cgn.dynamic.surfer.at [80.110.127.196]) by mail.z3ntu.xyz (Postfix) with ESMTPSA id 7F0F6C791A; Mon, 4 Nov 2019 21:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=z3ntu.xyz; s=z3ntu; t=1572902591; bh=sHHFLZ4a/AYzel3aIkFvv+8ac5WlYoo+mlefNTaIupA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=k7ivHT3Io/k6Xg0RV2m9fPck3IBdmPejiUyKvhYUEVdUJAkfivbXkXcOq8VLDxE4U OeBUVJbVQp+LynKCXvk/KCc//dGprx5INq1ddMukvqY6CZLp/xWl++Zq7LejvdqSr8 RCcVNRc8IU2Mu86Fre57gMjO4LNICKO+Uz9Atx5s= From: Luca Weiss To: linux-arm-msm@vger.kernel.org Cc: Luca Weiss , Andy Gross , Rob Herring , Mark Rutland , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ARM: dts: msm8974-FP2: Introduce the wcnss remoteproc node Date: Mon, 4 Nov 2019 22:23:02 +0100 Message-Id: <20191104212302.105469-2-luca@z3ntu.xyz> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104212302.105469-1-luca@z3ntu.xyz> References: <20191104212302.105469-1-luca@z3ntu.xyz> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Enable the remoteproc node and add the necessary pinctrl states. Signed-off-by: Luca Weiss --- .../boot/dts/qcom-msm8974-fairphone-fp2.dts | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts index 26160394d717..d2d48770ec0f 100644 --- a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts +++ b/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts @@ -259,6 +259,25 @@ status = "ok"; }; + remoteproc@fb21b000 { + status = "ok"; + + vddmx-supply = <&pm8841_s1>; + vddcx-supply = <&pm8841_s2>; + + pinctrl-names = "default"; + pinctrl-0 = <&wcnss_pin_a>; + + smd-edge { + qcom,remote-pid = <4>; + label = "pronto"; + + wcnss { + status = "ok"; + }; + }; + }; + pinctrl@fd510000 { sdhc1_pin_a: sdhc1-pin-active { clk { @@ -287,6 +306,32 @@ bias-pull-up; }; }; + + 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; + }; + }; }; sdhci@f9824900 {