korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 22:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

SoC changes for omaps for v5.12 merge window

Browse Source 
Update email address for Roger and fix a typo
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAmAScJIRHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXNHRw//W+0WzIbx/1dEGwUfjZvZm7vJ0SiCCKsf
 gEzwmUFlKY7yQohnZ2Qp2Fy7aOOOa7MqGpv/pg5aa4FNoCO2ajAGy7K7gCo5kiFq
 KGmn6v8NNdILra0LaUjfogiSmbgnYZossK1lyi4nNKn5Ed0jT+a79SUAqTiKTaLi
 x39YOSllWIRVVki4rfoPHP/CnZQpWk4J9UOV69Bdd5mlPNPhzbPYs0VW1+6Q4W2m
 rViiLRF3amxkAwmnOdXdxK/6u3s+9pe/8sD3X4HZI6bUE+VSmUUGIBGZhTyp3j41
 zwS/tgG9GqAhQ9dvh9VBQC6ZrVOb4nHd6NKINr6osX4BEDnjt83Cpu4crCgD9ECh
 ox8lZwnCLt5VtokARcAgwrVX2vbPiPHF4BY8zVR2qBazj0489nb2sU9FwKM1hLx5
 HJ8O0+9dNMd0qthBz0JktLOFBodGUMVsY6XNue6yAWT8/6g0rJA5eOIqcE6a5/JM
 4ttwmVCQ009Rv33drkPPf2IdYHLxRsckHOwt1wqthZCGNgtzl/YhkjbLtaEmo93L
 AXpeZghJXjXALijWskpVE412ogZ5ueM7P7LEC3Tl2aIYvDowM527i8RZFT7jtS4y
 r7GFr4EQWy1+jcBt6EBWPJwWmy1xwYF2WDoRsVS8SVbYapk/SBAbFe/PjIFTImHo
 BX+NAsSNE9E=
 =QsAV
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2021-01-29 16:33:06 +01:00
commit ed8878041a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -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

4
arch/arm/mach-omap2/clockdomain.c
View File

@ -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;