arm: ti: Get the hwmods property either from the node or the parent
r350229 changed the code to lookup the ti,hwmods property in the parent as it's now like that in the DTS from >= Linux 5.0, allow the property to be also in the node itself so we can boot with an older DTB. Reported by: "Dr. Rolf Jansen" <rj@obsigna.com>
This commit is contained in:
parent
0ee779dc75
commit
9c02e2074c
@ -97,6 +97,16 @@ struct hwmod ti_hwmods[] = {
|
||||
{NULL, 0}
|
||||
};
|
||||
|
||||
static inline int
|
||||
ti_get_hwmods_prop(phandle_t node, void **name)
|
||||
{
|
||||
int len;
|
||||
|
||||
if ((len = OF_getprop_alloc(node, "ti,hwmods", name)) > 0)
|
||||
return (len);
|
||||
return (OF_getprop_alloc(OF_parent(node), "ti,hwmods", name));
|
||||
}
|
||||
|
||||
clk_ident_t
|
||||
ti_hwmods_get_clock(device_t dev)
|
||||
{
|
||||
@ -110,7 +120,7 @@ ti_hwmods_get_clock(device_t dev)
|
||||
if ((node = ofw_bus_get_node(dev)) == 0)
|
||||
return (INVALID_CLK_IDENT);
|
||||
|
||||
if ((len = OF_getprop_alloc(OF_parent(node), "ti,hwmods", (void**)&name)) <= 0)
|
||||
if ((len = ti_get_hwmods_prop(node, (void **)&name)) <= 0)
|
||||
return (INVALID_CLK_IDENT);
|
||||
|
||||
buf = name;
|
||||
@ -148,7 +158,7 @@ int ti_hwmods_contains(device_t dev, const char *hwmod)
|
||||
if ((node = ofw_bus_get_node(dev)) == 0)
|
||||
return (0);
|
||||
|
||||
if ((len = OF_getprop_alloc(OF_parent(node), "ti,hwmods", (void**)&name)) <= 0)
|
||||
if ((len = ti_get_hwmods_prop(node, (void **)&name)) <= 0)
|
||||
return (0);
|
||||
|
||||
buf = name;
|
||||
@ -182,7 +192,7 @@ ti_hwmods_get_unit(device_t dev, const char *hwmod)
|
||||
if ((node = ofw_bus_get_node(dev)) == 0)
|
||||
return (0);
|
||||
|
||||
if ((len = OF_getprop_alloc(OF_parent(node), "ti,hwmods", (void**)&name)) <= 0)
|
||||
if ((len = ti_get_hwmods_prop(node, (void **)&name)) <= 0)
|
||||
return (0);
|
||||
|
||||
buf = name;
|
||||
|
Loading…
x
Reference in New Issue
Block a user