Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Arnd Bergmann <arnd@arndb.de>
+6
-13
+1
-1
drivers/bus/Kconfig
+1
-1
drivers/bus/Kconfig
···
141
141
142
142
config OMAP_OCP2SCP
143
143
tristate "OMAP OCP2SCP DRIVER"
144
-
depends on ARCH_OMAP2PLUS
144
+
depends on ARCH_OMAP2PLUS || COMPILE_TEST
145
145
help
146
146
Driver to enable ocp2scp module which transforms ocp interface
147
147
protocol to scp protocol. In OMAP4, USB PHY is connected via
+2
-11
drivers/bus/omap-ocp2scp.c
+2
-11
drivers/bus/omap-ocp2scp.c
···
17
17
#define OCP2SCP_TIMING 0x18
18
18
#define SYNC2_MASK 0xf
19
19
20
-
static int ocp2scp_remove_devices(struct device *dev, void *c)
21
-
{
22
-
struct platform_device *pdev = to_platform_device(dev);
23
-
24
-
platform_device_unregister(pdev);
25
-
26
-
return 0;
27
-
}
28
-
29
20
static int omap_ocp2scp_probe(struct platform_device *pdev)
30
21
{
31
22
int ret;
···
70
79
pm_runtime_disable(&pdev->dev);
71
80
72
81
err0:
73
-
device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices);
82
+
of_platform_depopulate(&pdev->dev);
74
83
75
84
return ret;
76
85
}
···
78
87
static void omap_ocp2scp_remove(struct platform_device *pdev)
79
88
{
80
89
pm_runtime_disable(&pdev->dev);
81
-
device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices);
90
+
of_platform_depopulate(&pdev->dev);
82
91
}
83
92
84
93
#ifdef CONFIG_OF
+3
-1
drivers/hwspinlock/omap_hwspinlock.c
+3
-1
drivers/hwspinlock/omap_hwspinlock.c
···
88
88
* make sure the module is enabled and clocked before reading
89
89
* the module SYSSTATUS register
90
90
*/
91
-
devm_pm_runtime_enable(&pdev->dev);
91
+
ret = devm_pm_runtime_enable(&pdev->dev);
92
+
if (ret)
93
+
return ret;
92
94
ret = pm_runtime_resume_and_get(&pdev->dev);
93
95
if (ret < 0)
94
96
return ret;