Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be2dbb09 authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

usb: musb: ux500: move channel number knowledge into the driver 



For all ux500 based platforms the maximum number of end-points are used.
Move this knowledge into the driver so we can relinquish the burden from
platform data. This also removes quite a bit of complexity from the driver
and will aid us when we come to enable the driver for Device Tree.

Cc: linux-usb@vger.kernel.org
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Acked-by: default avatarFabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 95e4bf98

arch/arm/mach-ux500/usb.c

+6 −8
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
		.dir = STEDMA40_MEM_TO_PERIPH, \

	}



static struct stedma40_chan_cfg musb_dma_rx_ch[UX500_MUSB_DMA_NUM_RX_CHANNELS]

static struct stedma40_chan_cfg musb_dma_rx_ch[UX500_MUSB_DMA_NUM_RX_TX_CHANNELS]

	= {

	MUSB_DMA40_RX_CH,

	MUSB_DMA40_RX_CH,
@@ -34,7 +34,7 @@ static struct stedma40_chan_cfg musb_dma_rx_ch[UX500_MUSB_DMA_NUM_RX_CHANNELS] 
	MUSB_DMA40_RX_CH

};



static struct stedma40_chan_cfg musb_dma_tx_ch[UX500_MUSB_DMA_NUM_TX_CHANNELS]

static struct stedma40_chan_cfg musb_dma_tx_ch[UX500_MUSB_DMA_NUM_RX_TX_CHANNELS]

	= {

	MUSB_DMA40_TX_CH,

	MUSB_DMA40_TX_CH,
@@ -46,7 +46,7 @@ static struct stedma40_chan_cfg musb_dma_tx_ch[UX500_MUSB_DMA_NUM_TX_CHANNELS] 
	MUSB_DMA40_TX_CH,

};



static void *ux500_dma_rx_param_array[UX500_MUSB_DMA_NUM_RX_CHANNELS] = {

static void *ux500_dma_rx_param_array[UX500_MUSB_DMA_NUM_RX_TX_CHANNELS] = {

	&musb_dma_rx_ch[0],

	&musb_dma_rx_ch[1],

	&musb_dma_rx_ch[2],
@@ -57,7 +57,7 @@ static void *ux500_dma_rx_param_array[UX500_MUSB_DMA_NUM_RX_CHANNELS] = { 
	&musb_dma_rx_ch[7]

};



static void *ux500_dma_tx_param_array[UX500_MUSB_DMA_NUM_TX_CHANNELS] = {

static void *ux500_dma_tx_param_array[UX500_MUSB_DMA_NUM_RX_TX_CHANNELS] = {

	&musb_dma_tx_ch[0],

	&musb_dma_tx_ch[1],

	&musb_dma_tx_ch[2],
@@ -71,8 +71,6 @@ static void *ux500_dma_tx_param_array[UX500_MUSB_DMA_NUM_TX_CHANNELS] = { 
static struct ux500_musb_board_data musb_board_data = {

	.dma_rx_param_array = ux500_dma_rx_param_array,

	.dma_tx_param_array = ux500_dma_tx_param_array,

	.num_rx_channels = UX500_MUSB_DMA_NUM_RX_CHANNELS,

	.num_tx_channels = UX500_MUSB_DMA_NUM_TX_CHANNELS,

	.dma_filter = stedma40_filter,

};
@@ -119,7 +117,7 @@ static inline void ux500_usb_dma_update_rx_ch_config(int *dev_type) 
{

	u32 idx;



	for (idx = 0; idx < UX500_MUSB_DMA_NUM_RX_CHANNELS; idx++)

	for (idx = 0; idx < UX500_MUSB_DMA_NUM_RX_TX_CHANNELS; idx++)

		musb_dma_rx_ch[idx].dev_type = dev_type[idx];

}
@@ -127,7 +125,7 @@ static inline void ux500_usb_dma_update_tx_ch_config(int *dev_type) 
{

	u32 idx;



	for (idx = 0; idx < UX500_MUSB_DMA_NUM_TX_CHANNELS; idx++)

	for (idx = 0; idx < UX500_MUSB_DMA_NUM_RX_TX_CHANNELS; idx++)

		musb_dma_tx_ch[idx].dev_type = dev_type[idx];

}

drivers/usb/musb/ux500_dma.c

+9 −21
Original line number Diff line number Diff line
@@ -48,10 +48,8 @@ struct ux500_dma_channel { 


struct ux500_dma_controller {

	struct dma_controller controller;

	struct ux500_dma_channel rx_channel[UX500_MUSB_DMA_NUM_RX_CHANNELS];

	struct ux500_dma_channel tx_channel[UX500_MUSB_DMA_NUM_TX_CHANNELS];

	u32	num_rx_channels;

	u32	num_tx_channels;

	struct ux500_dma_channel rx_channel[UX500_MUSB_DMA_NUM_RX_TX_CHANNELS];

	struct ux500_dma_channel tx_channel[UX500_MUSB_DMA_NUM_RX_TX_CHANNELS];

	void *private_data;

	dma_addr_t phy_base;

};
@@ -144,19 +142,15 @@ static struct dma_channel *ux500_dma_channel_allocate(struct dma_controller *c, 
	struct ux500_dma_channel *ux500_channel = NULL;

	struct musb *musb = controller->private_data;

	u8 ch_num = hw_ep->epnum - 1;

	u32 max_ch;



	/* Max 8 DMA channels (0 - 7). Each DMA channel can only be allocated

	/* 8 DMA channels (0 - 7). Each DMA channel can only be allocated

	 * to specified hw_ep. For example DMA channel 0 can only be allocated

	 * to hw_ep 1 and 9.

	 */

	if (ch_num > 7)

		ch_num -= 8;



	max_ch = is_tx ? controller->num_tx_channels :

			controller->num_rx_channels;



	if (ch_num >= max_ch)

	if (ch_num >= UX500_MUSB_DMA_NUM_RX_TX_CHANNELS)

		return NULL;



	ux500_channel = is_tx ? &(controller->tx_channel[ch_num]) :
@@ -264,7 +258,7 @@ static int ux500_dma_controller_stop(struct dma_controller *c) 
	struct dma_channel *channel;

	u8 ch_num;



	for (ch_num = 0; ch_num < controller->num_rx_channels; ch_num++) {

	for (ch_num = 0; ch_num < UX500_MUSB_DMA_NUM_RX_TX_CHANNELS; ch_num++) {

		channel = &controller->rx_channel[ch_num].channel;

		ux500_channel = channel->private_data;
@@ -274,7 +268,7 @@ static int ux500_dma_controller_stop(struct dma_controller *c) 
			dma_release_channel(ux500_channel->dma_chan);

	}



	for (ch_num = 0; ch_num < controller->num_tx_channels; ch_num++) {

	for (ch_num = 0; ch_num < UX500_MUSB_DMA_NUM_RX_TX_CHANNELS; ch_num++) {

		channel = &controller->tx_channel[ch_num].channel;

		ux500_channel = channel->private_data;
@@ -303,26 +297,21 @@ static int ux500_dma_controller_start(struct dma_controller *c) 


	void **param_array;

	struct ux500_dma_channel *channel_array;

	u32 ch_count;

	dma_cap_mask_t mask;



	if ((data->num_rx_channels > UX500_MUSB_DMA_NUM_RX_CHANNELS) ||

		(data->num_tx_channels > UX500_MUSB_DMA_NUM_TX_CHANNELS))

		return -EINVAL;



	controller->num_rx_channels = data->num_rx_channels;

	controller->num_tx_channels = data->num_tx_channels;



	dma_cap_zero(mask);

	dma_cap_set(DMA_SLAVE, mask);



	/* Prepare the loop for RX channels */

	channel_array = controller->rx_channel;

	ch_count = data->num_rx_channels;

	param_array = data->dma_rx_param_array;



	for (dir = 0; dir < 2; dir++) {

		for (ch_num = 0; ch_num < ch_count; ch_num++) {

		for (ch_num = 0;

		     ch_num < UX500_MUSB_DMA_NUM_RX_TX_CHANNELS;

		     ch_num++) {

			ux500_channel = &channel_array[ch_num];

			ux500_channel->controller = controller;

			ux500_channel->ch_num = ch_num;
@@ -350,7 +339,6 @@ static int ux500_dma_controller_start(struct dma_controller *c) 


		/* Prepare the loop for TX channels */

		channel_array = controller->tx_channel;

		ch_count = data->num_tx_channels;

		param_array = data->dma_tx_param_array;

		is_tx = 1;

	}

include/linux/platform_data/usb-musb-ux500.h

+1 −4
Original line number Diff line number Diff line
@@ -9,14 +9,11 @@ 


#include <linux/dmaengine.h>



#define UX500_MUSB_DMA_NUM_RX_CHANNELS 8

#define UX500_MUSB_DMA_NUM_TX_CHANNELS 8

#define UX500_MUSB_DMA_NUM_RX_TX_CHANNELS 8



struct ux500_musb_board_data {

	void	**dma_rx_param_array;

	void	**dma_tx_param_array;

	u32	num_rx_channels;

	u32	num_tx_channels;

	bool (*dma_filter)(struct dma_chan *chan, void *filter_param);

};