From patchwork Fri Jun 10 04:11:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 69740 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp100572qgf; Thu, 9 Jun 2016 21:11:28 -0700 (PDT) X-Received: by 10.66.152.232 with SMTP id vb8mr16463457pab.41.1465531888585; Thu, 09 Jun 2016 21:11:28 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bx9si11138792pad.41.2016.06.09.21.11.28; Thu, 09 Jun 2016 21:11:28 -0700 (PDT) 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 S1751068AbcFJEL1 (ORCPT + 7 others); Fri, 10 Jun 2016 00:11:27 -0400 Received: from mail-pf0-f177.google.com ([209.85.192.177]:36747 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750873AbcFJEL0 (ORCPT ); Fri, 10 Jun 2016 00:11:26 -0400 Received: by mail-pf0-f177.google.com with SMTP id t190so19455857pfb.3 for ; Thu, 09 Jun 2016 21:11:25 -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; bh=xlcQOA0whfprCDU0rZ47syKAiIMYT3iO4OmADfviC3o=; b=MSt7vo2I4eEIhh2QwVnWYqJSTHRMTt6TUscvqEHCCAATGw9kPR+ZmSwWC1tVAdqQkg Xzh6n5MJO39vhOvDC4gzx4RGbx5iP4/oTlS4+gepe4+YMIJWyl2a7iUIywwsNfBet9/3 HaanegdBjXsdpZzKQL8Fmfgz0sV7xOPlTcnHE= 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=xlcQOA0whfprCDU0rZ47syKAiIMYT3iO4OmADfviC3o=; b=ZYDLiqTgtfV7hdZd52bZ8cAZcpbATGSdxifUNwrlMTqUmLjfjIRw3OPMo3Y9OpW6k+ qt9MMVd88/YW3m2Qb17ZLY9t1u7sJhTUQM5rBsJMqM150gkz//zAtcUsaVFudtPNYqR9 xPt1TrYy5DAO5/1u0eUAgAj6oe4iGzWJdDL9AhhT21DjVoQCtQNNWSFiz8Pa/ED3YdXb qciWUxAJW5g3NxN0xjBZljlH0szd/e1k4UgwLBj6bEsVTkP7t+HMN/zx2jG/KofnlsPJ k7n8ik1yj7P9IJnBkyouYtKbvLirgqt8tiPa47tfyiYjwufHagxQeoaveEvoPyGAR5XF 6PxQ== X-Gm-Message-State: ALyK8tKOCOcEcCR7cuB9DMGyy7KP58qeL1nzc1CtTC0l4wE5ghBEu+l6dlsDYQGXjH4MGqTn X-Received: by 10.98.13.81 with SMTP id v78mr4207721pfi.91.1465531885029; Thu, 09 Jun 2016 21:11:25 -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 ez6sm13532981pab.12.2016.06.09.21.11.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jun 2016 21:11:24 -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] soc: qcom: Update properties for smem state referencing Date: Thu, 9 Jun 2016 21:11:22 -0700 Message-Id: <1465531882-25967-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 Update the property names to match device tree bindings, the correct values should be qcom,smem-states and qcom,smem-state-names. Also update the #qcom,smem-state-cells for consistency, before we merge any users of these properties. Signed-off-by: Bjorn Andersson --- Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt | 4 ++-- Documentation/devicetree/bindings/soc/qcom/qcom,smsm.txt | 4 ++-- drivers/soc/qcom/smem_state.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) -- 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 Acked-by: Rob Herring diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt index 5cc82b8353d8..af9ca37221ce 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt @@ -68,7 +68,7 @@ important. Value type: Definition: must be 2 - denoting the bit in the entry and IRQ flags -- #qcom,state-cells: +- #qcom,smem-state-cells: Usage: required for outgoing entries Value type: Definition: must be 1 - denoting the bit in the entry @@ -92,7 +92,7 @@ wcnss-smp2p { wcnss_smp2p_out: master-kernel { qcom,entry-name = "master-kernel"; - #qcom,state-cells = <1>; + #qcom,smem-state-cells = <1>; }; wcnss_smp2p_in: slave-kernel { diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,smsm.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,smsm.txt index a6634c70850d..2993b5a97dd6 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,smsm.txt +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,smsm.txt @@ -51,7 +51,7 @@ important. Definition: specifies the offset, in words, of the first bit for this entry -- #qcom,state-cells: +- #qcom,smem-state-cells: Usage: required for local entry Value type: Definition: must be 1 - denotes bit number @@ -91,7 +91,7 @@ smsm { apps_smsm: apps@0 { reg = <0>; - #qcom,state-cells = <1>; + #qcom,smem-state-cells = <1>; }; wcnss_smsm: wcnss@7 { diff --git a/drivers/soc/qcom/smem_state.c b/drivers/soc/qcom/smem_state.c index 54261decb369..d5437ca76ed9 100644 --- a/drivers/soc/qcom/smem_state.c +++ b/drivers/soc/qcom/smem_state.c @@ -104,26 +104,26 @@ 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,state-cells", + "qcom,smem-states", + "#qcom,smem-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); } if (args.args_count != 1) { - dev_err(dev, "invalid #qcom,state-cells\n"); + dev_err(dev, "invalid #qcom,smem-state-cells\n"); return ERR_PTR(-EINVAL); }