superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean-up for omaps for v6.3 

Non-urgent fixes for missing of_node_put() and clk_put(), drop few
 unnecessary includes, and fix a typo. None of these are urgent and
 can be merged along with other clean-up when suitable.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAmPP2k0RHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXP23BAAjDvc/xh+pdLSWrGLvbfLCtiXTX/VnUyy
 76MIwJshm5tUWYyOLHPh2GwnqnAP9mbmjmwRfbCqOOh7ZtTq/8GQl+IJyh7Z8HSt
 qsjwnDLBq9Hz2V41jUhSr3mlG7UVkETePbJ3s2+hQzry5zAic54+O1BgRXwTrlsj
 UXSCe155Q52FTUxfnScNFYRtJLVVjYTTkRnvkrG/sE7YoyPCnSHyQEyl9QGn7Kfi
 3tkXLLgwnhqap88Gym8QKY4UKXvdmM1cyuhc3dRZFbFc1WKnG8Yl5WT+L6DV9Zu4
 6tk4JsalFTFvbYe0MWwWYXH8EgLUlstIMgWqO7PuwVXZ49TOszpiFPmAf9/ilUi7
 J27uilUGhO7zYi9cyQWWDWmqdh7N5yJE5zbnSyq1GheTv0o+sChN3tuUp5v0JNgE
 nUBloNC/kPoQmc6XulVL05mC5nxXTRT7UnA9sN40llsS7C0BuU8eQCTo3Nn2+eiX
 qW/gJ6JKHcnRx6bPyjGc0ARiWJrn37fblFyk88i/TZrAbSUzNjs6cqpscat7lobH
 HlmbESK+yiG9YeIf/YWnWj5nPMYB8aKqh73nWavRpDfR1giz2nW0Rbwf4fwD6XSt
 f6EsH3gfNuwNFpZlZgGUGQIxOyfYxuX8G54D/B3t36ahdONd32QG9vpEN7GKIIgT
 c9cJUBYrLxo=
 =9VPI
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmPQQFEACgkQmmx57+YA
 GNmWDBAAnGa9WEmjkLMbqjt+vFe9OPvcw3g+wZs5jgdMsy7LyBD3tMABC4HZ+5zj
 AvJzisXw7BF2Bjk9ax/OB4cscumKbLTc+BPibtMyIA5DOkJFdIz7g8eos6paAErd
 H0++BMkWd2S2pteisRbpOjbQ5ZhBdC66F3dm1PB/ggLJBJgJQi0m7+c+F71dmhQR
 bKxj5oXWdDQOIi4/Utd6VfHbDyFse6urL+usvkL3qDxUSRzyvmRdrM/XQKNc1gG8
 cezRTCJbi4fXkifHoCYS9tFFnURKgyfZ7KjotU1BaGCfxIPulDsbhdcjoxTwZDMB
 bMb9/aw7IwBPMQVLj+2zhTYOalDlHNTnjPm3b35EcfVOE0O1kC5lvjIH9sMeUiL1
 hwkSKr49R7oDmSjfDB02MIidgJhIARSrutGBtD+7bxqPrxRnOymg1VcQ58sW09B1
 GsHrdgwOO0XHjS0OWVf8B5U3PFSAL2M47iMRXQ5+b2uDQ80Pu6qokpdklTRZ0wCB
 ycTaAP+ouaHbCR40+RaG3rTK8ad+IpDdJERMM0KNg0t/LGrUk2o8BJK014ySWHav
 n0dNnrvk54gtrHtugVG+qZmxVn6djx9FS1D/mj3AyuSUtLCaaEwc71Sl/jynVbUT
 IUYu8OvEPUsrf1QzeZQYcBCVBUa07fe7Ubwy8AIcf/GgSn9gZ8Q=
 =Ib7d
 -----END PGP SIGNATURE-----

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

Clean-up for omaps for v6.3

Non-urgent fixes for missing of_node_put() and clk_put(), drop few
unnecessary includes, and fix a typo. None of these are urgent and
can be merged along with other clean-up when suitable.

* tag 'omap-for-v6.3/cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix spelling typos in comment
  ARM: OMAP2+: Remove unneeded #include <linux/pinctrl/machine.h>
  ARM: OMAP2+: Remove unneeded #include <linux/pinctrl/pinmux.h>
  ARM: OMAP2+: Fix memory leak in realtime_counter_init()
  ARM: OMAP2+: omap4-common: Fix refcount leak bug

Link: https://lore.kernel.org/r/pull-1674566471-434733@atomide.com-2
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
pull/938/head
Arnd Bergmann 2023-01-24 21:32:15 +01:00
parent 721c46bfc5 5fc1f76a85
commit fc939b172e
5 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,6 @@
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/of.h>
#include <linux/pinctrl/machine.h>
#include <asm/mach-types.h>
#include <asm/mach/map.h>

1
arch/arm/mach-omap2/omap4-common.c
View File

@ -140,6 +140,7 @@ static int __init omap4_sram_init(void)
__func__);
else
sram_sync = (void __iomem *)gen_pool_alloc(sram_pool, PAGE_SIZE);
of_node_put(np);
return 0;
}

1
arch/arm/mach-omap2/pm33xx-core.c
View File

@ -16,7 +16,6 @@
#include <linux/clk.h>
#include <linux/cpu.h>
#include <linux/platform_data/gpio-omap.h>
#include <linux/pinctrl/pinmux.h>
#include <linux/wkup_m3_ipc.h>
#include <linux/of.h>
#include <linux/rtc.h>

2
arch/arm/mach-omap2/sleep34xx.S
View File

@ -465,7 +465,7 @@ l2_inv_gp:
mov r12, #0x2
smc #0 @ Call SMI monitor (smieq)
logic_l1_restore:
adr r0, l2dis_3630_offset @ adress for offset
adr r0, l2dis_3630_offset @ address for offset
ldr r1, [r0] @ value for offset
ldr r1, [r0, r1] @ value at l2dis_3630
cmp r1, #0x1 @ Test if L2 re-enable needed on 3630

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

@ -76,6 +76,7 @@ static void __init realtime_counter_init(void)
}
rate = clk_get_rate(sys_clk);
clk_put(sys_clk);
if (soc_is_dra7xx()) {
/*