github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 07:03:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ARM: omap: soc updates for v6.20

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAmlybigACgkQWTcYmtP7
 xmWf/RAAhEAFiIw/5odWREs6Ws0WZ3Mti11tvhfV6JpsYFyNJsCZA+7Dl0Lf4VUv
 Qfu/l5tmFHccV2uFpEFC8Mp3w37U+LBmqeJmeX6FxLFbf4s4snmzow7G93ckVYdB
 WpM+VMHJlklq7dZtCJC5K5wMIt7F+ibfr1hJqfbPv18YDdOvWc5CY2eAzbIVPu84
 wTTl7vUNnXOT0AP/WDzgQpq4AU5SY/cqfZosQl9zKTuPlOiCnMvPncJSHa+Q270F
 vXloi/EHqz9vTDu/CMOBBKwEqxLTsiVIQQh3AinfzZM/UE8T+7xrZnnJ3xvRJ93c
 3fo7OiLRPP2f4TukXf0+h+O1hF0bVd0xFwf51E8+6pDK/vikNmpxgKL0B/H63xjd
 zD3jxoMgWZ5oeYwy5rl6Emee7Z0Ql+QR3UgIYcLn1jCwUusn3ngv/vkbtoRhApC9
 hQ+DNcqLHGkBNDMyTxFt/2RltoqN41Os832SzAzbCeeR9W/YawrlNqNtMaX4238V
 Jg37gRdZqVVPSweOUz7qlxyJTYuuPNzRjANEPXqd99TXT4qTkF46QxZGiaA9mBfS
 RJ4vyJaj0Kzh6wuVnHbA8+nmNE+j66v24AqjxaXw+fsJM1DdlTRYoEpo6HYcYcND
 MvlJYJUM9zIdFiVEQjr5PcFx/eyB/400HDKPIrd6fQA9nJ2ULlI=
 =wFOc
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAml7IzMACgkQmmx57+YA
 GNkPAhAAqkbuWAIhPr3quaXgEcFwyZDs/9N3Jv7S8BR9YFYAehi3QUhxACdaXYce
 /1CAiOyCvZWbb3QdyZt7ekXk8MBu/AlFFHCYBZG+Zl5SuKgC4EP9G6gtC1tUnE3+
 adsIWTG7ORKdKtelCpuu5LL6DEL6/DKHFmHE6mRT/t2XNN37/xPV4+WzGRZjG+rR
 QKJy9nML50xedPwVEWreKfkTqw/Kw1SjEdYV+61vly0iQwapZJOUh1XJkj3PEaNd
 HRJD9qOvGVlUTabditf/mGIGRdBR6Jvg0yaipWF9wvEr/jlOBK+js/l46UtrLZTa
 kLj8GMgOomtCbsZS2gjlDPN5httEJzDOoBpyYqRY1BmdBHndrO5JEFVO7vk8wwD5
 4dRrB7rY3DGpAO9GcF2cl5ZMf+HkDTHsoyh7rUXp9rxGDKzFih18ggCPRP94sDgs
 kXtIIolc4ATX3izIBsCNHOM97PMqKpjcTy6miRhmQihXmsblT7RYchMP4pl94CIA
 3MzDELzeAIS3V4ZAqgZVUA8lGOQyykKEwsqu2adfQM1sDuZAafV/JEt54HWXOTbQ
 xcNHjRoiBXeSVO6OGXmrRHWSSIL1OZSvKDvMohGtpjWdNRLgrtKDJGP2jf4Ycigm
 XaFMG43wXaeT0xt/264th58z3wLTtM8I1KA+a/GeiDmASl6H4/w=
 =5b3e
 -----END PGP SIGNATURE-----

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

ARM: omap: soc updates for v6.20

* tag 'omap-for-v6.20/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap:
  ARM: omap1: drop unused Kconfig symbol
  ARM: omap2: Fix reference count leaks in omap_control_init()

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2026-01-29 10:06:54 +01:00
commit 16868b35b9
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-omap1/Kconfig
View File

@ -4,7 +4,6 @@ menuconfig ARCH_OMAP1
depends on ARCH_MULTI_V4T || ARCH_MULTI_V5
depends on CPU_LITTLE_ENDIAN
depends on ATAGS
select ARCH_HAS_HOLES_MEMORYMODEL
select ARCH_OMAP
select CLKSRC_MMIO
select FORCE_PCI if PCCARD

14
arch/arm/mach-omap2/control.c
View File

@ -732,7 +732,7 @@ int __init omap2_control_base_init(void)
*/
int __init omap_control_init(void)
{
struct device_node *np, *scm_conf;
struct device_node *np, *scm_conf, *clocks_node;
const struct of_device_id *match;
const struct omap_prcm_init_data *data;
int ret;
@ -753,16 +753,19 @@ int __init omap_control_init(void)
if (IS_ERR(syscon)) {
ret = PTR_ERR(syscon);
goto of_node_put;
goto err_put_scm_conf;
}
if (of_get_child_by_name(scm_conf, "clocks")) {
clocks_node = of_get_child_by_name(scm_conf, "clocks");
if (clocks_node) {
of_node_put(clocks_node);
ret = omap2_clk_provider_init(scm_conf,
data->index,
syscon, NULL);
if (ret)
goto of_node_put;
goto err_put_scm_conf;
}
of_node_put(scm_conf);
} else {
/* No scm_conf found, direct access */
ret = omap2_clk_provider_init(np, data->index, NULL,
@ -780,6 +783,9 @@ int __init omap_control_init(void)
return 0;
err_put_scm_conf:
if (scm_conf)
of_node_put(scm_conf);
of_node_put:
of_node_put(np);
return ret;