Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: OMAP2+: Only probe SDMA via ti-sysc if configured in dts

We still have some SDMA probing using omap_device_build() for the
arch/arm/plat-omap/dma.c part that the dmaengine driver then uses.

So we still need to ensure that omap_device_build() works even if we
probe and manage the dmaengine driver via ti-sysc. And we don't want
to call dev_pm_domain_set() as otherwise we'd also have omap_device
try to manage the hardware in addition to ti-sysc.

Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

+15 -7
+15 -7
arch/arm/mach-omap2/omap_device.c
··· 143 143 struct resource res; 144 144 const char *oh_name; 145 145 int oh_cnt, i, ret = 0; 146 - bool device_active = false; 146 + bool device_active = false, skip_pm_domain = false; 147 147 148 148 oh_cnt = of_property_count_strings(node, "ti,hwmods"); 149 149 if (oh_cnt <= 0) { ··· 151 151 return -ENODEV; 152 152 } 153 153 154 + /* SDMA still needs special handling for omap_device_build() */ 155 + ret = of_property_read_string_index(node, "ti,hwmods", 0, &oh_name); 156 + if (!ret && (!strncmp("dma_system", oh_name, 10) || 157 + !strncmp("dma", oh_name, 3))) 158 + skip_pm_domain = true; 159 + 154 160 /* Use ti-sysc driver instead of omap_device? */ 155 - if (!omap_hwmod_parse_module_range(NULL, node, &res)) 161 + if (!skip_pm_domain && 162 + !omap_hwmod_parse_module_range(NULL, node, &res)) 156 163 return -ENODEV; 157 164 158 165 hwmods = kzalloc(sizeof(struct omap_hwmod *) * oh_cnt, GFP_KERNEL); ··· 198 191 r->name = dev_name(&pdev->dev); 199 192 } 200 193 201 - dev_pm_domain_set(&pdev->dev, &omap_device_pm_domain); 202 - 203 - if (device_active) { 204 - omap_device_enable(pdev); 205 - pm_runtime_set_active(&pdev->dev); 194 + if (!skip_pm_domain) { 195 + dev_pm_domain_set(&pdev->dev, &omap_device_pm_domain); 196 + if (device_active) { 197 + omap_device_enable(pdev); 198 + pm_runtime_set_active(&pdev->dev); 199 + } 206 200 } 207 201 208 202 odbfd_exit1: