From patchwork Fri Apr 20 01:26:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 10351781 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DE60F60365 for ; Fri, 20 Apr 2018 01:27:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCFD22853A for ; Fri, 20 Apr 2018 01:27:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0D5E28569; Fri, 20 Apr 2018 01:27:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F3AD2853A for ; Fri, 20 Apr 2018 01:27:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753916AbeDTB1D (ORCPT ); Thu, 19 Apr 2018 21:27:03 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:40030 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753769AbeDTB1B (ORCPT ); Thu, 19 Apr 2018 21:27:01 -0400 Received: by mail-pf0-f196.google.com with SMTP id y66so3485819pfi.7 for ; Thu, 19 Apr 2018 18:27:01 -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; bh=lUwV1zUSG1PowOZxk1Y6gQxBFF31Bh+Qe4Ak8V91NIs=; b=Fi8roUzZQ7sPxS4xZT9ijnix9fN7mxsZYWil69rW36RLWD0InjRfOMd8eNZMggwSEQ sN14eSg0M2NcI8ji80raAFKe9QwO9F/591VJ/38zf8qj66zhVf/awD8ggpwmGfNfXB8T /PpjtUgWTltEX4pun1OJDOv6WyvE3qP6km1N0= 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; bh=lUwV1zUSG1PowOZxk1Y6gQxBFF31Bh+Qe4Ak8V91NIs=; b=LxnW5WAh7PHzxoYM6eny2LV5TnTcY5Idn/seMCQaJYBF7atgDWFIStcXK90lx7AiB5 h8c15IT4ADZx4PbxZmzPWkVQDj90gXJLxmYdSSa1ypXwJsGaZMTO0AwNaZ1XEtoA3jGn T8ZJEabNf6SMEK2ukIv9NAxbH2gLjZ780xI9bY+sk/0bnP1hpb5MHmHMVfOg3CW2B3mo VKKPc/B4ct0ZHKDdsQRURhsK4kJ3wvLLhkfvQqS1u0G1G4YRx0fvicm84XbxFwIorGqj xh+Sji28VIJev954q52HI5IkaR1sZLfUVtNSll3qiPOTLe+87vkz/QOIbfSSWJ4Rmz7o mELA== X-Gm-Message-State: ALQs6tAo5gHYeAakscssNdiY/PC5+aeqNYLtkJzI3hxsRXt/ULxh09GK CodbtVEEgu6SF4e7w4Gl+o0YNw== X-Google-Smtp-Source: AIpwx49efzYhREDdk4D1ZHYfmVaccILJayP/YA7UEiLIlAnp5MJl1I2jkJfxqACMhM8byBdDItXDnQ== X-Received: by 10.99.163.77 with SMTP id v13mr2480604pgn.224.1524187621021; Thu, 19 Apr 2018 18:27:01 -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 g72sm10034902pfg.60.2018.04.19.18.26.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 18:27:00 -0700 (PDT) From: Bjorn Andersson To: Andy Gross , David Brown Cc: 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, Nicolas Dechesne Subject: [PATCH] arm64: dts: msm8996: Add modem remoteproc Date: Thu, 19 Apr 2018 18:26:57 -0700 Message-Id: <20180420012657.29895-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.16.2 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the modem remoteproc node and the child smd-edge in order to be able to boot the modem Hexagon found in MSM8996 based devices. Also extend the tcsr mutex node size, to cover the registers at the end of the block, used for halting the modem subsystem. Signed-off-by: Bjorn Andersson --- This patch depends on the recent patch adding a few additional clocks to gcc-msm8996. arch/arm64/boot/dts/qcom/msm8996.dtsi | 64 +++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 4010e2f1a177..70009b15ffd1 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -620,7 +620,6 @@ pm8994_l31: l31 {}; pm8994_l32: l32 {}; }; - }; }; @@ -637,7 +636,7 @@ tcsr_mutex_regs: syscon@740000 { compatible = "syscon"; - reg = <0x740000 0x20000>; + reg = <0x740000 0x40000>; }; tcsr: syscon@7a0000 { @@ -1850,6 +1849,67 @@ power-domains = <&mmcc VENUS_CORE1_GDSC>; }; }; + + remoteproc@2080000 { + compatible = "qcom,msm8996-mss-pil"; + + reg = <0x2080000 0x100>, + <0x2180000 0x040>; + reg-names = "qdsp6", "rmb"; + + interrupts-extended = <&intc 0 448 IRQ_TYPE_EDGE_RISING>, + <&modem_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&modem_smp2p_in 1 IRQ_TYPE_EDGE_RISING>, + <&modem_smp2p_in 2 IRQ_TYPE_EDGE_RISING>, + <&modem_smp2p_in 3 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", "fatal", "ready", + "handover", "stop-ack"; + + clocks = <&xo_board>, + <&gcc GCC_MSS_CFG_AHB_CLK>, + <&rpmcc RPM_SMD_PCNOC_CLK>, + <&gcc GCC_MSS_Q6_BIMC_AXI_CLK>, + <&gcc GCC_BOOT_ROM_AHB_CLK>, + <&gcc GCC_MSS_GPLL0_DIV_CLK>, + <&gcc GCC_MSS_SNOC_AXI_CLK>, + <&gcc GCC_MSS_MNOC_BIMC_AXI_CLK>, + <&rpmcc RPM_SMD_QDSS_CLK>; + + clock-names = "xo", "iface", "pnoc", "bus", + "mem", "gpll0_mss_clk", "snoc_axi_clk", + "mnoc_axi_clk", "qdss"; + + mx-supply = <&pm8994_s2>; + cx-supply = <&pm8994_s1>; + pll-supply = <&pm8994_l12>; + + resets = <&gcc GCC_MSS_RESTART>; + reset-names = "mss_restart"; + + qcom,halt-regs = <&tcsr_mutex_regs 0x23000 0x25000 0x24000>; + + qcom,smem-states = <&modem_smp2p_out 0>; + qcom,smem-state-names = "stop"; + + status = "disabled"; + + mba { + memory-region = <&mba_region>; + }; + + mpss { + memory-region = <&mpss_region>; + }; + + smd-edge { + interrupts = <0 449 IRQ_TYPE_EDGE_RISING>; + + label = "modem"; + mboxes = <&apcs_glb 12>; + qcom,smd-edge = <0>; + qcom,remote-pid = <1>; + }; + }; }; sound: sound {