Commit 42ae6f16 authored by Linus Walleij's avatar Linus Walleij Committed by Vinod Koul
Browse files

dmaengine: ste_dma40: Remove platform data 



The Ux500 is device tree-only since ages. Delete the
platform data header and push it into or next to the driver
instead.

Drop the non-DT probe path since this will not happen.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230417-ux500-dma40-cleanup-v3-4-60bfa6785968@linaro.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent fb85a8c5

drivers/dma/ste_dma40.c

+38 −18
Original line number Diff line number Diff line
@@ -23,11 +23,39 @@ 
#include <linux/of_dma.h>

#include <linux/amba/bus.h>

#include <linux/regulator/consumer.h>

#include <linux/platform_data/dma-ste-dma40.h>



#include "dmaengine.h"

#include "ste_dma40.h"

#include "ste_dma40_ll.h"



/**

 * struct stedma40_platform_data - Configuration struct for the dma device.

 *

 * @dev_tx: mapping between destination event line and io address

 * @dev_rx: mapping between source event line and io address

 * @disabled_channels: A vector, ending with -1, that marks physical channels

 * that are for different reasons not available for the driver.

 * @soft_lli_chans: A vector, that marks physical channels will use LLI by SW

 * which avoids HW bug that exists in some versions of the controller.

 * SoftLLI introduces relink overhead that could impact performace for

 * certain use cases.

 * @num_of_soft_lli_chans: The number of channels that needs to be configured

 * to use SoftLLI.

 * @use_esram_lcla: flag for mapping the lcla into esram region

 * @num_of_memcpy_chans: The number of channels reserved for memcpy.

 * @num_of_phy_chans: The number of physical channels implemented in HW.

 * 0 means reading the number of channels from DMA HW but this is only valid

 * for 'multiple of 4' channels, like 8.

 */

struct stedma40_platform_data {

	int				 disabled_channels[STEDMA40_MAX_PHYS];

	int				*soft_lli_chans;

	int				 num_of_soft_lli_chans;

	bool				 use_esram_lcla;

	int				 num_of_memcpy_chans;

	int				 num_of_phy_chans;

};



#define D40_NAME "dma40"



#define D40_PHY_CHAN -1
@@ -2269,7 +2297,7 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src, 
	return NULL;

}



bool stedma40_filter(struct dma_chan *chan, void *data)

static bool stedma40_filter(struct dma_chan *chan, void *data)

{

	struct stedma40_chan_cfg *info = data;

	struct d40_chan *d40c =
@@ -2288,7 +2316,6 @@ bool stedma40_filter(struct dma_chan *chan, void *data) 


	return err == 0;

}

EXPORT_SYMBOL(stedma40_filter);



static void __d40_set_prio_rt(struct d40_chan *d40c, int dev_type, bool src)

{
@@ -3517,17 +3544,10 @@ static int __init d40_probe(struct platform_device *pdev) 
	int num_reserved_chans;

	u32 val;



	if (!plat_data) {

		if (np) {

	if (d40_of_probe(pdev, np)) {

		ret = -ENOMEM;

		goto report_failure;

	}

		} else {

			d40_err(dev, "No pdata or Device Tree provided\n");

			goto report_failure;

		}

	}



	base = d40_hw_detect_init(pdev);

	if (!base)
@@ -3650,11 +3670,11 @@ static int __init d40_probe(struct platform_device *pdev) 


	d40_hw_init(base);



	if (np) {

	ret = of_dma_controller_register(np, d40_xlate, NULL);

		if (ret)

	if (ret) {

		dev_err(dev,

			"could not register of_dma_controller\n");

		goto destroy_cache;

	}



	dev_info(base->dev, "initialized\n");

include/linux/platform_data/dma-ste-dma40.h→drivers/dma/ste_dma40.h

+1 −100
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) ST-Ericsson SA 2007-2010

 * Author: Per Forlin <per.forlin@stericsson.com> for ST-Ericsson

 * Author: Jonas Aaberg <jonas.aberg@stericsson.com> for ST-Ericsson

 */





#ifndef STE_DMA40_H

#define STE_DMA40_H



#include <linux/dmaengine.h>

#include <linux/scatterlist.h>

#include <linux/workqueue.h>

#include <linux/interrupt.h>



/*

 * Maxium size for a single dma descriptor

 * Size is limited to 16 bits.
@@ -118,92 +107,4 @@ struct stedma40_chan_cfg { 
	int					 phy_channel;

};



/**

 * struct stedma40_platform_data - Configuration struct for the dma device.

 *

 * @dev_tx: mapping between destination event line and io address

 * @dev_rx: mapping between source event line and io address

 * @disabled_channels: A vector, ending with -1, that marks physical channels

 * that are for different reasons not available for the driver.

 * @soft_lli_chans: A vector, that marks physical channels will use LLI by SW

 * which avoids HW bug that exists in some versions of the controller.

 * SoftLLI introduces relink overhead that could impact performace for

 * certain use cases.

 * @num_of_soft_lli_chans: The number of channels that needs to be configured

 * to use SoftLLI.

 * @use_esram_lcla: flag for mapping the lcla into esram region

 * @num_of_memcpy_chans: The number of channels reserved for memcpy.

 * @num_of_phy_chans: The number of physical channels implemented in HW.

 * 0 means reading the number of channels from DMA HW but this is only valid

 * for 'multiple of 4' channels, like 8.

 */

struct stedma40_platform_data {

	int				 disabled_channels[STEDMA40_MAX_PHYS];

	int				*soft_lli_chans;

	int				 num_of_soft_lli_chans;

	bool				 use_esram_lcla;

	int				 num_of_memcpy_chans;

	int				 num_of_phy_chans;

};



#ifdef CONFIG_STE_DMA40



/**

 * stedma40_filter() - Provides stedma40_chan_cfg to the

 * ste_dma40 dma driver via the dmaengine framework.

 * does some checking of what's provided.

 *

 * Never directly called by client. It used by dmaengine.

 * @chan: dmaengine handle.

 * @data: Must be of type: struct stedma40_chan_cfg and is

 * the configuration of the framework.

 *

 *

 */



bool stedma40_filter(struct dma_chan *chan, void *data);



/**

 * stedma40_slave_mem() - Transfers a raw data buffer to or from a slave

 * (=device)

 *

 * @chan: dmaengine handle

 * @addr: source or destination physicall address.

 * @size: bytes to transfer

 * @direction: direction of transfer

 * @flags: is actually enum dma_ctrl_flags. See dmaengine.h

 */



static inline struct

dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,

					    dma_addr_t addr,

					    unsigned int size,

					    enum dma_transfer_direction direction,

					    unsigned long flags)

{

	struct scatterlist sg;

	sg_init_table(&sg, 1);

	sg.dma_address = addr;

	sg.length = size;



	return dmaengine_prep_slave_sg(chan, &sg, 1, direction, flags);

}



#else

static inline bool stedma40_filter(struct dma_chan *chan, void *data)

{

	return false;

}



static inline struct

dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,

					    dma_addr_t addr,

					    unsigned int size,

					    enum dma_transfer_direction direction,

					    unsigned long flags)

{

	return NULL;

}

#endif



#endif
 
#endif /* STE_DMA40_H */

drivers/dma/ste_dma40_ll.c

+2 −1
Original line number Diff line number Diff line
@@ -6,8 +6,9 @@ 
 */



#include <linux/kernel.h>

#include <linux/platform_data/dma-ste-dma40.h>

#include <linux/dmaengine.h>



#include "ste_dma40.h"

#include "ste_dma40_ll.h"



static u8 d40_width_to_bits(enum dma_slave_buswidth width)