|
@@ -2115,14 +2115,34 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
|
|
|
dev_err(&pdev->dev, "of_probe: fifo-size error(%d)\n", ret);
|
|
|
goto err;
|
|
|
}
|
|
|
- ep->fifo_size = fifo_mode ? udc->fifo_cfg[i].fifo_size : val;
|
|
|
+ if (fifo_mode) {
|
|
|
+ if (val < udc->fifo_cfg[i].fifo_size) {
|
|
|
+ dev_warn(&pdev->dev,
|
|
|
+ "Using max fifo-size value from DT\n");
|
|
|
+ ep->fifo_size = val;
|
|
|
+ } else {
|
|
|
+ ep->fifo_size = udc->fifo_cfg[i].fifo_size;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ ep->fifo_size = val;
|
|
|
+ }
|
|
|
|
|
|
ret = of_property_read_u32(pp, "atmel,nb-banks", &val);
|
|
|
if (ret) {
|
|
|
dev_err(&pdev->dev, "of_probe: nb-banks error(%d)\n", ret);
|
|
|
goto err;
|
|
|
}
|
|
|
- ep->nr_banks = fifo_mode ? udc->fifo_cfg[i].nr_banks : val;
|
|
|
+ if (fifo_mode) {
|
|
|
+ if (val < udc->fifo_cfg[i].nr_banks) {
|
|
|
+ dev_warn(&pdev->dev,
|
|
|
+ "Using max nb-banks value from DT\n");
|
|
|
+ ep->nr_banks = val;
|
|
|
+ } else {
|
|
|
+ ep->nr_banks = udc->fifo_cfg[i].nr_banks;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ ep->nr_banks = val;
|
|
|
+ }
|
|
|
|
|
|
ep->can_dma = of_property_read_bool(pp, "atmel,can-dma");
|
|
|
ep->can_isoc = of_property_read_bool(pp, "atmel,can-isoc");
|