From patchwork Fri May 10 04:34:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 163828 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1875037ilr; Thu, 9 May 2019 21:34:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqz7iQEF/vwRp1wpWC5KeuX3tg3Gx/bZN+UlnLeL7FaUmQJfQ8ZWF387mRiiltDRUmMsFYoF X-Received: by 2002:a63:9a52:: with SMTP id e18mr10880257pgo.335.1557462889642; Thu, 09 May 2019 21:34:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557462889; cv=none; d=google.com; s=arc-20160816; b=g621taYILHFZwBXuijK+j55v71nXOSW8vJgf4vdDrqmlGegnszGdzRtbue+YSQiFbw 9d3u42IKq+NN3T0CVQrCcCGxVZdYlmVoY3Zozj7yYqjdQw/MJm3k9pXZLTsgOxRbFp9z 2NiYHcsRWz2uOYXAv7NYmzpoVEK+emo+6OlBAr8fud8Vvp7kCCwAfs5trhcUy546sigr BF6uYMJ1cG3moiWPjIxDqsF7B9jF6SbkJEH9PcTei4ZhjPkWxxD/6mbZfDAsqjXLJyta 8qq9qatozlc8UuE8YrjmpYOLhEhrJp6yj6ejzfG8yfM3H+oJzbelCnoI2V1iQ++pTRiZ b5Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=env9uxGf/YDPrGif/zsypWijN3KnRmxh8/WUWaV7Q78=; b=OM6F26I6YhR/pXmsmPwx3S8F7F9yw7zBSBvDqY2fQ7UAXczr5fpnu9tysJHY/0M8zQ ptzA1LFvSJt2/6vcGNUBEnqUze7eINdC9OVpVi1fV67R3ehH4ZNnX4gDkqfQ9qPhYQ1k BbujcPBosriBPkgdRKNvn4RZ3/rAngsBjGhnaz8hofafK0ImHX+erciW2yI7S+1DPLjD 4XRxI5p54JqEcuPr2HaKzEWRM5wuo3Z/YmNciJb3OkPrDiGJTDrElKsik14Ten/9BAME UFJ1VbmPIPwdiXGUpoFXeNEv7c6NN6c5v5X+V2IVoxafXhXCtc3oSNfEgy5wt+hTRSSm USHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gJFQozyC; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t21si5864597plr.366.2019.05.09.21.34.49; Thu, 09 May 2019 21:34:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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 header.s=google header.b=gJFQozyC; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727178AbfEJEes (ORCPT + 15 others); Fri, 10 May 2019 00:34:48 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:42294 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727112AbfEJEec (ORCPT ); Fri, 10 May 2019 00:34:32 -0400 Received: by mail-pl1-f193.google.com with SMTP id x15so2189076pln.9 for ; Thu, 09 May 2019 21:34:32 -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=env9uxGf/YDPrGif/zsypWijN3KnRmxh8/WUWaV7Q78=; b=gJFQozyCmLkFapzpMYtWgmMIKnFeSmlXAAB8gAHcmU4aMPu874ZBoNT8dE4DLSMqCu Cq962ZaYtdy00rzlcyufkbBtBbLBbsgrIHb3BqgltfSIKzJXi4UGq+TDuzkHXC9IRTgb uU+gizZdExvTL7G1wGmcciBpgyTULL8Okovt90c4II4jOIOUOPvbOm+DA2vdG0bpz7RQ CVT1imO5xr0dIWCu/EsZJPRBtmkscsM4O5cnjyA+LJwGRPrmbT9lyOSVOy1aWjgKip8p uoQMG8IsUtdY3eEQFfydA6ytSixZkowVJj2oUEQuMr0E3SoJsBBlclgbW+3E1UL3qdrI WD0A== 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=env9uxGf/YDPrGif/zsypWijN3KnRmxh8/WUWaV7Q78=; b=D80bZ1J/WXGjA322o5AKCweGVTbMEatYkc6+J1EtklJRrM7lcYxx3oOkfKmKK7hmos hjz9kmCSTXEXMp88NC6pBIzG51nE9HO3LldaKp8SyEsdoeTBaTipvcTo0NGqBbLCgj9t 8cxCb1PFpxuDVReITcv2xtBx9BiuoHjXUcimPctEi9SaIeZskak6fM/Zk8P58ObCsylW 2mEeG/FBtY03oSA0+c29fFfWsZD1g5z0hJI542R9Kxn5p/a5MQOS+CFHog22UL9GWhlM TtiwJ6AIV4n9TuFXvGhzuQJEGNfUCGmrY+D6RPFO+jYHfeUn8+lw6i2Z7wzJ83L6u/Zh hNiw== X-Gm-Message-State: APjAAAUQJZhtbr8S4IlAUOZTROLb3XleTwDVwQ3FGeVy2A71Xh+0+yHD 2BHgKaKCxwSV3ULKkqDwI91Utw== X-Received: by 2002:a17:902:56e:: with SMTP id 101mr10360710plf.142.1557462871562; Thu, 09 May 2019 21:34:31 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id s17sm4785317pfm.149.2019.05.09.21.34.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 May 2019 21:34:31 -0700 (PDT) From: Bjorn Andersson To: Andy Gross , David Brown Cc: Ohad Ben-Cohen , Rob Herring , Mark Rutland , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/8] arm64: dts: qcom: qcs404: Move lpass and q6 into soc Date: Thu, 9 May 2019 21:34:19 -0700 Message-Id: <20190510043421.31393-7-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190510043421.31393-1-bjorn.andersson@linaro.org> References: <20190510043421.31393-1-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 Although we don't describe lpass and wcss with all the details needed to control them in a Trustzone-less environment, move them under soc in order to tidy up the structure and prepare for describing them fully. Signed-off-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/qcs404.dtsi | 126 ++++++++++++++------------- 1 file changed, 64 insertions(+), 62 deletions(-) -- 2.18.0 diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi index 896f95817f23..b213f6acad76 100644 --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi @@ -82,68 +82,6 @@ method = "smc"; }; - remoteproc_adsp: remoteproc-adsp { - compatible = "qcom,qcs404-adsp-pas"; - - interrupts-extended = <&intc GIC_SPI 293 IRQ_TYPE_EDGE_RISING>, - <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, - <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>, - <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>, - <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "wdog", "fatal", "ready", - "handover", "stop-ack"; - - clocks = <&xo_board>; - clock-names = "xo"; - - memory-region = <&adsp_fw_mem>; - - qcom,smem-states = <&adsp_smp2p_out 0>; - qcom,smem-state-names = "stop"; - - status = "disabled"; - - glink-edge { - interrupts = ; - - qcom,remote-pid = <2>; - mboxes = <&apcs_glb 8>; - - label = "adsp"; - }; - }; - - remoteproc_wcss: remoteproc-wcss { - compatible = "qcom,qcs404-wcss-pas"; - - interrupts-extended = <&intc GIC_SPI 153 IRQ_TYPE_EDGE_RISING>, - <&wcss_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, - <&wcss_smp2p_in 1 IRQ_TYPE_EDGE_RISING>, - <&wcss_smp2p_in 2 IRQ_TYPE_EDGE_RISING>, - <&wcss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "wdog", "fatal", "ready", - "handover", "stop-ack"; - - clocks = <&xo_board>; - clock-names = "xo"; - - memory-region = <&wlan_fw_mem>; - - qcom,smem-states = <&wcss_smp2p_out 0>; - qcom,smem-state-names = "stop"; - - status = "disabled"; - - glink-edge { - interrupts = ; - - qcom,remote-pid = <1>; - mboxes = <&apcs_glb 16>; - - label = "wcss"; - }; - }; - reserved-memory { #address-cells = <2>; #size-cells = <2>; @@ -458,6 +396,38 @@ #interrupt-cells = <4>; }; + remoteproc_wcss: remoteproc@7400000 { + compatible = "qcom,qcs404-wcss-pas"; + reg = <0x07400000 0x4040>; + + interrupts-extended = <&intc GIC_SPI 153 IRQ_TYPE_EDGE_RISING>, + <&wcss_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&wcss_smp2p_in 1 IRQ_TYPE_EDGE_RISING>, + <&wcss_smp2p_in 2 IRQ_TYPE_EDGE_RISING>, + <&wcss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", "fatal", "ready", + "handover", "stop-ack"; + + clocks = <&xo_board>; + clock-names = "xo"; + + memory-region = <&wlan_fw_mem>; + + qcom,smem-states = <&wcss_smp2p_out 0>; + qcom,smem-state-names = "stop"; + + status = "disabled"; + + glink-edge { + interrupts = ; + + qcom,remote-pid = <1>; + mboxes = <&apcs_glb 16>; + + label = "wcss"; + }; + }; + sdcc1: sdcc@7804000 { compatible = "qcom,sdhci-msm-v5"; reg = <0x07804000 0x1000>, <0x7805000 0x1000>; @@ -843,6 +813,38 @@ status = "disabled"; }; }; + + remoteproc_adsp: remoteproc@c700000 { + compatible = "qcom,qcs404-adsp-pas"; + reg = <0x0c700000 0x4040>; + + interrupts-extended = <&intc GIC_SPI 293 IRQ_TYPE_EDGE_RISING>, + <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>, + <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>, + <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", "fatal", "ready", + "handover", "stop-ack"; + + clocks = <&xo_board>; + clock-names = "xo"; + + memory-region = <&adsp_fw_mem>; + + qcom,smem-states = <&adsp_smp2p_out 0>; + qcom,smem-state-names = "stop"; + + status = "disabled"; + + glink-edge { + interrupts = ; + + qcom,remote-pid = <2>; + mboxes = <&apcs_glb 8>; + + label = "adsp"; + }; + }; }; timer {