Tony,
On 2017-06-01 01:51, Tony Lindgren wrote:
> We are now booting all mach-omap2 in device tree only mode.
> Any code that is only called in legacy boot mode where
> of_have_populated_dt() is not set is safe to remove now.
>
> Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
> ---
> arch/arm/mach-omap2/dma.c | 30 +-----------------------------
> 1 file changed, 1 insertion(+), 29 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c
> --- a/arch/arm/mach-omap2/dma.c
> +++ b/arch/arm/mach-omap2/dma.c
> @@ -334,20 +334,6 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
> p.dma_attr = (struct omap_dma_dev_attr *)oh->dev_attr;
> p.errata = configure_dma_errata();
>
> - if (!of_have_populated_dt()) {
> - if (soc_is_omap24xx()) {
> - p.slave_map = omap24xx_sdma_map;
> - p.slavecnt = ARRAY_SIZE(omap24xx_sdma_map);
> - } else if (soc_is_omap34xx() || soc_is_omap3630()) {
> - p.slave_map = omap3xxx_sdma_map;
> - p.slavecnt = ARRAY_SIZE(omap3xxx_sdma_map);
> - } else {
> - pr_err("%s: The legacy DMA map is not provided!\n",
> - __func__);
> - return -ENODEV;
> - }
> - }
> -
This will conflict with the changes introduced by the tusb6010 DMAengine
conversion:
https://patchwork.kernel.org/patch/9734219/
with this patch I think the omap24xx_sdma_map and omap3xxx_sdma_map can
also be removed, but we need to keep the omap24xx_sdma_dt_map for now
till we have proper DT support for tusb.
> pdev = omap_device_build(name, 0, oh, &p, sizeof(p));
> if (IS_ERR(pdev)) {
> pr_err("%s: Can't build omap_device for %s:%s.\n",
> @@ -389,21 +375,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
>
> static int __init omap2_system_dma_init(void)
> {
> - struct platform_device *pdev;
> - int res;
> -
> - res = omap_hwmod_for_each_by_class("dma",
> + return omap_hwmod_for_each_by_class("dma",
> omap2_system_dma_init_dev, NULL);
> - if (res)
> - return res;
> -
> - if (of_have_populated_dt())
> - return res;
> -
> - pdev = platform_device_register_full(&omap_dma_dev_info);
> - if (IS_ERR(pdev))
> - return PTR_ERR(pdev);
> -
> - return res;
> }
> omap_arch_initcall(omap2_system_dma_init);
>
- Péter
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
