Commit f47e8e14 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

SoC changes for omaps for v5.13

Minor non-urgent fixes for issues found by robots and few typo fixes:

- Use DEFINE_DEBUGFS_ATTRIBUTE

- Add missing of_node_put()

- Use true and false for bool variable

- Use DEFINE_SPINLOCK

- Fix incorrect kerneldoc usage

* tag 'omap-for-v5.13/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP1: fix incorrect kernel-doc comment syntax in file
  ARM: OMAP2+: fix incorrect kernel-doc comment syntax in file
  ARM: OMAP2+: Use DEFINE_SPINLOCK() for spinlock
  ARM: OMAP2+: use true and false for bool variable
  ARM: OMAP2+: add missing call to of_node_put()
  ARM: OMAP2+: Replace DEFINE_SIMPLE_ATTRIBUTE with DEFINE_DEBUGFS_ATTRIBUTE

Link: https://lore.kernel.org/r/pull-1617703816-65652@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d74b2557 206fa766

arch/arm/mach-omap1/timer.c

+1 −1
Original line number Diff line number Diff line 
/**

/*

 * OMAP1 Dual-Mode Timers - platform device registration

 *

 * Contains first level initialization routines which internally

arch/arm/mach-omap2/omap_hwmod.c

+1 −0
Original line number Diff line number Diff line
@@ -2137,6 +2137,7 @@ static int of_dev_hwmod_lookup(struct device_node *np, 
		if (res == 0) {

			*found = fc;

			*index = i;

			of_node_put(np0);

			return 0;

		}

	}

arch/arm/mach-omap2/omap_twl.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/**

/*

 * OMAP and TWL PMIC specific initializations.

 *

 * Copyright (C) 2010 Texas Instruments Incorporated.

arch/arm/mach-omap2/pm-debug.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int pwrdm_suspend_set(void *data, u64 val) 
	return -EINVAL;

}



DEFINE_SIMPLE_ATTRIBUTE(pwrdm_suspend_fops, pwrdm_suspend_get,

DEFINE_DEBUGFS_ATTRIBUTE(pwrdm_suspend_fops, pwrdm_suspend_get,

			  pwrdm_suspend_set, "%llu\n");



static int __init pwrdms_setup(struct powerdomain *pwrdm, void *dir)

arch/arm/mach-omap2/powerdomain.c

+6 −6
Original line number Diff line number Diff line
@@ -1202,26 +1202,26 @@ bool pwrdm_can_ever_lose_context(struct powerdomain *pwrdm) 
	if (!pwrdm) {

		pr_debug("powerdomain: %s: invalid powerdomain pointer\n",

			 __func__);

		return 1;

		return true;

	}



	if (pwrdm->pwrsts & PWRSTS_OFF)

		return 1;

		return true;



	if (pwrdm->pwrsts & PWRSTS_RET) {

		if (pwrdm->pwrsts_logic_ret & PWRSTS_OFF)

			return 1;

			return true;



		for (i = 0; i < pwrdm->banks; i++)

			if (pwrdm->pwrsts_mem_ret[i] & PWRSTS_OFF)

				return 1;

				return true;

	}



	for (i = 0; i < pwrdm->banks; i++)

		if (pwrdm->pwrsts_mem_on[i] & PWRSTS_OFF)

			return 1;

			return true;



	return 0;

	return false;

}



/**