Unverified Commit 16868b35 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v6.20/soc-signed' of... 

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

ARM: omap: soc updates for v6.20

* tag 'omap-for-v6.20/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap

:
  ARM: omap1: drop unused Kconfig symbol
  ARM: omap2: Fix reference count leaks in omap_control_init()

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 02943244 dc717e24

arch/arm/mach-omap1/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ menuconfig ARCH_OMAP1 
	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5

	depends on CPU_LITTLE_ENDIAN

	depends on ATAGS

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_OMAP

	select CLKSRC_MMIO

	select FORCE_PCI if PCCARD

arch/arm/mach-omap2/control.c

+10 −4
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ int __init omap2_control_base_init(void) 
 */

int __init omap_control_init(void)

{

	struct device_node *np, *scm_conf;

	struct device_node *np, *scm_conf, *clocks_node;

	const struct of_device_id *match;

	const struct omap_prcm_init_data *data;

	int ret;
@@ -753,16 +753,19 @@ int __init omap_control_init(void) 


			if (IS_ERR(syscon)) {

				ret = PTR_ERR(syscon);

				goto of_node_put;

				goto err_put_scm_conf;

			}



			if (of_get_child_by_name(scm_conf, "clocks")) {

			clocks_node = of_get_child_by_name(scm_conf, "clocks");

			if (clocks_node) {

				of_node_put(clocks_node);

				ret = omap2_clk_provider_init(scm_conf,

							      data->index,

							      syscon, NULL);

				if (ret)

					goto of_node_put;

					goto err_put_scm_conf;

			}

			of_node_put(scm_conf);

		} else {

			/* No scm_conf found, direct access */

			ret = omap2_clk_provider_init(np, data->index, NULL,
@@ -780,6 +783,9 @@ int __init omap_control_init(void) 


	return 0;



err_put_scm_conf:

	if (scm_conf)

		of_node_put(scm_conf);

of_node_put:

	of_node_put(np);

	return ret;