Unverified Commit fc939b17 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v6.3/cleanup-signed' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 721c46bf 5fc1f76a

arch/arm/mach-omap2/devices.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-omap2/omap4-common.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

}

arch/arm/mach-omap2/pm33xx-core.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-omap2/sleep34xx.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-omap2/timer.c

+1 −0
Original line number Diff line number Diff line
@@ -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()) {

		/*