From patchwork Fri Oct 26 04:20:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 12528 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 365D023E01 for ; Fri, 26 Oct 2012 04:21:09 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 9E6E9A182D2 for ; Fri, 26 Oct 2012 04:21:08 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so3149299iej.11 for ; Thu, 25 Oct 2012 21:21:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-originalarrivaltime:x-mc-unique :content-type:content-transfer-encoding:x-gm-message-state; bh=Pma6N46rWblFPCvI4PzdjI5+Q0a1cOVZ0hrYzLp0IPY=; b=feCrdNdVtgWuOhqIgV9YqNUcVAGd8qanKdmHHdC8xICTM4S8S9+snNhws75j/ZU1KP ZjhjEJ+Nx1uGLWu9AjFrsFGOtz7RawKJZVdSFANRVwEVIk7LcjuB+oUhnT39K85XWlvI KzRlZnS1WX9xfhf0sNp48Fxy/n9ZHGaI8m7GLGVYqVSGjTGJs+8lSGn9xKPkw9zXsJYQ zTf9I3d1NhKnvQx79hcWwhfKXA4+6VjcWilFT5kWdy+htD1490yeeVbiolhJ3SNeTjgA jqvSQFTs9i0AhYQEeA6R6ck5qTg+qfixbuoZc/6AuM+FSTxt9yvGEHvP6M24RZz3CTxy eH9Q== Received: by 10.50.100.137 with SMTP id ey9mr803988igb.57.1351225268017; Thu, 25 Oct 2012 21:21:08 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp179942igt; Thu, 25 Oct 2012 21:21:07 -0700 (PDT) Received: by 10.180.107.195 with SMTP id he3mr2193813wib.15.1351225266675; Thu, 25 Oct 2012 21:21:06 -0700 (PDT) Received: from service87.mimecast.com (service87.mimecast.com. [91.220.42.44]) by mx.google.com with ESMTP id o3si441543wej.39.2012.10.25.21.21.06; Thu, 25 Oct 2012 21:21:06 -0700 (PDT) Received-SPF: pass (google.com: domain of viresh.kumar2@arm.com designates 91.220.42.44 as permitted sender) client-ip=91.220.42.44; Authentication-Results: mx.google.com; spf=pass (google.com: domain of viresh.kumar2@arm.com designates 91.220.42.44 as permitted sender) smtp.mail=viresh.kumar2@arm.com Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Fri, 26 Oct 2012 05:21:05 +0100 Received: from localhost ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.0); Fri, 26 Oct 2012 05:21:03 +0100 From: Viresh Kumar To: rob.herring@calxeda.com, grant.likely@secretlab.ca Cc: spear-devel@list.st.com, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, andriy.shevchenko@intel.com, linaro-dev@lists.linaro.org, patches@linaro.org, Viresh Kumar Subject: [PATCH Resend V2] dt: add helper function to read u8 & u16 variables & arrays Date: Fri, 26 Oct 2012 09:50:56 +0530 Message-Id: <64c5278ebdec503f83e9b7002bf13affb7f3260f.1351225085.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e X-OriginalArrivalTime: 26 Oct 2012 04:21:03.0887 (UTC) FILETIME=[4FE639F0:01CDB331] X-MC-Unique: 112102605210500601 X-Gm-Message-State: ALoCoQk0B58utsKHGoy3SoOiDr7Vh4K+UOpn8ogcAQRmCnjFQdMGs6AtVj3fet7zHJ1T8wa1Cva8 This adds following helper routines: - of_property_read_u8_array() - of_property_read_u16_array() - of_property_read_u8() - of_property_read_u16() First two actually share most of the code with of_property_read_u32_array(), so the common part is taken out into a macro, which can be used by all three *_array() routines. Signed-off-by: Viresh Kumar --- V1->V2: ----- - Use typeof() in of_property_read_array() macro instead of passing type to it drivers/of/base.c | 73 +++++++++++++++++++++++++++++++++++++++++++----------- include/linux/of.h | 30 ++++++++++++++++++++++ 2 files changed, 89 insertions(+), 14 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index af3b22a..039e178 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -670,6 +670,64 @@ struct device_node *of_find_node_by_phandle(phandle handle) } EXPORT_SYMBOL(of_find_node_by_phandle); +#define of_property_read_array(_np, _pname, _out, _sz) \ + struct property *_prop = of_find_property(_np, _pname, NULL); \ + const __be32 *_val; \ + \ + if (!_prop) \ + return -EINVAL; \ + if (!_prop->value) \ + return -ENODATA; \ + if ((_sz * sizeof(*_out)) > _prop->length) \ + return -EOVERFLOW; \ + \ + _val = _prop->value; \ + while (_sz--) \ + *_out++ = (typeof(*_out))be32_to_cpup(_val++); \ + return 0; + +/** + * of_property_read_u8_array - Find and read an array of u8 from a property. + * + * @np: device node from which the property value is to be read. + * @propname: name of the property to be searched. + * @out_value: pointer to return value, modified only if return value is 0. + * + * Search for a property in a device node and read 8-bit value(s) from + * it. Returns 0 on success, -EINVAL if the property does not exist, + * -ENODATA if property does not have a value, and -EOVERFLOW if the + * property data isn't large enough. + * + * The out_value is modified only if a valid u8 value can be decoded. + */ +int of_property_read_u8_array(const struct device_node *np, + const char *propname, u8 *out_values, size_t sz) +{ + of_property_read_array(np, propname, out_values, sz); +} +EXPORT_SYMBOL_GPL(of_property_read_u8_array); + +/** + * of_property_read_u16_array - Find and read an array of u16 from a property. + * + * @np: device node from which the property value is to be read. + * @propname: name of the property to be searched. + * @out_value: pointer to return value, modified only if return value is 0. + * + * Search for a property in a device node and read 16-bit value(s) from + * it. Returns 0 on success, -EINVAL if the property does not exist, + * -ENODATA if property does not have a value, and -EOVERFLOW if the + * property data isn't large enough. + * + * The out_value is modified only if a valid u16 value can be decoded. + */ +int of_property_read_u16_array(const struct device_node *np, + const char *propname, u16 *out_values, size_t sz) +{ + of_property_read_array(np, propname, out_values, sz); +} +EXPORT_SYMBOL_GPL(of_property_read_u16_array); + /** * of_property_read_u32_array - Find and read an array of 32 bit integers * from a property. @@ -689,20 +747,7 @@ int of_property_read_u32_array(const struct device_node *np, const char *propname, u32 *out_values, size_t sz) { - struct property *prop = of_find_property(np, propname, NULL); - const __be32 *val; - - if (!prop) - return -EINVAL; - if (!prop->value) - return -ENODATA; - if ((sz * sizeof(*out_values)) > prop->length) - return -EOVERFLOW; - - val = prop->value; - while (sz--) - *out_values++ = be32_to_cpup(val++); - return 0; + of_property_read_array(np, propname, out_values, sz); } EXPORT_SYMBOL_GPL(of_property_read_u32_array); diff --git a/include/linux/of.h b/include/linux/of.h index 72843b7..e2d9b40 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -223,6 +223,10 @@ extern struct device_node *of_find_node_with_property( extern struct property *of_find_property(const struct device_node *np, const char *name, int *lenp); +extern int of_property_read_u8_array(const struct device_node *np, + const char *propname, u8 *out_values, size_t sz); +extern int of_property_read_u16_array(const struct device_node *np, + const char *propname, u16 *out_values, size_t sz); extern int of_property_read_u32_array(const struct device_node *np, const char *propname, u32 *out_values, @@ -357,6 +361,18 @@ static inline struct device_node *of_find_compatible_node( return NULL; } +static inline int of_property_read_u8_array(const struct device_node *np, + const char *propname, u8 *out_values, size_t sz) +{ + return -ENOSYS; +} + +static inline int of_property_read_u16_array(const struct device_node *np, + const char *propname, u16 *out_values, size_t sz) +{ + return -ENOSYS; +} + static inline int of_property_read_u32_array(const struct device_node *np, const char *propname, u32 *out_values, size_t sz) @@ -463,6 +479,20 @@ static inline bool of_property_read_bool(const struct device_node *np, return prop ? true : false; } +static inline int of_property_read_u8(const struct device_node *np, + const char *propname, + u8 *out_value) +{ + return of_property_read_u8_array(np, propname, out_value, 1); +} + +static inline int of_property_read_u16(const struct device_node *np, + const char *propname, + u16 *out_value) +{ + return of_property_read_u16_array(np, propname, out_value, 1); +} + static inline int of_property_read_u32(const struct device_node *np, const char *propname, u32 *out_value)