Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753824AbcKRUG4 (ORCPT ); Fri, 18 Nov 2016 15:06:56 -0500 Received: from mail-pg0-f48.google.com ([74.125.83.48]:33211 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752744AbcKRUGx (ORCPT ); Fri, 18 Nov 2016 15:06:53 -0500 From: Bjorn Andersson To: Andy Gross 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 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 875 Lines: 28 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 --- 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 { -- 2.5.0