From patchwork Tue Mar 29 03:37:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 8682041 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 336E99F54E for ; Tue, 29 Mar 2016 03:40:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4DD7D201E4 for ; Tue, 29 Mar 2016 03:40:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7BDA220121 for ; Tue, 29 Mar 2016 03:40:30 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1akkUX-0003fe-7t; Tue, 29 Mar 2016 03:38:53 +0000 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1akkTM-000333-8K for linux-arm-kernel@lists.infradead.org; Tue, 29 Mar 2016 03:37:43 +0000 Received: by mail-pa0-x22f.google.com with SMTP id tt10so3458980pab.3 for ; Mon, 28 Mar 2016 20:37:23 -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=zZ5I6XqalTKbJw1hl2130mr9sQdENXSD40DZZk+uRng=; b=CKRxv3P7bAMkl4/6P76kayp7o0OOq19ZArnVvjW804KgvWDo4Rh5tdHzBGc+d4LPHb s4m94laOkOlEbcz3H0bP0MOIL+KezpWu7Fg8Em30IILTL4fuJyb4InkK+nuXnHKSoZbH vtz2BNNNGEKZ8M7G6kehjKoHceabpN/48/MK0= 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=zZ5I6XqalTKbJw1hl2130mr9sQdENXSD40DZZk+uRng=; b=BM3twfM1byyj4zEW0wgRXj3Ceowe9Lt2+WwobIAVKR90LICYHBRvWcyBEM5UcNDln2 SxZsa3/4rjVoA95PuKkG9IRsdSBsjUxh+KWJiujpU2Sa1tKTU/Q8e92988/wMF5uRzdn uZLDT76trDAjP97JxLc/sFUFqVPJEGvooXhKc6Im5Sf5SHAkrcCNHQMIV7SFh2Uj0tZO 8D/rxfVJEuvOn0MEqPKHIkQfLPC3ElsEhDaaMdl75FMqGvNGEBvMv9bNgicUQUnawpMv UB1jqTlenWMFUKoxGKw2hG5BSQRsSCDF4hWjzimw+ZRRAfexY2nAKgQ8GTVix8n698Ww cX6g== X-Gm-Message-State: AD7BkJJmFj2Qr31DxPOvF38dsFL3XX1RIPcOOz6JmTXEVqa2XMeYl3x5TQp41ZyqBhGBPW/j X-Received: by 10.66.139.137 with SMTP id qy9mr48471460pab.57.1459222643229; Mon, 28 Mar 2016 20:37:23 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Mar 2016 20:37:22 -0700 (PDT) From: Bjorn Andersson To: Andy Gross Subject: [PATCH v2 9/9] ARM: dts: qcom: apq8064: Introduce wcnss remoteproc Date: Mon, 28 Mar 2016 20:37:05 -0700 Message-Id: <1459222625-11440-10-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160328_203740_466142_BF637D2A X-CRM114-Status: GOOD ( 11.17 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , John Stultz , linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,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 Signed-off-by: Bjorn Andersson --- Changes since v1: - Added dts patches .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 4 ++ arch/arm/boot/dts/qcom-apq8064.dtsi | 57 ++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts index 06b3c76c3e41..276f529383e8 100644 --- a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts +++ b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts @@ -432,5 +432,9 @@ pinctrl-0 = <&sdcc3_pin_a>, <&sdcc3_cd_pin_a>; }; }; + + wcnss@3204000 { + status = "okay"; + }; }; }; diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index ad7bc3c2aad1..2c213ce80acc 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -20,6 +20,11 @@ reg = <0x80000000 0x200000>; no-map; }; + + wcnss_mem: wcnss@8f000000 { + reg = <0x8f000000 0x700000>; + no-map; + }; }; cpus { @@ -231,6 +236,26 @@ pinctrl-names = "default"; pinctrl-0 = <&ps_hold>; + + wcnss_pin_a: wcnss-pins-active { + fm { + pins = "gpio14", "gpio15"; + function = "riva_fm"; + }; + + bt { + pins = "gpio16", "gpio17"; + function = "riva_bt"; + }; + + wlan { + pins = "gpio64", "gpio65", "gpio66", "gpio67", "gpio68"; + function = "riva_wlan"; + + drive-strength = <6>; + bias-pull-down; + }; + }; }; sfpb_wrapper_mutex: syscon@1200000 { @@ -916,6 +941,38 @@ reset-names = "axi", "ahb", "por", "pci", "phy"; status = "disabled"; }; + + wcnss@3204000 { + compatible = "qcom,riva-pil"; + reg = <0x03204000 0x100>; + + interrupts-extended = <&intc 0 199 IRQ_TYPE_EDGE_RISING>, + <&wcnss_smsm 6 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", "fatal"; + + memory-region = <&wcnss_mem>; + + vddcx-supply = <&pm8921_s3>; + vddmx-supply = <&pm8921_lvs7>; + vddpx-supply = <&pm8921_s4>; + + pinctrl-names = "default"; + pinctrl-0 = <&wcnss_pin_a>; + + status = "disabled"; + + iris { + compatible = "qcom,wcn3660"; + + clocks = <&rpmcc 2>; + clock-names = "xo"; + + vddxo-supply = <&pm8921_l4>; + vddrfa-supply = <&pm8921_s2>; + vddpa-supply = <&pm8921_l10>; + vdddig-supply = <&pm8921_lvs2>; + }; + }; }; }; #include "qcom-apq8064-pins.dtsi"