Unverified Commit 582ead4a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

drivers: bus & hwsplinlock updates for OMAP

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

:
  hwspinlock: omap: Handle devm_pm_runtime_enable() errors
  bus: omap-ocp2scp: enable compile testing
  bus: omap-ocp2scp: fix OF populate on driver rebind

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 35a53670 3bd4edd6

drivers/bus/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ config OMAP_INTERCONNECT 


config OMAP_OCP2SCP

	tristate "OMAP OCP2SCP DRIVER"

	depends on ARCH_OMAP2PLUS

	depends on ARCH_OMAP2PLUS || COMPILE_TEST

	help

	  Driver to enable ocp2scp module which transforms ocp interface

	  protocol to scp protocol. In OMAP4, USB PHY is connected via

drivers/bus/omap-ocp2scp.c

+2 −11
Original line number Diff line number Diff line
@@ -17,15 +17,6 @@ 
#define OCP2SCP_TIMING 0x18

#define SYNC2_MASK 0xf



static int ocp2scp_remove_devices(struct device *dev, void *c)

{

	struct platform_device *pdev = to_platform_device(dev);



	platform_device_unregister(pdev);



	return 0;

}



static int omap_ocp2scp_probe(struct platform_device *pdev)

{

	int ret;
@@ -79,7 +70,7 @@ static int omap_ocp2scp_probe(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);



err0:

	device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices);

	of_platform_depopulate(&pdev->dev);



	return ret;

}
@@ -87,7 +78,7 @@ static int omap_ocp2scp_probe(struct platform_device *pdev) 
static void omap_ocp2scp_remove(struct platform_device *pdev)

{

	pm_runtime_disable(&pdev->dev);

	device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices);

	of_platform_depopulate(&pdev->dev);

}



#ifdef CONFIG_OF

drivers/hwspinlock/omap_hwspinlock.c

+3 −1
Original line number Diff line number Diff line
@@ -88,7 +88,9 @@ static int omap_hwspinlock_probe(struct platform_device *pdev) 
	 * make sure the module is enabled and clocked before reading

	 * the module SYSSTATUS register

	 */

	devm_pm_runtime_enable(&pdev->dev);

	ret = devm_pm_runtime_enable(&pdev->dev);

	if (ret)

		return ret;

	ret = pm_runtime_resume_and_get(&pdev->dev);

	if (ret < 0)

		return ret;