iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SoC changes omaps for v5.20 merge window

Browse Source 
SoC changes omaps mostly for missing of_node_put() calls and cosmetic
 Kconfig changes. These can be all merged when suitable, there is no urgent
 need to merge this as fixes.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAmLCkd8RHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXO9AA/9FriN2g7xcDEZ3oLe9rsDZXHy1PBEL8FQ
 I3sUqKyR9bSO6B+okNOvmyrq70A9prJNctHBGGYM+bUfnZ2YdxiKDl1P7cGxV2FU
 u5UMrMoEZNwmplz8iqYi++LEVdQOp7Dox/7Ne6+20kjCLlMVuxJXu84PB7KmiXpa
 wOafsptss5PmJ1hAXX2n9Z8MxlOpJnHgS+ZMif5ifBqnFc5PXbPoz8ConA0lRIVE
 qFXsxya1rpW5+JWcxn2JysePqpGxqKFaYW3CPZ/a156rj5Lxm1emk8W++9K+eT2N
 /TtsAK2D8vXRSP5a5+yx7GZRwEepCQPPhJGwi6NJAM/LzMH0+qx+0gaiF2++1W1Z
 KKJUJiqS5U+WcxKUTZIOBpf0JS4aUjX+WakTAhe0WjqqlBqfKGAiwjm1LHpVh81x
 MgFDeE5txJ4cEdaPV0yX4PN2DzvvLA0aB4zlQhFpOz0phoNJLqXWxqLF4RnLvow3
 l1fSajIXZoIVUP+2peoEZbYtBV1bNd3Iy4M/qQxsZhQPIsSPEF3BSwR5mvTEAg5J
 FfMhCbx6O8X5t2mq7mY7iFVniNjkOFf/+EQeRKRJIzgMFhxv/hDM4xZ5DZtEqnT9
 uGWDW8aEFdHPvo6HlmHKEzr9Cy+AN4C88zdH9eC/xr1LMJqzNgIXClrj7/FHFMgC
 88DbzDmcR1s=
 =VRjB
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmLC778ACgkQmmx57+YA
 GNlXpxAAu4LSlppwNWmBrYOn6aTYwStN5G2dN+fkCTupLJLpwA+Qgb2mJEX2n4Os
 kpOay2S8e7TIp79SwPQOM9+NRq04JXcIxJMOm5eynjVh0e0IaS8rwg1X+VZgf8g6
 76YQCTV1UfmYWL4baQRQ76kLFFw3Ft23Xhv+tIZ43Wt+HTFFDSdv593f+VkqAIO2
 EwN5lCazitrDzCbOUlheDyfRyjqBBuQgvNbw6sFddtA6VHRsUMYpswNDeAavpufx
 oR5GULemRAZdv7VqtFks9xcVd6MTIe3KMD76uJCNYhCWTVF9bKc0SP+vBHdBk4lP
 JFv+nFNn2C75A2p8++osNAlgyfCjbeEMZZi8R+7wO5CK0IVWw6dXvhwFGWa5+eUo
 EQNIxdgjHxTu2Nh/FVkGdNzZhKP13/SQlaAr6xlRrzS+t8gezr2w1xsp67wJAQTi
 g9MKLHWKKjTI0pYvnbnNEpxPj8TTdkL8F08NKwGdqPUBBPPWAm/TBoZkOYVyGgds
 7Ap0RBOUPhvNFMNSX2VHNZYvgmMkzGy8mev3fEoYU9pVPEzZG7bKDNSGJ1ZjMeoL
 4mODlQgAQke02qniPDsnphLkVhVIYQLIh/hJqVv03SmUDQY925VYu6HgakO+YSLy
 dfXd6c0C38si03YT83QisddLjZNQ8RvJg5/s2Drf+s6+hUw0O7Q=
 =F3V1
 -----END PGP SIGNATURE-----

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

SoC changes omaps for v5.20 merge window

SoC changes omaps mostly for missing of_node_put() calls and cosmetic
Kconfig changes. These can be all merged when suitable, there is no urgent
need to merge this as fixes.

* tag 'omap-for-v5.20/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Kconfig: Fix indentation
  ARM: OMAP2+: Fix refcount leak in omap3xxx_prm_late_init
  ARM: OMAP2+: pdata-quirks: Fix refcount leak bug
  ARM: OMAP2+: display: Fix refcount leak bug
  ARM: OMAP2+: Fix refcount leak in omapdss_init_of

Link: https://lore.kernel.org/r/pull-1656918583-2801@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-07-04 15:48:45 +02:00
commit e0ed9e6725
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-omap2/Kconfig
View File

@ -122,7 +122,7 @@ config ARCH_OMAP2PLUS
config OMAP_INTERCONNECT_BARRIER
bool
select ARM_HEAVY_MB
config ARCH_OMAP
bool
@ -241,10 +241,10 @@ config MACH_OMAP2_TUSB6010
default y if MACH_NOKIA_N8X0
config MACH_NOKIA_N810
bool
bool
config MACH_NOKIA_N810_WIMAX
bool
bool
config MACH_NOKIA_N8X0
bool "Nokia N800/N810"

3
arch/arm/mach-omap2/display.c
View File

@ -211,6 +211,7 @@ static int __init omapdss_init_fbdev(void)
node = of_find_node_by_name(NULL, "omap4_padconf_global");
if (node)
omap4_dsi_mux_syscon = syscon_node_to_regmap(node);
of_node_put(node);
return 0;
}
@ -259,11 +260,13 @@ static int __init omapdss_init_of(void)
if (!pdev) {
pr_err("Unable to find DSS platform device\n");
of_node_put(node);
return -ENODEV;
}
r = of_platform_populate(node, NULL, NULL, &pdev->dev);
put_device(&pdev->dev);
of_node_put(node);
if (r) {
pr_err("Unable to populate DSS submodule devices\n");
return r;

2
arch/arm/mach-omap2/pdata-quirks.c
View File

@ -540,6 +540,8 @@ pdata_quirks_init_clocks(const struct of_device_id *omap_dt_match_table)
of_platform_populate(np, omap_dt_match_table,
omap_auxdata_lookup, NULL);
of_node_put(np);
}
}

1
arch/arm/mach-omap2/prm3xxx.c
View File

@ -708,6 +708,7 @@ static int omap3xxx_prm_late_init(void)
}
irq_num = of_irq_get(np, 0);
of_node_put(np);
if (irq_num == -EPROBE_DEFER)
return irq_num;