From 60cd8fc3404bbc36ef265e0c10a4be8b1b8bed85 Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Wed, 14 Sep 2011 20:49:59 +0100
Subject: [PATCH] --- yaml --- r: 269371 b: refs/heads/master c:
 4cd7f7a31178ff8a15ad2bc1258b9b2bf2cf51a4 h: refs/heads/master i:   269369:
 b9f286166f0da07b04b9218a664e63279c53802a   269367:
 c3fe97d25fb634b408444752e6b4862d7fa72333 v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/of/base.c  | 29 +++++++++++++++++++++++++++++
 trunk/include/linux/of.h |  8 ++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e5b81f183bc7..dc79250dcbe1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85888069cf5d0f21312e3ee730458a5e3a553509
+refs/heads/master: 4cd7f7a31178ff8a15ad2bc1258b9b2bf2cf51a4
diff --git a/trunk/drivers/of/base.c b/trunk/drivers/of/base.c
index 8abde58cbe82..b970562e0111 100644
--- a/trunk/drivers/of/base.c
+++ b/trunk/drivers/of/base.c
@@ -656,6 +656,35 @@ int of_property_read_u32_array(const struct device_node *np,
 }
 EXPORT_SYMBOL_GPL(of_property_read_u32_array);
 
+/**
+ * of_property_read_u64 - Find and read a 64 bit integer 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 a 64-bit value 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 u64 value can be decoded.
+ */
+int of_property_read_u64(const struct device_node *np, const char *propname,
+			 u64 *out_value)
+{
+	struct property *prop = of_find_property(np, propname, NULL);
+
+	if (!prop)
+		return -EINVAL;
+	if (!prop->value)
+		return -ENODATA;
+	if (sizeof(*out_value) > prop->length)
+		return -EOVERFLOW;
+	*out_value = of_read_number(prop->value, 2);
+	return 0;
+}
+EXPORT_SYMBOL_GPL(of_property_read_u64);
+
 /**
  * of_property_read_string - Find and read a string from a property
  * @np:		device node from which the property value is to be read.
diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h
index 53107b09cbdf..1cc9930ba06a 100644
--- a/trunk/include/linux/of.h
+++ b/trunk/include/linux/of.h
@@ -200,6 +200,8 @@ extern int of_property_read_u32_array(const struct device_node *np,
 				      const char *propname,
 				      u32 *out_values,
 				      size_t sz);
+extern int of_property_read_u64(const struct device_node *np,
+				const char *propname, u64 *out_value);
 
 extern int of_property_read_string(struct device_node *np,
 				   const char *propname,
@@ -281,6 +283,12 @@ static inline const void *of_get_property(const struct device_node *node,
 	return NULL;
 }
 
+static inline int of_property_read_u64(const struct device_node *np,
+				       const char *propname, u64 *out_value)
+{
+	return -ENOSYS;
+}
+
 #define of_match_ptr(_ptr)	NULL
 #endif /* CONFIG_OF */