OMAP driver updates for v6.16

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAmgg0Q0ACgkQWTcYmtP7
 xmX2Wg/9Ert5DjDFUr/etujwU7QBkHJc6F8zxu29+0jEK2IVRLY9rselxFKA6naL
 STMnVTLfbpX+zpmvw8wZE4wgodQJrNeGGKMchpmEtaCgeHizipUK5GJymE1UnSzb
 RikfhvHox85U+wRajEAb2Z4UQzg7trzSPi6uicT92fOmYKPrAKZVnw+D3pPzA8bY
 CrapdWJVlIsQozxNmRsKFqmRrw1KSO6D6SnTmcSN03/oq46mrOe0sDcZx3vqR7f5
 /Qt6DR0Yv5UjdWgWdG2k3Uo7hd8gXH/BN6GrTVdnFSC8fkQTXFrtIfEWKyWTExb5
 Ac1ibgBHLnGwUzI724a96GXYHN7twHMqF1lCMBHGHYw5Z2GbkhCsM/8SOSKHoPq3
 p+MRAQV3NI1jBFsNEX5no55y3KTIrGKDKGT5iPpmyAtikZdj6vOQRX00ol7jBUm+
 XmSGwD39tX8J9hdIGq6Trn91wipsRNinqNp+hXSAsRgtYq9P6qR+TlgvqagFGQAI
 RYn8GEG8YsBXM7s2eDQSWsDnZ4O0a78OqOQh4vONGg7qHqAmhrmBL0EPN29kQR3h
 gaM/VJ2jCtjYzKjuI4H+UdZVt0HibmyGJ80eFoL85K0P+wFWUAlXD26xiXZAjZBB
 gfJL8t7riM1Tz+/RKwfIFa4JcFOFPMhf27YAARwNZDpBEgh8k0c=
 =sexH
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmghsB8ACgkQYKtH/8kJ
 UicK3RAAlOQEAyust+l2w6lbxU0c3suYeryFlIMuwXLLm7JmjeSRNBuW+3hYnK8l
 3KDEXEwIjtqzJ1wgcxy0Zvqit3ryZc0VslTA82KNFFgai3LGtDluO2vPAWewgF7k
 ++5lRcxTi6QmlxSOJ7G7uPqyEXDq/tKJ6+j1trvxrnHKNAoanDOYUnPlJZIm7F4W
 VGDschXrN+XuooqybmsbtI9Q2RBhJLBnKem0zvElfxFXCYfji8h4h18bppUah3St
 GQfrBHxyjTvH6MLWJl+ZrxVV78G52zPiXexVatTsZT6fYFYcIXfk5UIHeCFpXcuy
 XubJrF1Ylq753Km96EXOyrIg5Kk+gnEyZr1OFSUAPcRBxF1ERSu2/T7AzL8eTMAM
 KKdq0oN0t1UaILkgMSgBz2qxnDS05njpeA19x8OU8SFr9CaVQKnsfKCqDCQdZBCA
 ehFdCPyyYjiykyqaL0z62yJN3gCE8fa8A54hffD8zDpFGL4LV/lCV8CgICmn1zDg
 tz6LK8Dvh9PNKkUApW0Esxo34CxYQy8pKPu4RsQN+ZDBPRF7c2D9EgZ2jCO43OSB
 /M8m7g8OaoOVOuN8arzTy4jJrL9TkH95a4Kbi6mEZlMiUxrvBAeP8j9t7vVZptjw
 qfczdfzqJ2VT/WVWlp/QI6I1d3AEqnbrmVkR9qwUP3vYhRIWqn4=
 =IZ77
 -----END PGP SIGNATURE-----

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/7h5xi7rtix.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-05-12 10:23:48 +02:00
commit beccb7d158

View File

@ -677,51 +677,6 @@ static int sysc_parse_and_check_child_range(struct sysc *ddata)
return 0;
}
/* Interconnect instances to probe before l4_per instances */
static struct resource early_bus_ranges[] = {
/* am3/4 l4_wkup */
{ .start = 0x44c00000, .end = 0x44c00000 + 0x300000, },
/* omap4/5 and dra7 l4_cfg */
{ .start = 0x4a000000, .end = 0x4a000000 + 0x300000, },
/* omap4 l4_wkup */
{ .start = 0x4a300000, .end = 0x4a300000 + 0x30000, },
/* omap5 and dra7 l4_wkup without dra7 dcan segment */
{ .start = 0x4ae00000, .end = 0x4ae00000 + 0x30000, },
};
static atomic_t sysc_defer = ATOMIC_INIT(10);
/**
* sysc_defer_non_critical - defer non_critical interconnect probing
* @ddata: device driver data
*
* We want to probe l4_cfg and l4_wkup interconnect instances before any
* l4_per instances as l4_per instances depend on resources on l4_cfg and
* l4_wkup interconnects.
*/
static int sysc_defer_non_critical(struct sysc *ddata)
{
struct resource *res;
int i;
if (!atomic_read(&sysc_defer))
return 0;
for (i = 0; i < ARRAY_SIZE(early_bus_ranges); i++) {
res = &early_bus_ranges[i];
if (ddata->module_pa >= res->start &&
ddata->module_pa <= res->end) {
atomic_set(&sysc_defer, 0);
return 0;
}
}
atomic_dec_if_positive(&sysc_defer);
return -EPROBE_DEFER;
}
static struct device_node *stdout_path;
static void sysc_init_stdout_path(struct sysc *ddata)
@ -947,10 +902,6 @@ static int sysc_map_and_check_registers(struct sysc *ddata)
if (error)
return error;
error = sysc_defer_non_critical(ddata);
if (error)
return error;
sysc_check_children(ddata);
if (!of_property_present(np, "reg"))