* [PATCH 1/2] dmaengine: imx-sdma: Remove platform data support
@ 2021-01-18 12:15 Fabio Estevam
2021-01-18 12:15 ` [PATCH 2/2] dmaengine: imx-sdma: Use of_device_get_match_data() Fabio Estevam
2021-01-26 17:13 ` [PATCH 1/2] dmaengine: imx-sdma: Remove platform data support Vinod Koul
0 siblings, 2 replies; 3+ messages in thread
From: Fabio Estevam @ 2021-01-18 12:15 UTC (permalink / raw)
To: vkoul; +Cc: shawnguo, kernel, dmaengine, Fabio Estevam
Since 5.10-rc1, i.MX has been converted to a devicetree-only platform.
The platform data support in this driver was only used for non-DT
platforms.
Remove the platform data support as it has no more users.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/dma/imx-sdma.c | 35 +++++++---------------
include/linux/platform_data/dma-imx-sdma.h | 11 -------
2 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 41ba21eea7c8..a68950f80635 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1961,7 +1961,6 @@ static int sdma_probe(struct platform_device *pdev)
int irq;
struct resource *iores;
struct resource spba_res;
- struct sdma_platform_data *pdata = dev_get_platdata(&pdev->dev);
int i;
struct sdma_engine *sdma;
s32 *saddr_arr;
@@ -2063,8 +2062,6 @@ static int sdma_probe(struct platform_device *pdev)
if (sdma->drvdata->script_addrs)
sdma_add_scripts(sdma, sdma->drvdata->script_addrs);
- if (pdata && pdata->script_addrs)
- sdma_add_scripts(sdma, pdata->script_addrs);
sdma->dma_device.dev = &pdev->dev;
@@ -2110,30 +2107,18 @@ static int sdma_probe(struct platform_device *pdev)
}
/*
- * Kick off firmware loading as the very last step:
- * attempt to load firmware only if we're not on the error path, because
- * the firmware callback requires a fully functional and allocated sdma
- * instance.
+ * Because that device tree does not encode ROM script address,
+ * the RAM script in firmware is mandatory for device tree
+ * probe, otherwise it fails.
*/
- if (pdata) {
- ret = sdma_get_firmware(sdma, pdata->fw_name);
- if (ret)
- dev_warn(&pdev->dev, "failed to get firmware from platform data\n");
+ ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
+ &fw_name);
+ if (ret) {
+ dev_warn(&pdev->dev, "failed to get firmware name\n");
} else {
- /*
- * Because that device tree does not encode ROM script address,
- * the RAM script in firmware is mandatory for device tree
- * probe, otherwise it fails.
- */
- ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
- &fw_name);
- if (ret) {
- dev_warn(&pdev->dev, "failed to get firmware name\n");
- } else {
- ret = sdma_get_firmware(sdma, fw_name);
- if (ret)
- dev_warn(&pdev->dev, "failed to get firmware from device tree\n");
- }
+ ret = sdma_get_firmware(sdma, fw_name);
+ if (ret)
+ dev_warn(&pdev->dev, "failed to get firmware from device tree\n");
}
return 0;
diff --git a/include/linux/platform_data/dma-imx-sdma.h b/include/linux/platform_data/dma-imx-sdma.h
index 30e676b36b24..725602d9df91 100644
--- a/include/linux/platform_data/dma-imx-sdma.h
+++ b/include/linux/platform_data/dma-imx-sdma.h
@@ -57,15 +57,4 @@ struct sdma_script_start_addrs {
/* End of v4 array */
};
-/**
- * struct sdma_platform_data - platform specific data for SDMA engine
- *
- * @fw_name The firmware name
- * @script_addrs SDMA scripts addresses in SDMA ROM
- */
-struct sdma_platform_data {
- char *fw_name;
- struct sdma_script_start_addrs *script_addrs;
-};
-
#endif /* __MACH_MXC_SDMA_H__ */
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] dmaengine: imx-sdma: Use of_device_get_match_data()
2021-01-18 12:15 [PATCH 1/2] dmaengine: imx-sdma: Remove platform data support Fabio Estevam
@ 2021-01-18 12:15 ` Fabio Estevam
2021-01-26 17:13 ` [PATCH 1/2] dmaengine: imx-sdma: Remove platform data support Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Fabio Estevam @ 2021-01-18 12:15 UTC (permalink / raw)
To: vkoul; +Cc: shawnguo, kernel, dmaengine, Fabio Estevam
Use of_device_get_match_data() to make the code simpler.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/dma/imx-sdma.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index a68950f80635..d5590c08db51 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1952,8 +1952,6 @@ static struct dma_chan *sdma_xlate(struct of_phandle_args *dma_spec,
static int sdma_probe(struct platform_device *pdev)
{
- const struct of_device_id *of_id =
- of_match_device(sdma_dt_ids, &pdev->dev);
struct device_node *np = pdev->dev.of_node;
struct device_node *spba_bus;
const char *fw_name;
@@ -1964,13 +1962,6 @@ static int sdma_probe(struct platform_device *pdev)
int i;
struct sdma_engine *sdma;
s32 *saddr_arr;
- const struct sdma_driver_data *drvdata = NULL;
-
- drvdata = of_id->data;
- if (!drvdata) {
- dev_err(&pdev->dev, "unable to find driver data\n");
- return -EINVAL;
- }
ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (ret)
@@ -1983,7 +1974,7 @@ static int sdma_probe(struct platform_device *pdev)
spin_lock_init(&sdma->channel_0_lock);
sdma->dev = &pdev->dev;
- sdma->drvdata = drvdata;
+ sdma->drvdata = of_device_get_match_data(sdma->dev);
irq = platform_get_irq(pdev, 0);
if (irq < 0)
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] dmaengine: imx-sdma: Remove platform data support
2021-01-18 12:15 [PATCH 1/2] dmaengine: imx-sdma: Remove platform data support Fabio Estevam
2021-01-18 12:15 ` [PATCH 2/2] dmaengine: imx-sdma: Use of_device_get_match_data() Fabio Estevam
@ 2021-01-26 17:13 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2021-01-26 17:13 UTC (permalink / raw)
To: Fabio Estevam; +Cc: shawnguo, kernel, dmaengine
On 18-01-21, 09:15, Fabio Estevam wrote:
> Since 5.10-rc1, i.MX has been converted to a devicetree-only platform.
>
> The platform data support in this driver was only used for non-DT
> platforms.
>
> Remove the platform data support as it has no more users.
Applied both, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-26 21:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-18 12:15 [PATCH 1/2] dmaengine: imx-sdma: Remove platform data support Fabio Estevam
2021-01-18 12:15 ` [PATCH 2/2] dmaengine: imx-sdma: Use of_device_get_match_data() Fabio Estevam
2021-01-26 17:13 ` [PATCH 1/2] dmaengine: imx-sdma: Remove platform data support Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).