Commit ed887804 authored Jan 29, 2021 by Arnd Bergmann

Merge tag 'omap-for-v5.12/soc-signed' of...

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

SoC changes for omaps for v5.12 merge window

Update email address for Roger and fix a typo

* tag 'omap-for-v5.12/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: fix spellint typo
  MAINTAINERS: Update address for OMAP GPMC driver

Link: https://lore.kernel.org/r/pull-1611845066-809577@atomide.com


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents e53686bb 320f6f90

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -12892,7 +12892,7 @@ S: Orphan
		F: drivers/video/fbdev/omap/

		OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
		M: Roger Quadros <rogerq@ti.com>
		M: Roger Quadros <rogerq@kernel.org>
		M: Tony Lindgren <tony@atomide.com>
		L: linux-omap@vger.kernel.org
		S: Maintained

arch/arm/mach-omap2/clockdomain.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1299,7 +1299,7 @@ int clkdm_hwmod_disable(struct clockdomain clkdm, struct omap_hwmod oh)
		* Due to a suspend or hibernation operation, the state of the registers
		* controlling this clkdm will be lost, save their context.
		*/
		static int _clkdm_save_context(struct clockdomain clkdm, void ununsed)
		static int _clkdm_save_context(struct clockdomain clkdm, void unused)
		{
		if (!arch_clkdm \|\| !arch_clkdm->clkdm_save_context)
		return -EINVAL;
		@@ -1312,7 +1312,7 @@ static int _clkdm_save_context(struct clockdomain clkdm, void ununsed)
		*
		* Restore the register values for this clockdomain.
		*/
		static int _clkdm_restore_context(struct clockdomain clkdm, void ununsed)
		static int _clkdm_restore_context(struct clockdomain clkdm, void unused)
		{
		if (!arch_clkdm \|\| !arch_clkdm->clkdm_restore_context)
		return -EINVAL;