diff options
| author | Mark Brown <broonie@kernel.org> | 2022-08-05 12:46:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-08-05 12:46:01 +0100 |
| commit | 6b5efbfc89e851ecba72cb3134cbdc52c7b868ec (patch) | |
| tree | 952be2170ad6c41e98e2deb0dd8f5986036de70f /arch | |
| parent | f458dab1ec036bfc0e8904c6482bc5e7a181ca65 (diff) | |
| parent | ad2fe4582c483bfd5609662b8e876066fa912697 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap1/Kconfig | 22 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/timer.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap4-common.c | 1 |
3 files changed, 13 insertions, 12 deletions
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index 538a960257cc..f833526aa7cd 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig @@ -134,8 +134,8 @@ config MACH_OMAP_INNOVATOR depends on ARCH_OMAP15XX || ARCH_OMAP16XX depends on UNUSED_BOARD_FILES help - TI OMAP 1510 or 1610 Innovator board support. Say Y here if you - have such a board. + TI OMAP 1510 or 1610 Innovator board support. Say Y here if you + have such a board. config MACH_OMAP_H2 bool "TI H2 Support" @@ -165,7 +165,7 @@ config MACH_OMAP_OSK depends on ARCH_OMAP16XX help TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here - if you have such a board. + if you have such a board. config OMAP_OSK_MISTRAL bool "Mistral QVGA board Support" @@ -206,10 +206,10 @@ config MACH_OMAP_PALMZ71 depends on ARCH_OMAP15XX depends on UNUSED_BOARD_FILES help - Support for the Palm Zire71 PDA. To boot the kernel, - you'll need a PalmOS compatible bootloader; check out - http://hackndev.com/palm/z71 for more information. - Say Y here if you have such a PDA, say N otherwise. + Support for the Palm Zire71 PDA. To boot the kernel, + you'll need a PalmOS compatible bootloader; check out + http://hackndev.com/palm/z71 for more information. + Say Y here if you have such a PDA, say N otherwise. config MACH_OMAP_PALMTT bool "Palm Tungsten|T" @@ -257,10 +257,10 @@ config MACH_OMAP_GENERIC depends on ARCH_OMAP15XX || ARCH_OMAP16XX depends on UNUSED_BOARD_FILES help - Support for generic OMAP-1510, 1610 or 1710 board with - no FPGA. Can be used as template for porting Linux to - custom OMAP boards. Say Y here if you have a custom - board. + Support for generic OMAP-1510, 1610 or 1710 board with + no FPGA. Can be used as template for porting Linux to + custom OMAP boards. Say Y here if you have a custom + board. endmenu diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c index f5cd4bbf7566..81a912c1145a 100644 --- a/arch/arm/mach-omap1/timer.c +++ b/arch/arm/mach-omap1/timer.c @@ -158,7 +158,7 @@ err_free_pdata: kfree(pdata); err_free_pdev: - platform_device_unregister(pdev); + platform_device_put(pdev); return ret; } diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index 6d1eb4eefefe..d9ed2a5dcd5e 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -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; } |