From patchwork Wed Dec 21 11:49:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 88774 Delivered-To: patch@linaro.org Received: by 10.182.112.6 with SMTP id im6csp2891998obb; Wed, 21 Dec 2016 11:50:45 -0800 (PST) X-Received: by 10.84.172.131 with SMTP id n3mr11640002plb.5.1482349845843; Wed, 21 Dec 2016 11:50:45 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o63si27833910pfi.114.2016.12.21.11.50.45; Wed, 21 Dec 2016 11:50:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764362AbcLUTuh (ORCPT + 25 others); Wed, 21 Dec 2016 14:50:37 -0500 Received: from mail-pf0-f182.google.com ([209.85.192.182]:36027 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761764AbcLUTto (ORCPT ); Wed, 21 Dec 2016 14:49:44 -0500 Received: by mail-pf0-f182.google.com with SMTP id 189so35857537pfz.3 for ; Wed, 21 Dec 2016 11:49:43 -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:in-reply-to:references; bh=5hmzs1gfg/vxnpu99l/mYwJE250R3wDJLm5M1ieeN0Y=; b=Yl/QS8H5t2Gw1T+T7ynmQPSfxWXgN3lViOSM0nS98aKgxEQSfB+V9waiBKIc6ymAPb PdAElO5UeouRCqRIB7MK/VoUdPHWb8cp8dChPT/mCvM8PjC7KYG2FlNbISYAJaKuOs6t NXO8Ut2ZbxOBDbuZUD6D/krT5kFYpmk7kqM5o= 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=5hmzs1gfg/vxnpu99l/mYwJE250R3wDJLm5M1ieeN0Y=; b=SPTzwzqUub9db7XVCuMJ7qz8OFrTSj012DCGjIrnzo6WoB2wlQnaQlJtKzBrXNZW3V qJ6DQx6ViK9cJMmYZhi96hT/2azRHP2uL+vWzv80zjum/4CtpK6nvfXQAMn8FuP2nt6U spYqnovZUQme2xHxfTMOxVsBIlHULVdshw5euZy0p9hIz8JJlR4KbwCpUybe/iXVJhsf XArFAi2PY3cZNDyyRevpXvfN+PG5d6bDOtqpLnqtbhZFydTiIyUXuecoSqgBRaNQwjgh 4AhN0N+YOkHxmMBc8o0ZSilb3sJzLgd61sVdBSG8WnMaIanSmXEf70s9hnYnQt0DzJe4 UFwg== X-Gm-Message-State: AIkVDXJ96J+SJ54YdSE2WZlGGtbjlgnKyC4OKAs3OcnYXo5g65b8qOwgtpfIizdbwaFxvrPm X-Received: by 10.84.179.67 with SMTP id a61mr11682416plc.98.1482349783002; Wed, 21 Dec 2016 11:49:43 -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 q14sm48821767pfa.40.2016.12.21.11.49.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Dec 2016 11:49:42 -0800 (PST) From: Bjorn Andersson To: Andy Gross , David Brown Cc: Rob Herring , Mark Rutland , 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, John Stultz Subject: [PATCH 2/5] ARM: dts: qcom: apq8064: Add riva-pil node Date: Wed, 21 Dec 2016 03:49:36 -0800 Message-Id: <20161221114939.19973-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161221114939.19973-1-bjorn.andersson@linaro.org> References: <20161221114939.19973-1-bjorn.andersson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add nodes for the Riva PIL, IRIS RF module, BT and WiFI services exposed by the Riva firmware and the related memory reserve. Also provides pinctrl nodes for devices enabling the riva-pil. Cc: John Stultz Signed-off-by: Bjorn Andersson --- arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 18 +++++++++ arch/arm/boot/dts/qcom-apq8064.dtsi | 69 +++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 1 deletion(-) -- 2.11.0 diff --git a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi index 6b801e7e57a2..5c023e649882 100644 --- a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi @@ -284,4 +284,22 @@ bias-disable = <0>; }; }; + + riva_fm_pin_a: riva-fm-active { + pins = "gpio14", "gpio15"; + function = "riva_fm"; + }; + + riva_bt_pin_a: riva-bt-active { + pins = "gpio16", "gpio17"; + function = "riva_bt"; + }; + + riva_wlan_pin_a: riva-wlan-active { + pins = "gpio64", "gpio65", "gpio66", "gpio67", "gpio68"; + function = "riva_wlan"; + + drive-strength = <6>; + bias-pull-down; + }; }; diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index 78bf155a52f3..3dc7a7aa3450 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -21,6 +21,11 @@ reg = <0x80000000 0x200000>; no-map; }; + + wcnss_mem: wcnss@8f000000 { + reg = <0x8f000000 0x700000>; + no-map; + }; }; cpus { @@ -179,7 +184,7 @@ }; clocks { - cxo_board { + cxo_board: cxo_board { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <19200000>; @@ -1419,6 +1424,68 @@ }; }; }; + + riva: riva-pil@3204000 { + compatible = "qcom,riva-pil"; + + reg = <0x03200800 0x1000>, <0x03202000 0x2000>, <0x03204000 0x100>; + reg-names = "ccu", "dxe", "pmu"; + + interrupts-extended = <&intc GIC_SPI 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_l24>; + vddpx-supply = <&pm8921_s4>; + + status = "disabled"; + + iris { + compatible = "qcom,wcn3660"; + + clocks = <&cxo_board>; + clock-names = "xo"; + + vddxo-supply = <&pm8921_l4>; + vddrfa-supply = <&pm8921_s2>; + vddpa-supply = <&pm8921_l10>; + vdddig-supply = <&pm8921_lvs2>; + }; + + smd-edge { + interrupts = ; + + qcom,ipc = <&l2cc 8 25>; + qcom,smd-edge = <6>; + + label = "riva"; + + wcnss { + compatible = "qcom,wcnss"; + qcom,smd-channels = "WCNSS_CTRL"; + + qcom,mmio = <&riva>; + + 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"; + }; + }; + }; + }; }; }; #include "qcom-apq8064-pins.dtsi"