From patchwork Mon Jan 30 16:44:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 9546247 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 ED41860453 for ; Tue, 31 Jan 2017 00:44:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C36BA28408 for ; Tue, 31 Jan 2017 00:44:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A4F512840A; Tue, 31 Jan 2017 00:44:16 +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=-0.2 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIM_SIGNED,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2DC3228408 for ; Tue, 31 Jan 2017 00:44:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cYMYQ-0005dv-Tv; Tue, 31 Jan 2017 00:44:14 +0000 Received: from mail-pf0-x229.google.com ([2607:f8b0:400e:c00::229]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cYMYN-0005d4-6b for linux-arm-kernel@lists.infradead.org; Tue, 31 Jan 2017 00:44:12 +0000 Received: by mail-pf0-x229.google.com with SMTP id y143so96000531pfb.0 for ; Mon, 30 Jan 2017 16:43:50 -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; bh=wDFpYYUpKm86QDuoRDXTPyddK0HlqJAh/eXy1RqHmDI=; b=BtEJDW4OPWZfgCrWAR9KDYni8U90ftL9r7R3ezCxOoFwGbGkq5M8jeIwjDzc7dUsIg DMwUIKvPsiH1Wn4VzcUWWGmE9B8g+KHNG6VGSMhnsHYh8xjXXv6MxHIl6yDXa41+zo+W azH4pm3XrfAytjaeu3EokSDyNdISJ405wSFeU= 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=wDFpYYUpKm86QDuoRDXTPyddK0HlqJAh/eXy1RqHmDI=; b=FsDkyoehWNqTnMU8Tr33w8N5Hnx9pWap0HZmKI1OjL3KUVfywuICKjKr4laHsjC09u uFxpkUhmMZRPxJ/PClZkudQ3Gkf6rcqoounArXSBwUfpE+NI/dKXhjp7Rn8iqhC9gORK KgTs8Yw6Lry9vMidNsnxz/vJbZLRfoXiJDHwphOgfEnW9E5NtGncRYOcbO1MAUyBHMtE kmz1tJxIveE/DyoQmZB2v6HHqGtmPXB7oRv1h+RrdD/0ARq9z0uuh1x0Ii3wa1MXnESl MpquuIDOuzqxqpa1cvdo4Bb+xQ75YDggcH3UX7ftiwU3DPS18bS7sU4fXjlKkoxnUAiF MMQQ== X-Gm-Message-State: AIkVDXJlDxA32QZvtYNo6hLTZGLL1/eJ+UCPJwvKYWujYqTdEfVXmRP8eOR4KhZ3OCWMOZTq X-Received: by 10.98.117.10 with SMTP id q10mr26011963pfc.31.1485823429570; Mon, 30 Jan 2017 16:43:49 -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 q19sm35459687pfl.21.2017.01.30.16.43.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jan 2017 16:43:48 -0800 (PST) From: Bjorn Andersson To: Andy Gross , David Brown Subject: [PATCH] arm64: dts: qcom: msm8916: Update hexagon node Date: Mon, 30 Jan 2017 08:44:59 -0800 Message-Id: <20170130164459.4051-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170130_164411_408590_26417053 X-CRM114-Status: GOOD ( 10.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-kernel@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-Virus-Scanned: ClamAV using ClamSMTP It's necessary to reference the xo clock and cx supply, so specify these in the node. Also move the Hexagon smd-edge into the hexagon node, to enable SSR. As cxo is not yet available we reference the fixed version of cxo for now, which will work until proper power management is implemented. Signed-off-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/msm8916.dtsi | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 68a8e67cba29..35684cc1f308 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -833,8 +833,9 @@ clocks = <&gcc GCC_MSS_CFG_AHB_CLK>, <&gcc GCC_MSS_Q6_BIMC_AXI_CLK>, - <&gcc GCC_BOOT_ROM_AHB_CLK>; - clock-names = "iface", "bus", "mem"; + <&gcc GCC_BOOT_ROM_AHB_CLK>, + <&xo_board>; + clock-names = "iface", "bus", "mem", "xo"; qcom,smem-states = <&hexagon_smp2p_out 0>; qcom,smem-state-names = "stop"; @@ -842,6 +843,7 @@ resets = <&scm 0>; reset-names = "mss_restart"; + cx-supply = <&pm8916_s1>; mx-supply = <&pm8916_l3>; pll-supply = <&pm8916_l7>; @@ -856,6 +858,16 @@ mpss { memory-region = <&mpss_mem>; }; + + smd-edge { + interrupts = <0 25 IRQ_TYPE_EDGE_RISING>; + + qcom,smd-edge = <0>; + qcom,ipc = <&apcs 8 12>; + qcom,remote-pid = <1>; + + label = "hexagon"; + }; }; pronto: wcnss@a21b000 { @@ -1214,14 +1226,6 @@ }; }; }; - - hexagon { - interrupts = <0 25 IRQ_TYPE_EDGE_RISING>; - - qcom,smd-edge = <0>; - qcom,ipc = <&apcs 8 12>; - qcom,remote-pid = <1>; - }; }; hexagon-smp2p {