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

Commit 7c55984e authored by Ludovic Desroches's avatar Ludovic Desroches Committed by Felipe Balbi
Browse files

usb: gadget: udc: atmel: remove code related to platform stuff 



With the removal of AVR platforms, code related to platform stuff
is useless.

Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@microchip.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 12814a3f

drivers/usb/gadget/udc/atmel_usba_udc.c

+2 −71
Original line number Diff line number Diff line
@@ -2019,7 +2019,6 @@ static int atmel_usba_stop(struct usb_gadget *gadget) 
	return 0;

}



#ifdef CONFIG_OF

static void at91sam9rl_toggle_bias(struct usba_udc *udc, int is_on)

{

	regmap_update_bits(udc->pmc, AT91_CKGR_UCKR, AT91_PMC_BIASEN,
@@ -2204,71 +2203,6 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, 
err:

	return ERR_PTR(ret);

}

#else

static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,

						    struct usba_udc *udc)

{

	return ERR_PTR(-ENOSYS);

}

#endif



static struct usba_ep * usba_udc_pdata(struct platform_device *pdev,

						 struct usba_udc *udc)

{

	struct usba_platform_data *pdata = dev_get_platdata(&pdev->dev);

	struct usba_ep *eps;

	int i;



	if (!pdata)

		return ERR_PTR(-ENXIO);



	eps = devm_kzalloc(&pdev->dev, sizeof(struct usba_ep) * pdata->num_ep,

			   GFP_KERNEL);

	if (!eps)

		return ERR_PTR(-ENOMEM);



	udc->gadget.ep0 = &eps[0].ep;



	udc->vbus_pin = pdata->vbus_pin;

	udc->vbus_pin_inverted = pdata->vbus_pin_inverted;

	udc->num_ep = pdata->num_ep;



	INIT_LIST_HEAD(&eps[0].ep.ep_list);



	for (i = 0; i < pdata->num_ep; i++) {

		struct usba_ep *ep = &eps[i];



		ep->ep_regs = udc->regs + USBA_EPT_BASE(i);

		ep->dma_regs = udc->regs + USBA_DMA_BASE(i);

		ep->fifo = udc->fifo + USBA_FIFO_BASE(i);

		ep->ep.ops = &usba_ep_ops;

		ep->ep.name = pdata->ep[i].name;

		ep->fifo_size = pdata->ep[i].fifo_size;

		usb_ep_set_maxpacket_limit(&ep->ep, ep->fifo_size);

		ep->udc = udc;

		INIT_LIST_HEAD(&ep->queue);

		ep->nr_banks = pdata->ep[i].nr_banks;

		ep->index = pdata->ep[i].index;

		ep->can_dma = pdata->ep[i].can_dma;

		ep->can_isoc = pdata->ep[i].can_isoc;



		if (i == 0) {

			ep->ep.caps.type_control = true;

		} else {

			ep->ep.caps.type_iso = ep->can_isoc;

			ep->ep.caps.type_bulk = true;

			ep->ep.caps.type_int = true;

		}



		ep->ep.caps.dir_in = true;

		ep->ep.caps.dir_out = true;



		if (i)

			list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list);

	}



	return eps;

}



static int usba_udc_probe(struct platform_device *pdev)

{
@@ -2327,10 +2261,7 @@ static int usba_udc_probe(struct platform_device *pdev) 
	usba_writel(udc, CTRL, USBA_DISABLE_MASK);

	clk_disable_unprepare(pclk);



	if (pdev->dev.of_node)

	udc->usba_ep = atmel_udc_of_init(pdev, udc);

	else

		udc->usba_ep = usba_udc_pdata(pdev, udc);



	toggle_bias(udc, 0);
@@ -2454,7 +2385,7 @@ static struct platform_driver udc_driver = { 
	.driver		= {

		.name		= "atmel_usba_udc",

		.pm		= &usba_udc_pm_ops,

		.of_match_table	= of_match_ptr(atmel_udc_dt_ids),

		.of_match_table	= atmel_udc_dt_ids,

	},

};