From patchwork Fri Jun 10 05:26:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 69741 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp120377qgf; Thu, 9 Jun 2016 22:26:30 -0700 (PDT) X-Received: by 10.98.102.205 with SMTP id s74mr238597pfj.54.1465536390863; Thu, 09 Jun 2016 22:26:30 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 5si1260275pft.184.2016.06.09.22.26.30; Thu, 09 Jun 2016 22:26:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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 linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-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 S1751884AbcFJF03 (ORCPT + 8 others); Fri, 10 Jun 2016 01:26:29 -0400 Received: from mail-pf0-f179.google.com ([209.85.192.179]:36367 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751158AbcFJF02 (ORCPT ); Fri, 10 Jun 2016 01:26:28 -0400 Received: by mail-pf0-f179.google.com with SMTP id t190so20081114pfb.3 for ; Thu, 09 Jun 2016 22:26:28 -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:in-reply-to; bh=zboZxj11UIUQ7y/5UQ9GXDjIn2PGwmzitbTtcNJ8rwc=; b=XyrW981jTPsOK71zwmtw81NPg7kXb6TN0UrH3lRbyE/NoYoBH3Alm5DARLWNtTCYB3 tRJoiLOR5gdjqqeqv/detoSmTD+6ZPKwI9PDVVj+ZBJveRM3WEis7rQ2J8VVWAOXWAGe lCwjpEb+5At7ngNyZFToGTyeg1fvmy86e2AwQ= 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:in-reply-to; bh=zboZxj11UIUQ7y/5UQ9GXDjIn2PGwmzitbTtcNJ8rwc=; b=lvTRwegWU4ZYIVRhuscsL5GMQ7OBusBzu2iZHHGMGiXwVnKNEWtBUNy8hzvolF7FOp mgjUZd2buDBFGVznHSoySkCUm1mInoAlfV6CgUuLHeu4wUmrm5wuLvdrj32mGhBPAotl bA1Y/2Yjzury+ENBst4Rv/r09VKKkhxUDBlEWGyUEfR1TKJEHtWxPcmdPiqqGk7jDwKv SLRp5qUuOgvc/bQp0cDXPzrZXXCUSg0I79fIjVYVBer3gAeqighwxefuRW1cbOiLD2O9 vL9EChQSTLqB4v/OVdmZibolm5xUsDirMieGumNIM7Nf6neZ5I7AqvkVUo1syVLxsxcP JrSg== X-Gm-Message-State: ALyK8tLr2yCRVOqZVDWwt83EohUPEE2xnMS+I+0PIiEQItMbJ/TBUkbkJg4XBMiURMy+yUs+ X-Received: by 10.98.83.6 with SMTP id h6mr257726pfb.6.1465536387884; Thu, 09 Jun 2016 22:26:27 -0700 (PDT) Received: from localhost.localdomain (ip68-111-223-48.sd.sd.cox.net. [68.111.223.48]) by smtp.gmail.com with ESMTPSA id fj13sm14105108pab.0.2016.06.09.22.26.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jun 2016 22:26:27 -0700 (PDT) From: Bjorn Andersson To: Rob Herring , Andy Gross Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org Subject: [PATCH v2] soc: qcom: Update properties for smem state referencing Date: Thu, 9 Jun 2016 22:26:25 -0700 Message-Id: <1465536385-32215-1-git-send-email-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1465531882-25967-1-git-send-email-bjorn.andersson@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Update the property names to match device tree bindings, the correct values should be qcom,smem-states and qcom,smem-state-names. Signed-off-by: Bjorn Andersson --- Realised that we already define the smp2p and smsm nodes in mainline, so don't change the #qcom,state-cells property. drivers/soc/qcom/smem_state.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" 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/drivers/soc/qcom/smem_state.c b/drivers/soc/qcom/smem_state.c index 54261decb369..4e4d5cd3b3cc 100644 --- a/drivers/soc/qcom/smem_state.c +++ b/drivers/soc/qcom/smem_state.c @@ -104,21 +104,21 @@ struct qcom_smem_state *qcom_smem_state_get(struct device *dev, if (con_id) { index = of_property_match_string(dev->of_node, - "qcom,state-names", + "qcom,smem-state-names", con_id); if (index < 0) { - dev_err(dev, "missing qcom,state-names\n"); + dev_err(dev, "missing qcom,smem-state-names\n"); return ERR_PTR(index); } } ret = of_parse_phandle_with_args(dev->of_node, - "qcom,state", + "qcom,smem-states", "#qcom,state-cells", index, &args); if (ret) { - dev_err(dev, "failed to parse qcom,state property\n"); + dev_err(dev, "failed to parse qcom,smem-states property\n"); return ERR_PTR(ret); }