dtoc: look for compatible string aliases in driver list
Currently dtoc checks if the first compatible string in a dtb node
matches either a driver o driver alias name, without taking into account
any other compatible string in the list. In the case that no driver matches
the first compatible string a warning is printed and the U_BOOT_DEVICE is
not being declared correctly.
This patch adds dtoc's support for try all the compatible strings in the
dtb node, in an effort to find the correct driver.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py
index 8fdf49f..07f5027 100644
--- a/tools/dtoc/dtb_platdata.py
+++ b/tools/dtoc/dtb_platdata.py
@@ -113,21 +113,17 @@
return '%#x' % value
def get_compat_name(node):
- """Get a node's first compatible string as a C identifier
+ """Get the node's list of compatible string as a C identifiers
Args:
node: Node object to check
Return:
- Tuple:
- C identifier for the first compatible string
- List of C identifiers for all the other compatible strings
- (possibly empty)
+ List of C identifiers for all the compatible strings
"""
compat = node.props['compatible'].value
- aliases = []
- if isinstance(compat, list):
- compat, aliases = compat[0], compat[1:]
- return conv_name_to_c(compat), [conv_name_to_c(a) for a in aliases]
+ if not isinstance(compat, list):
+ compat = [compat]
+ return [conv_name_to_c(c) for c in compat]
class DtbPlatdata(object):
@@ -174,7 +170,7 @@
def get_normalized_compat_name(self, node):
"""Get a node's normalized compat name
- Returns a valid driver name by retrieving node's first compatible
+ Returns a valid driver name by retrieving node's list of compatible
string as a C identifier and performing a check against _drivers
and a lookup in driver_aliases printing a warning in case of failure.
@@ -188,19 +184,24 @@
In case of no match found, the return will be the same as
get_compat_name()
"""
- compat_c, aliases_c = get_compat_name(node)
- if compat_c not in self._drivers:
- compat_c_old = compat_c
- compat_c = self._driver_aliases.get(compat_c)
- if not compat_c:
- if not self._warning_disabled:
- print('WARNING: the driver %s was not found in the driver list'
- % (compat_c_old))
- compat_c = compat_c_old
- else:
- aliases_c = [compat_c_old] + aliases_c
+ compat_list_c = get_compat_name(node)
+
+ for compat_c in compat_list_c:
+ if not compat_c in self._drivers:
+ compat_c = self._driver_aliases.get(compat_c)
+ if not compat_c:
+ continue
+
+ aliases_c = compat_list_c
+ if compat_c in aliases_c:
+ aliases_c.remove(compat_c)
+ return compat_c, aliases_c
+
+ if not self._warning_disabled:
+ print('WARNING: the driver %s was not found in the driver list'
+ % (compat_list_c[0]))
- return compat_c, aliases_c
+ return compat_list_c[0], compat_list_c[1:]
def setup_output(self, fname):
"""Set up the output destination