iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmaengine: ti: omap-dma: Pass sdma auxdata to driver and use it

Browse Source 
We can now start passing sdma auxdata to the dmaengine driver to start
removing the platform based sdma init.

Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Cc: Vinod Koul <vkoul@kernel.org>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren 2019-12-16 14:41:53 -08:00
parent 9938ee9cf9
commit 211010aeb0
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-omap2/common.h
View File

@ -345,9 +345,12 @@ static inline int dra7xx_pciess_reset(struct omap_hwmod *oh)
} }
#endif #endif
struct omap_system_dma_plat_info;
void pdata_quirks_init(const struct of_device_id *); void pdata_quirks_init(const struct of_device_id *);
void omap_auxdata_legacy_init(struct device *dev); void omap_auxdata_legacy_init(struct device *dev);
void omap_pcs_legacy_init(int irq, void (*rearm)(void)); void omap_pcs_legacy_init(int irq, void (*rearm)(void));
extern struct omap_system_dma_plat_info dma_plat_info;
struct omap_sdrc_params; struct omap_sdrc_params;
extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,

2
arch/arm/mach-omap2/dma.c
View File

@ -217,7 +217,7 @@ static struct omap_dma_dev_attr dma_attr = {
.lch_count = 32, .lch_count = 32,
}; };
static struct omap_system_dma_plat_info dma_plat_info __initdata = { struct omap_system_dma_plat_info dma_plat_info = {
.reg_map = reg_map, .reg_map = reg_map,
.channel_stride = 0x60, .channel_stride = 0x60,
.dma_attr = &dma_attr, .dma_attr = &dma_attr,

1
arch/arm/mach-omap2/pdata-quirks.c
View File

@ -514,6 +514,7 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = {
/* Common auxdata */ /* Common auxdata */
OF_DEV_AUXDATA("ti,sysc", 0, NULL, &ti_sysc_pdata), OF_DEV_AUXDATA("ti,sysc", 0, NULL, &ti_sysc_pdata),
OF_DEV_AUXDATA("pinctrl-single", 0, NULL, &pcs_pdata), OF_DEV_AUXDATA("pinctrl-single", 0, NULL, &pcs_pdata),
OF_DEV_AUXDATA("ti,omap-sdma", 0, NULL, &dma_plat_info),
{ /* sentinel */ }, { /* sentinel */ },
}; };

14
drivers/dma/ti/omap-dma.c
View File

@ -1585,14 +1585,18 @@ static int omap_dma_probe(struct platform_device *pdev)
return PTR_ERR(od->base); return PTR_ERR(od->base);
conf = of_device_get_match_data(&pdev->dev); conf = of_device_get_match_data(&pdev->dev);
if (conf) if (conf) {
od->cfg = conf; od->cfg = conf;
else od->plat = dev_get_platdata(&pdev->dev);
if (!od->plat)
dev_warn(&pdev->dev, "no sdma auxdata needed?\n");
} else {
od->cfg = &default_cfg; od->cfg = &default_cfg;
od->plat = omap_get_plat_info(); od->plat = omap_get_plat_info();
if (!od->plat) if (!od->plat)
return -EPROBE_DEFER; return -EPROBE_DEFER;
}
od->reg_map = od->plat->reg_map; od->reg_map = od->plat->reg_map;