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: 83026 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp277655qge; Fri, 18 Nov 2016 12:06:55 -0800 (PST) X-Received: by 10.37.209.84 with SMTP id i81mr854360ybg.52.1479499615202; Fri, 18 Nov 2016 12:06:55 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s62si2031113ybi.194.2016.11.18.12.06.55; Fri, 18 Nov 2016 12:06:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752441AbcKRUGy (ORCPT + 7 others); Fri, 18 Nov 2016 15:06:54 -0500 Received: from mail-pg0-f49.google.com ([74.125.83.49]:35154 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752550AbcKRUGx (ORCPT ); Fri, 18 Nov 2016 15:06:53 -0500 Received: by mail-pg0-f49.google.com with SMTP id p66so106132470pga.2 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=csETeX8FCV8qvmAq8vbkGPhV39YI990uKQAl/H5P0AF8LF3uEjIkZoefPR01iyWbbC aEvvNzMkjj4aBA0u8LCrJN15U7MKPspKSNIOF0xeTYFynuxIAb0wYt0PrVwBuhd9txfM ovcZ6YBfeAjD1FebBfQOzs7g6bdW2zJM8+fv/7gehruY3O0AHou0LSZoehicviM5XDet cU/BCMuPX7Ar8UBqchdXxf/vMhIatDVXFVE1ukU6L5LF4lmzTiNg2SwAu7G2fdu/FL1F K5jGTzX3tO+VXgqocOlCLsnwSqE73/VivmS28+wR3ECMaqN5s7+pLLxxdHoUuX0CqOb0 261g== X-Gm-Message-State: AKaTC00BNvWCjQThb7ptO7MKeTNfQ3o59WhxiRnHqnP8fU09oVJlteX2R3U5iSoofLo6EzdB 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 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: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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(-) -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 {