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

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

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

Clean-up for omaps for v6.4

Some clean-up changes for omaps mostly to use of_property_read_bool() and
of_address_to_resource(). Also included is removal for an obsolete Kconfig
option, a typo fix, a return path change for am33xx_suspend_init(), and a
change to use kzalloc instead of kcalloc for a single element.

* tag 'omap-for-v6.4/cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: hwmod: Use kzalloc for allocating only one element
  ARM: OMAP2+: Remove the unneeded result variable
  ARM: OMAP2+: fix repeated words in comments
  ARM: OMAP2+: remove obsolete config OMAP3_SDRC_AC_TIMING
  ARM: OMAP2+: Use of_address_to_resource()
  ARM: OMAP2+: Use of_property_read_bool() for boolean properties

Link: https://lore.kernel.org/r/pull-1680180293-92168@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d6053666 19050da1

arch/arm/mach-omap2/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -255,17 +255,6 @@ config MACH_NOKIA_N8X0 
	select MACH_NOKIA_N810

	select MACH_NOKIA_N810_WIMAX



config OMAP3_SDRC_AC_TIMING

	bool "Enable SDRC AC timing register changes"

	depends on ARCH_OMAP3

	help

	  If you know that none of your system initiators will attempt to

	  access SDRAM during CORE DVFS, select Y here.  This should boost

	  SDRAM performance at lower CORE OPPs.  There are relatively few

	  users who will wish to say yes at this point - almost everyone will

	  wish to say no.  Selecting yes without understanding what is

	  going on could result in system crashes;



endmenu



endif

arch/arm/mach-omap2/cm33xx.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright (C) 2011-2012 Texas Instruments Incorporated - https://www.ti.com/

 * Vaibhav Hiremath <hvaibhav@ti.com>

 *

 * Reference taken from from OMAP4 cminst44xx.c

 * Reference taken from OMAP4 cminst44xx.c

 */



#include <linux/kernel.h>

arch/arm/mach-omap2/omap_hwmod.c

+10 −13
Original line number Diff line number Diff line
@@ -706,9 +706,7 @@ static const struct of_device_id ti_clkctrl_match_table[] __initconst = { 


static int __init _setup_clkctrl_provider(struct device_node *np)

{

	const __be32 *addrp;

	struct clkctrl_provider *provider;

	u64 size;

	int i;



	provider = memblock_alloc(sizeof(*provider), SMP_CACHE_BYTES);
@@ -717,8 +715,7 @@ static int __init _setup_clkctrl_provider(struct device_node *np) 


	provider->node = np;



	provider->num_addrs =

		of_property_count_elems_of_size(np, "reg", sizeof(u32)) / 2;

	provider->num_addrs = of_address_count(np);



	provider->addr =

		memblock_alloc(sizeof(void *) * provider->num_addrs,
@@ -733,11 +730,11 @@ static int __init _setup_clkctrl_provider(struct device_node *np) 
		return -ENOMEM;



	for (i = 0; i < provider->num_addrs; i++) {

		addrp = of_get_address(np, i, &size, NULL);

		provider->addr[i] = (u32)of_translate_address(np, addrp);

		provider->size[i] = size;

		pr_debug("%s: %pOF: %x...%x\n", __func__, np, provider->addr[i],

			 provider->addr[i] + provider->size[i]);

		struct resource res;

		of_address_to_resource(np, i, &res);

		provider->addr[i] = res.start;

		provider->size[i] = resource_size(&res);

		pr_debug("%s: %pOF: %pR\n", __func__, np, &res);

	}



	list_add(&provider->link, &clkctrl_providers);
@@ -2322,11 +2319,11 @@ static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data, 
static void __init parse_module_flags(struct omap_hwmod *oh,

				      struct device_node *np)

{

	if (of_find_property(np, "ti,no-reset-on-init", NULL))

	if (of_property_read_bool(np, "ti,no-reset-on-init"))

		oh->flags |= HWMOD_INIT_NO_RESET;

	if (of_find_property(np, "ti,no-idle-on-init", NULL))

	if (of_property_read_bool(np, "ti,no-idle-on-init"))

		oh->flags |= HWMOD_INIT_NO_IDLE;

	if (of_find_property(np, "ti,no-idle", NULL))

	if (of_property_read_bool(np, "ti,no-idle"))

		oh->flags |= HWMOD_NO_IDLE;

}
@@ -3457,7 +3454,7 @@ static int omap_hwmod_allocate_module(struct device *dev, struct omap_hwmod *oh, 
	}



	if (list_empty(&oh->slave_ports)) {

		oi = kcalloc(1, sizeof(*oi), GFP_KERNEL);

		oi = kzalloc(sizeof(*oi), GFP_KERNEL);

		if (!oi)

			goto out_free_class;

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

+1 −5
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ static int amx3_common_init(int (*idle)(u32 wfi_flags)) 


static int am33xx_suspend_init(int (*idle)(u32 wfi_flags))

{

	int ret;



	gfx_l4ls_clkdm = clkdm_lookup("gfx_l4ls_gfx_clkdm");



	if (!gfx_l4ls_clkdm) {
@@ -113,9 +111,7 @@ static int am33xx_suspend_init(int (*idle)(u32 wfi_flags)) 
		return -ENODEV;

	}



	ret = amx3_common_init(idle);



	return ret;

	return amx3_common_init(idle);

}



static int am43xx_suspend_init(int (*idle)(u32 wfi_flags))