From 74ebc4ab43b6968727bca9d95bd12cae5b4c1079 Mon Sep 17 00:00:00 2001
From: CMY <cmy@rock-chips.com>
Date: Fri, 28 Nov 2014 14:49:59 +0800
Subject: [PATCH] rk: ion: fix dts parse failure on arm64
---
drivers/staging/android/ion/rockchip/rockchip_ion.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/android/ion/rockchip/rockchip_ion.c b/drivers/staging/android/ion/rockchip/rockchip_ion.c
index 610fcf0b2ee7..db9c0d951da4 100755
--- a/drivers/staging/android/ion/rockchip/rockchip_ion.c
+++ b/drivers/staging/android/ion/rockchip/rockchip_ion.c
@@ -232,7 +232,7 @@ int __init rockchip_ion_find_heap(unsigned long node, const char *uname,
return 0;
prop = of_get_flat_dt_prop(node, "rockchip,ion_heap", &len);
- if (!prop || (len != sizeof(unsigned long)))
+ if (!prop || (len != sizeof(__be32)))
return 0;
heap = &pdata->heaps[pdata->nr++];
@@ -241,10 +241,10 @@ int __init rockchip_ion_find_heap(unsigned long node, const char *uname,
rockchip_ion_populate_heap(heap);
prop = of_get_flat_dt_prop(node, "reg", &len);
- if (prop && (len >= 2*sizeof(unsigned long))) {
+ if (prop && (len >= 2*sizeof(__be32))) {
heap->base = be32_to_cpu(prop[0]);
heap->size = be32_to_cpu(prop[1]);
- if (len==3*sizeof(unsigned long))
+ if (len==3*sizeof(__be32))
heap->align = be32_to_cpu(prop[2]);
}
--
2.34.1