At present dtoc has a very simplistic view of phandles. It assumes that
a property has only a single phandle with a single argument (i.e. two
cells per property).
This is not true in many cases. Enhance the implementation to scan all
phandles in a property and to use the correct number of arguments (which
can be 0, 1, 2 or more) when generating the C code. For the struct
definitions, use a struct which can hold the maximum number of arguments
used by the property.
Signed-off-by: Simon Glass
---
Changes in v2: None
include/dt-structs.h | 5 +
tools/dtoc/dtb_platdata.py | 21 ++---
tools/dtoc/dtoc_test_phandle.dts | 17 +++--
tools/dtoc/test_dtoc.py | 27 ---
4 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/include/dt-structs.h b/include/dt-structs.h
index 9ab4e2524d..76979e73e1 100644
--- a/include/dt-structs.h
+++ b/include/dt-structs.h
@@ -18,6 +18,11 @@ struct phandle_1_arg {
const void *node;
int arg[1];
};
+
+struct phandle_2_arg {
+ const void *node;
+ int arg[2];
+};
#include
#endif
diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py
index 1920a59f82..cfca45b0ac 100644
--- a/tools/dtoc/dtb_platdata.py
+++ b/tools/dtoc/dtb_platdata.py
@@ -394,11 +394,13 @@ class DtbPlatdata(object):
if not isinstance(prop.value, list):
prop.value = [prop.value]
# Process the list as pairs of (phandle, id)
-value_it = iter(prop.value)
-for phandle_cell, _ in zip(value_it, value_it):
+pos = 0
+for args in info.args:
+phandle_cell = prop.value[pos]
phandle = fdt_util.fdt32_to_cpu(phandle_cell)
target_node = self._fdt.phandle_to_node[phandle]
node.phandles.add(target_node)
+pos += 1 + args
def generate_structs(self, structs):
@@ -422,7 +424,7 @@ class DtbPlatdata(object):
struct_name = 'struct phandle_%d_arg' % info.max_args
self.out('\t%s%s[%d]' % (tab_to(2, struct_name),
conv_name_to_c(prop.name),
- len(prop.value) / 2))
+ len(info.args)))
else:
ptype = TYPE_NAMES[prop.type]
self.out('\t%s%s' % (tab_to(2, ptype),
@@ -461,13 +463,18 @@ class DtbPlatdata(object):
info = self.get_phandle_argc(prop, node.name)
if info:
# Process the list as pairs of (phandle, id)
-value_it = iter(prop.value)
-for phandle_cell, id_cell in zip(value_it, value_it):
+pos = 0
+for args in info.args:
+phandle_cell = prop.value[pos]
phandle = fdt_util.fdt32_to_cpu(phandle_cell)
-id_num = fdt_util.fdt32_to_cpu(id_cell)
target_node = self._fdt.phandle_to_node[phandle]
name = conv_name_to_c(target_node.name)
-vals.append('{&%s%s, {%d}}' % (VAL_PREFIX, name,
id_num))
+arg_values = []
+for i in range(args):
+
arg_values.append(str(fdt_util.fdt32_to_cpu(prop.value[pos + 1 + i])))
+pos += 1 + args
+vals.append('\t{&%s%s, {%s}}' % (VAL_PREFIX, name,
+ ', '.join(arg_values)))
for val in vals:
self.buf('\n\t\t%s,' % val)
else:
diff --git a/tools/dtoc/dtoc_test_phandle.dts b/tools/dtoc/dtoc_test_phandle.dts
index c0a602f296..ba12b0fe65 100644
--- a/tools/dtoc/dtoc_test_phandle.dts
+++ b/tools/dtoc/dtoc_test_phandle.dts
@@ -10,15 +10,28 @@
/ {
phandle: phandle-target {
+ u-boot,dm-pre-reloc;
+ compatible = "target";
+ intval = <0>;
+#clock-cells = <0>;
+ };
+
+ phandle_1: phandle2-target {
u-boot,dm-pre-reloc;
compatible = "target";
intval = <1>;
-#clock-cells = <1>;
+ #clock-cells = <1>;
+ };
+ phandle_2: phandle3-target {
+ u-boot,dm-pre-reloc;
+ compatible = "target";
+ intval = <2>;
+ #clock-cells = <2>;
};
phandle-source {
u-boot,dm-pre-reloc;
compatible = "source";
- clocks = <&phandle 1>;
+ clocks = <&phandle &phandle_1 11 &phandle_2 12 13 &phandle>;
};
};
diff --git a/tools
