of: merge of_read_number() an of_read_ulong()

[firefly-linux-kernel-4.4.55.git] / include / linux / of.h

diff --git a/include/linux/of.h b/include/linux/of.h
index d5f666290f6b40363a07306e5d60f793ff1a88d9..18e4379b8b7f6b59e9b35564e1ce972a6094083d 100644 (file)
--- 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 */