summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2009-10-15 10:58:00 -0600
committerGrant Likely <grant.likely@secretlab.ca>2009-10-15 10:58:00 -0600
commitb6caf2ad7ce30648b89c1cf40d8f7cf6f4b58033 (patch)
tree014b9f2c763711a52c21540ea49845d0ab497e01 /include/linux
parent50436312f47f1fd2bf82c983638fe27ca7e03238 (diff)
downloadop-kernel-dev-b6caf2ad7ce30648b89c1cf40d8f7cf6f4b58033.zip
op-kernel-dev-b6caf2ad7ce30648b89c1cf40d8f7cf6f4b58033.tar.gz
of: merge of_read_number() an of_read_ulong()
Merge common code between Microblaze and PowerPC Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Michal Simek <monstr@monstr.eu> Acked-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/of.h23
1 files changed, 23 insertions, 0 deletions
diff --git a/include/linux/of.h b/include/linux/of.h
index d5f6662..18e4379 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -79,6 +79,29 @@ set_node_proc_entry(struct device_node *dn, struct proc_dir_entry *de)
dn->pde = de;
}
+/*
+ * OF address retreival & translation
+ */
+
+/* Helper to read a big number; size is in cells (not bytes) */
+static inline u64 of_read_number(const u32 *cell, int size)
+{
+ u64 r = 0;
+ while (size--)
+ r = (r << 32) | *(cell++);
+ return r;
+}
+
+/* Like of_read_number, but we want an unsigned long result */
+#ifdef CONFIG_PPC32
+static inline unsigned long of_read_ulong(const u32 *cell, int size)
+{
+ return cell[size-1];
+}
+#else
+#define of_read_ulong(cell, size) of_read_number(cell, size)
+#endif
+
#include <asm/prom.h>
/* flag descriptions */
OpenPOWER on IntegriCloud