Skip to content

Commit beccb7d

Browse files
committed
Merge tag 'omap-for-v6.16/drivers-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/drivers
OMAP driver updates for v6.16 * tag 'omap-for-v6.16/drivers-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap: Revert "bus: ti-sysc: Probe for l4_wkup and l4_cfg interconnect devices first" Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 9477c3e + 3630585 commit beccb7d

File tree

1 file changed

+0
-49
lines changed

1 file changed

+0
-49
lines changed

drivers/bus/ti-sysc.c

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -677,51 +677,6 @@ static int sysc_parse_and_check_child_range(struct sysc *ddata)
677677
return 0;
678678
}
679679

680-
/* Interconnect instances to probe before l4_per instances */
681-
static struct resource early_bus_ranges[] = {
682-
/* am3/4 l4_wkup */
683-
{ .start = 0x44c00000, .end = 0x44c00000 + 0x300000, },
684-
/* omap4/5 and dra7 l4_cfg */
685-
{ .start = 0x4a000000, .end = 0x4a000000 + 0x300000, },
686-
/* omap4 l4_wkup */
687-
{ .start = 0x4a300000, .end = 0x4a300000 + 0x30000, },
688-
/* omap5 and dra7 l4_wkup without dra7 dcan segment */
689-
{ .start = 0x4ae00000, .end = 0x4ae00000 + 0x30000, },
690-
};
691-
692-
static atomic_t sysc_defer = ATOMIC_INIT(10);
693-
694-
/**
695-
* sysc_defer_non_critical - defer non_critical interconnect probing
696-
* @ddata: device driver data
697-
*
698-
* We want to probe l4_cfg and l4_wkup interconnect instances before any
699-
* l4_per instances as l4_per instances depend on resources on l4_cfg and
700-
* l4_wkup interconnects.
701-
*/
702-
static int sysc_defer_non_critical(struct sysc *ddata)
703-
{
704-
struct resource *res;
705-
int i;
706-
707-
if (!atomic_read(&sysc_defer))
708-
return 0;
709-
710-
for (i = 0; i < ARRAY_SIZE(early_bus_ranges); i++) {
711-
res = &early_bus_ranges[i];
712-
if (ddata->module_pa >= res->start &&
713-
ddata->module_pa <= res->end) {
714-
atomic_set(&sysc_defer, 0);
715-
716-
return 0;
717-
}
718-
}
719-
720-
atomic_dec_if_positive(&sysc_defer);
721-
722-
return -EPROBE_DEFER;
723-
}
724-
725680
static struct device_node *stdout_path;
726681

727682
static void sysc_init_stdout_path(struct sysc *ddata)
@@ -947,10 +902,6 @@ static int sysc_map_and_check_registers(struct sysc *ddata)
947902
if (error)
948903
return error;
949904

950-
error = sysc_defer_non_critical(ddata);
951-
if (error)
952-
return error;
953-
954905
sysc_check_children(ddata);
955906

956907
if (!of_property_present(np, "reg"))

0 commit comments

Comments
 (0)