From patchwork Fri Nov 18 20:06:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 9437373 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 7F57D60238 for ; Fri, 18 Nov 2016 20:08:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E288298D4 for ; Fri, 18 Nov 2016 20:08:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60D8529A14; Fri, 18 Nov 2016 20:08:41 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 02895298D4 for ; Fri, 18 Nov 2016 20:08:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c7pRQ-00054h-Cf; Fri, 18 Nov 2016 20:07:20 +0000 Received: from mail-pg0-x233.google.com ([2607:f8b0:400e:c05::233]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c7pRK-00050G-78 for linux-arm-kernel@lists.infradead.org; Fri, 18 Nov 2016 20:07:15 +0000 Received: by mail-pg0-x233.google.com with SMTP id f188so105839852pgc.3 for ; Fri, 18 Nov 2016 12:06:52 -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=WsNOfsGQ0MffB0kQKTR8WzGXzTZDCnr0g5YlxBa8uS0=; b=h59ZZs1yaNkiI1IeR7cEDbptFMojdbYOYssyMEeleA8Nql6adMJb4S4mezgfnJqVE1 p4lGBgYLwIbrvq/v3yHNg1b8HrDy9gs+1WyuRP0D8m8PWX9UfCtcbfHpn2ps6c1kx66y Q1jLeGMW5EmRJLjur03p1Wx7dTuSa8nVh0Sn0= 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; bh=WsNOfsGQ0MffB0kQKTR8WzGXzTZDCnr0g5YlxBa8uS0=; b=aPpAL7LDSP5qLH+8BqPLqRMP4UhOjKNo5Kzlqq+eMH+peEvOZdTmoqzGG62pJH1OOD 1ovuoEh2VHFGeIOLQUxzJS6tQPeGumukMIGnKtallZ3m0GyCLDGORsbXNvlwSgzgQPwd FUqeX0odb7wizGu8pNPQ32Un4a8W6BFHiSEanFYNtFKQK0JUrlz4lh42zFO5gumc3wVm e2WXU71pjt1tLc9VJ3msYovDweFPNaD2BAKd2z++R3Osjal/meBME6XUtaqvEUMMv8bu 92BHQYs0jzzf2xdY5CTqsaLnmmuTQJFKCAcNpsUgwNONd+xK18LUzJhhGiKCQVaXWvwJ W7rw== X-Gm-Message-State: AKaTC02Qadn0qO9qGizG85UmBgtqeR1VBk89Lth3zeSt1V6aQ1Y49qJjau/skPHkiNLHA/mQ X-Received: by 10.99.128.198 with SMTP id j189mr2888593pgd.151.1479499612336; Fri, 18 Nov 2016 12:06:52 -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 t89sm19863151pfe.50.2016.11.18.12.06.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Nov 2016 12:06:51 -0800 (PST) From: Bjorn Andersson To: Andy Gross Subject: [PATCH] arm64: dts: qcom: msm8996: Fixup smp2p node Date: Fri, 18 Nov 2016 12:06:49 -0800 Message-Id: <1479499609-13336-1-git-send-email-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.5.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161118_120714_342324_8351C6DF X-CRM114-Status: GOOD ( 10.17 ) 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: linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.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 The SMEM state property name changes between the integration branch and mainline, update to use the correct one. Fixes: 2f45d9fcd531 ("arm64: dts: msm8996: Add SMP2P and APCS nodes") Signed-off-by: Bjorn Andersson Reviewed-by: Sarangdhar Joshi --- Seems we're still carrying this discrepancy somewhere and I missed it in my review, sorry about that. arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index cde4114bae5a..712d5d043105 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -530,7 +530,7 @@ adsp_smp2p_out: master-kernel { qcom,entry-name = "master-kernel"; - #qcom,state-cells = <1>; + #qcom,smem-state-cells = <1>; }; adsp_smp2p_in: slave-kernel {