archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 04:04:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ti-sysc: allow OMAP2 and OMAP4 timers to be reserved on AM33xx

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAmkbWfwACgkQWTcYmtP7
 xmXeBA//R1xu3LaZv+iqu+9Nz4RIlyvsVjXgak3mkoRTYNFBHATPdVDbU6HB4MFU
 9tjYxZkrTt8qDH0enVc4pSY3BraiVNebGktJrdt2FtCoKMDDFtXIembuQFqf0wEK
 0d7HO2wwssMgVq+ZG0Sp/P9Fj/Fj0Gqqm6cUbELATno2au9vV5E4Uj1tyPPH3hI3
 54yX/Srvm0SGlPUGAO+8TbLxsPcTVGvsXlzGugKatrhSc/rPkBxJh4YybVLUBCaK
 pqdaGJ+6BDPs73UCelABDgtAB/4b5Y4NwnzFJkgPuHnk+MyMlbOosFbJhZ3E4zKj
 lUubdbkYwxbmGvL3pLyKnf9FFyiAju8uHiYzX7jKg05MNNZtGkYxkbPVQpwNm/FD
 cCQnlhVPeR8E6StMjtVzP7u8WZUhmt5vdVy2OXlMenQuUuasVzHRby182QQx2DqA
 f/ElKBqZmCyg0O6meEp12Y9Z/2Sq/3dmjcx/ITymhwHZphkAZ64D6fcDt6xRuWfX
 Of++3/YlLZ6p8xu0zwYco4WoRTJFzw4tMAa9mhXuQ47BVnZIvJD0GcK9OLlRCcpF
 f8BWQv//nE6OsC8H7ErpxPvVG77O7Kf9faS+t/AYR47fhn0MZN1XOoDryAQMhT7E
 WgF434iE9LxsVSWRgkmSSZg15WgpG6xVk/JxF1QCs18tlHzKEj0=
 =H8j5
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmklqCUACgkQmmx57+YA
 GNke3BAAjAbuEMn5aeNvazpTaz2vXMxfRfoaYtwFeOi5Oy8O5vv+OEPNzsWI0gg0
 c142JdowL1XIPBNtuJr41oJKbxGMB4bhN8JuTAT8CcKSbnQl5UD1RuGpSoOBExfC
 468bbBhLjtu4g8lCrvn3CzTWIlnzrGQxBk2VG6oCm1PIvZoeEm5Dv9VueoYtGHzE
 BMJ02lxHK/LJOAtCV6JDer3QjvIlLyqOGSde4jrOmhpPqmgMFA4NLS2424+nI78P
 LMcrmGka8QNkE5QhttqaNAzNq7DU+7+L4f7xBVuo27h74xZ9Ar2zOxgVyRz+9dsj
 SzvObe7GotaYuM0m1dOoqpD1UFIBPJben+m9eNGvt59v1QHl42NnDoz4e+EwLNgG
 bZaNvYYI+RQq29M4UPQdwU5MWZJfrrRXMC0Z4fbo389gG5hO9U4tF9SsEJQgFwRV
 /ZkD1Ce6E1hwjtcGOfr8B83sjC8AABVdk/M68WKhD7Me/gympIsBhMFOsFJxw4sP
 IZC9wI66KHUKSWUk8Rd4gpfY0+IMuf35ArL4spbowwHldoHsRQm5m0UPMxOY8wwm
 YKuq/8msQn267f4q6FXKmS5H1YbD2pWufNgSJ7meNFAVENdfi0HozN8ut5L/+HxY
 qm3ibpOXKm6wGIr+InftjybPoJDSA8wMFLmrjNYnwngipAdG3OY=
 =aDTD
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v6.19/drivers-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/drivers

ti-sysc: allow OMAP2 and OMAP4 timers to be reserved on AM33xx

* tag 'omap-for-v6.19/drivers-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap:
  ti-sysc: allow OMAP2 and OMAP4 timers to be reserved on AM33xx

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-11-25 13:59:03 +01:00
commit a677d87689
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/bus/ti-sysc.c
View file

@ -48,6 +48,7 @@ enum sysc_soc {
SOC_UNKNOWN,
SOC_2420,
SOC_2430,
SOC_AM33,
SOC_3430,
SOC_AM35,
SOC_3630,
@ -2912,6 +2913,7 @@ static void ti_sysc_idle(struct work_struct *work)
static const struct soc_device_attribute sysc_soc_match[] = {
SOC_FLAG("OMAP242*", SOC_2420),
SOC_FLAG("OMAP243*", SOC_2430),
SOC_FLAG("AM33*", SOC_AM33),
SOC_FLAG("AM35*", SOC_AM35),
SOC_FLAG("OMAP3[45]*", SOC_3430),
SOC_FLAG("OMAP3[67]*", SOC_3630),
@ -3117,10 +3119,15 @@ static int sysc_check_active_timer(struct sysc *ddata)
* can be dropped if we stop supporting old beagleboard revisions
* A to B4 at some point.
*/
if (sysc_soc->soc == SOC_3430 || sysc_soc->soc == SOC_AM35)
switch (sysc_soc->soc) {
case SOC_AM33:
case SOC_3430:
case SOC_AM35:
error = -ENXIO;
else
break;
default:
error = -EBUSY;
}
if ((ddata->cfg.quirks & SYSC_QUIRK_NO_RESET_ON_INIT) &&
(ddata->cfg.quirks & SYSC_QUIRK_NO_IDLE))