diff options
| author | Rajendra Nayak <rnayak@ti.com> | 2014-08-28 03:38:23 +0200 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2014-08-28 03:38:23 +0200 |
| commit | f7f7a29bf0cf25af23f37e5b5bf1368b85705286 (patch) | |
| tree | 2eeefbe2507e35373e0e3f77b92a214e1743b5c6 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants (diff) | |
| download | linux-f7f7a29bf0cf25af23f37e5b5bf1368b85705286.tar.xz linux-f7f7a29bf0cf25af23f37e5b5bf1368b85705286.zip | |
ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists
To deal with IPs which are specific to dra74x and dra72x, maintain seperate
ocp interface lists, while keeping the common list for all common IPs.
Move USB OTG SS4 to dra74x only list since its unavailable in
dra72x and is giving an abort during boot. The dra72x only list
is empty for now and a placeholder for future hwmod additions which
are specific to dra72x.
Fixes: d904b38df0db13 ("ARM: DRA7: hwmod: Add SYSCONFIG for usb_otg_ss")
Reported-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Tested-by: Nishanth Menon <nm@ti.com>
[paul@pwsan.com: fixed comment style to conform with CodingStyle]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 6c074f37cdd2..bc2466cc33b9 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -3345,6 +3345,9 @@ int __init omap_hwmod_register_links(struct omap_hwmod_ocp_if **ois) if (!ois) return 0; + if (ois[0] == NULL) /* Empty list */ + return 0; + if (!linkspace) { if (_alloc_linkspace(ois)) { pr_err("omap_hwmod: could not allocate link space\n"); |