* [PATCH 0/3] Remove the USB EP configuration from device tree
@ 2019-11-07 15:31 Gregory CLEMENT
2019-11-07 15:31 ` [PATCH 1/3] usb: gadget: udc: atmel: Don't use DT to configure end point Gregory CLEMENT
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Gregory CLEMENT @ 2019-11-07 15:31 UTC (permalink / raw)
To: Cristian Birsan, Felipe Balbi, Greg Kroah-Hartman, Alan Stern,
linux-usb, linux-kernel
Cc: Rob Herring, devicetree, Nicolas Ferre, Alexandre Belloni,
Ludovic Desroches, linux-arm-kernel, Thomas Petazzoni,
Gregory CLEMENT
Hello,
The Atmel USB device controller is the only one having the description
of the End Point configuration in the device tree.
This configuration depend on the version of the controller used in the
SoC. This variation is already documented by the compatible string of
the controller.
In this series the configuration is associated to the compatible
string which allows to remove the EP child node from the device
tree. The main benefit of it, beyond the simplification of the device
tree, is the reduction of the size of the dtb which was too big to be
managed by the bootloader.
The first two patches should be merged through the USB subsystem while
the last one should be take by the a91 subsystem. Moreover this last
patch should be merged only once the change in the driver is merged.
Gregory
Gregory CLEMENT (3):
usb: gadget: udc: atmel: Don't use DT to configure end point
dt-bindings: usb: atmel: Mark EP child node as deprecated
ARM: dts: at91: Remove the USB EP child node
.../devicetree/bindings/usb/atmel-usb.txt | 56 +--------
arch/arm/boot/dts/at91sam9g45.dtsi | 52 --------
arch/arm/boot/dts/at91sam9rl.dtsi | 52 --------
arch/arm/boot/dts/at91sam9x5.dtsi | 52 --------
arch/arm/boot/dts/sama5d2.dtsi | 118 ------------------
arch/arm/boot/dts/sama5d3.dtsi | 105 ----------------
arch/arm/boot/dts/sama5d4.dtsi | 118 ------------------
drivers/usb/gadget/udc/atmel_usba_udc.c | 112 +++++++++++------
drivers/usb/gadget/udc/atmel_usba_udc.h | 12 ++
9 files changed, 87 insertions(+), 590 deletions(-)
--
2.24.0.rc1
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/3] usb: gadget: udc: atmel: Don't use DT to configure end point 2019-11-07 15:31 [PATCH 0/3] Remove the USB EP configuration from device tree Gregory CLEMENT @ 2019-11-07 15:31 ` Gregory CLEMENT 2019-11-22 14:50 ` Gregory CLEMENT 2019-11-07 15:31 ` [PATCH 2/3] dt-bindings: usb: atmel: Mark EP child node as deprecated Gregory CLEMENT 2019-11-07 15:31 ` [PATCH 3/3] ARM: dts: at91: Remove the USB EP child node Gregory CLEMENT 2 siblings, 1 reply; 8+ messages in thread From: Gregory CLEMENT @ 2019-11-07 15:31 UTC (permalink / raw) To: Cristian Birsan, Felipe Balbi, Greg Kroah-Hartman, Alan Stern, linux-usb, linux-kernel Cc: Rob Herring, devicetree, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel, Thomas Petazzoni, Gregory CLEMENT The endpoint configuration used to be stored in the device tree, however the configuration depend on the "version" of the controller itself. This information is already documented by the compatible string. It then possible to just rely on the compatible string and completely remove the full ep configuration done in the device tree as it was already the case for all the other USB device controller. Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> --- drivers/usb/gadget/udc/atmel_usba_udc.c | 112 +++++++++++++++--------- drivers/usb/gadget/udc/atmel_usba_udc.h | 12 +++ 2 files changed, 84 insertions(+), 40 deletions(-) diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c index 86ffc8307864..2db833caeb09 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.c +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c @@ -2040,10 +2040,56 @@ static const struct usba_udc_errata at91sam9g45_errata = { .pulse_bias = at91sam9g45_pulse_bias, }; +static const struct usba_ep_config ep_config_sam9[] __initconst = { + { .nr_banks = 1 }, /* ep 0 */ + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 1 */ + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 2 */ + { .nr_banks = 3, .can_dma = 1 }, /* ep 3 */ + { .nr_banks = 3, .can_dma = 1 }, /* ep 4 */ + { .nr_banks = 3, .can_dma = 1, .can_isoc = 1 }, /* ep 5 */ + { .nr_banks = 3, .can_dma = 1, .can_isoc = 1 }, /* ep 6 */ +}; + +static const struct usba_ep_config ep_config_sama5[] __initconst = { + { .nr_banks = 1 }, /* ep 0 */ + { .nr_banks = 3, .can_dma = 1, .can_isoc = 1 }, /* ep 1 */ + { .nr_banks = 3, .can_dma = 1, .can_isoc = 1 }, /* ep 2 */ + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 3 */ + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 4 */ + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 5 */ + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 6 */ + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 7 */ + { .nr_banks = 2, .can_isoc = 1 }, /* ep 8 */ + { .nr_banks = 2, .can_isoc = 1 }, /* ep 9 */ + { .nr_banks = 2, .can_isoc = 1 }, /* ep 10 */ + { .nr_banks = 2, .can_isoc = 1 }, /* ep 11 */ + { .nr_banks = 2, .can_isoc = 1 }, /* ep 12 */ + { .nr_banks = 2, .can_isoc = 1 }, /* ep 13 */ + { .nr_banks = 2, .can_isoc = 1 }, /* ep 14 */ + { .nr_banks = 2, .can_isoc = 1 }, /* ep 15 */ +}; + +static const struct usba_udc_config udc_at91sam9rl_cfg = { + .errata = &at91sam9rl_errata, + .config = ep_config_sam9, + .num_ep = ARRAY_SIZE(ep_config_sam9), +}; + +static const struct usba_udc_config udc_at91sam9g45_cfg = { + .errata = &at91sam9g45_errata, + .config = ep_config_sam9, + .num_ep = ARRAY_SIZE(ep_config_sam9), +}; + +static const struct usba_udc_config udc_sama5d3_cfg = { + .config = ep_config_sama5, + .num_ep = ARRAY_SIZE(ep_config_sama5), +}; + static const struct of_device_id atmel_udc_dt_ids[] = { - { .compatible = "atmel,at91sam9rl-udc", .data = &at91sam9rl_errata }, - { .compatible = "atmel,at91sam9g45-udc", .data = &at91sam9g45_errata }, - { .compatible = "atmel,sama5d3-udc" }, + { .compatible = "atmel,at91sam9rl-udc", .data = &udc_at91sam9rl_cfg }, + { .compatible = "atmel,at91sam9g45-udc", .data = &udc_at91sam9g45_cfg }, + { .compatible = "atmel,sama5d3-udc", .data = &udc_sama5d3_cfg }, { /* sentinel */ } }; @@ -2052,18 +2098,19 @@ MODULE_DEVICE_TABLE(of, atmel_udc_dt_ids); static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, struct usba_udc *udc) { - u32 val; struct device_node *np = pdev->dev.of_node; const struct of_device_id *match; struct device_node *pp; int i, ret; struct usba_ep *eps, *ep; + const struct usba_udc_config *udc_config; match = of_match_node(atmel_udc_dt_ids, np); if (!match) return ERR_PTR(-EINVAL); - udc->errata = match->data; + udc_config = match->data; + udc->errata = udc_config->errata; udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9g45-pmc"); if (IS_ERR(udc->pmc)) udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9rl-pmc"); @@ -2079,8 +2126,7 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, if (fifo_mode == 0) { pp = NULL; - while ((pp = of_get_next_child(np, pp))) - udc->num_ep++; + udc->num_ep = udc_config->num_ep; udc->configured_ep = 1; } else { udc->num_ep = usba_config_fifo_table(udc); @@ -2097,52 +2143,38 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, pp = NULL; i = 0; - while ((pp = of_get_next_child(np, pp)) && i < udc->num_ep) { + while (i < udc->num_ep) { + const struct usba_ep_config *ep_cfg = &udc_config->config[i]; + ep = &eps[i]; - ret = of_property_read_u32(pp, "reg", &val); - if (ret) { - dev_err(&pdev->dev, "of_probe: reg error(%d)\n", ret); - goto err; - } - ep->index = fifo_mode ? udc->fifo_cfg[i].hw_ep_num : val; + ep->index = fifo_mode ? udc->fifo_cfg[i].hw_ep_num : i; + + /* Only the first EP is 64 bytes */ + if (ep->index == 0) + ep->fifo_size = 64; + else + ep->fifo_size = 1024; - ret = of_property_read_u32(pp, "atmel,fifo-size", &val); - if (ret) { - dev_err(&pdev->dev, "of_probe: fifo-size error(%d)\n", ret); - goto err; - } if (fifo_mode) { - if (val < udc->fifo_cfg[i].fifo_size) { + if (ep->fifo_size < udc->fifo_cfg[i].fifo_size) dev_warn(&pdev->dev, - "Using max fifo-size value from DT\n"); - ep->fifo_size = val; - } else { + "Using default max fifo-size value\n"); + 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 = ep_cfg->nr_banks; if (fifo_mode) { - if (val < udc->fifo_cfg[i].nr_banks) { + if (ep->nr_banks < udc->fifo_cfg[i].nr_banks) dev_warn(&pdev->dev, - "Using max nb-banks value from DT\n"); - ep->nr_banks = val; - } else { + "Using default max nb-banks value\n"); + 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"); + ep->can_dma = ep_cfg->can_dma; + ep->can_isoc = ep_cfg->can_isoc; sprintf(ep->name, "ep%d", ep->index); ep->ep.name = ep->name; diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.h b/drivers/usb/gadget/udc/atmel_usba_udc.h index a0225e4543d4..48e332439ed5 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.h +++ b/drivers/usb/gadget/udc/atmel_usba_udc.h @@ -290,6 +290,12 @@ struct usba_ep { #endif }; +struct usba_ep_config { + u8 nr_banks; + unsigned int can_dma:1; + unsigned int can_isoc:1; +}; + struct usba_request { struct usb_request req; struct list_head queue; @@ -307,6 +313,12 @@ struct usba_udc_errata { void (*pulse_bias)(struct usba_udc *udc); }; +struct usba_udc_config { + const struct usba_udc_errata *errata; + const struct usba_ep_config *config; + const int num_ep; +}; + struct usba_udc { /* Protect hw registers from concurrent modifications */ spinlock_t lock; -- 2.24.0.rc1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] usb: gadget: udc: atmel: Don't use DT to configure end point 2019-11-07 15:31 ` [PATCH 1/3] usb: gadget: udc: atmel: Don't use DT to configure end point Gregory CLEMENT @ 2019-11-22 14:50 ` Gregory CLEMENT 2019-11-22 16:02 ` Cristian.Birsan 0 siblings, 1 reply; 8+ messages in thread From: Gregory CLEMENT @ 2019-11-22 14:50 UTC (permalink / raw) To: Cristian Birsan, Felipe Balbi, Greg Kroah-Hartman, Alan Stern, linux-usb, linux-kernel Cc: Rob Herring, devicetree, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel, Thomas Petazzoni Hello, > The endpoint configuration used to be stored in the device tree, > however the configuration depend on the "version" of the controller > itself. > > This information is already documented by the compatible string. It > then possible to just rely on the compatible string and completely > remove the full ep configuration done in the device tree as it was > already the case for all the other USB device controller. Do you have any feedback about this patch ? The binding being reviewed is there any chance that this patch will be merged? Thanks, Gregory > > Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> > --- > drivers/usb/gadget/udc/atmel_usba_udc.c | 112 +++++++++++++++--------- > drivers/usb/gadget/udc/atmel_usba_udc.h | 12 +++ > 2 files changed, 84 insertions(+), 40 deletions(-) > > diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c > index 86ffc8307864..2db833caeb09 100644 > --- a/drivers/usb/gadget/udc/atmel_usba_udc.c > +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c > @@ -2040,10 +2040,56 @@ static const struct usba_udc_errata at91sam9g45_errata = { > .pulse_bias = at91sam9g45_pulse_bias, > }; > > +static const struct usba_ep_config ep_config_sam9[] __initconst = { > + { .nr_banks = 1 }, /* ep 0 */ > + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 1 */ > + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 2 */ > + { .nr_banks = 3, .can_dma = 1 }, /* ep 3 */ > + { .nr_banks = 3, .can_dma = 1 }, /* ep 4 */ > + { .nr_banks = 3, .can_dma = 1, .can_isoc = 1 }, /* ep 5 */ > + { .nr_banks = 3, .can_dma = 1, .can_isoc = 1 }, /* ep 6 */ > +}; > + > +static const struct usba_ep_config ep_config_sama5[] __initconst = { > + { .nr_banks = 1 }, /* ep 0 */ > + { .nr_banks = 3, .can_dma = 1, .can_isoc = 1 }, /* ep 1 */ > + { .nr_banks = 3, .can_dma = 1, .can_isoc = 1 }, /* ep 2 */ > + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 3 */ > + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 4 */ > + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 5 */ > + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 6 */ > + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 7 */ > + { .nr_banks = 2, .can_isoc = 1 }, /* ep 8 */ > + { .nr_banks = 2, .can_isoc = 1 }, /* ep 9 */ > + { .nr_banks = 2, .can_isoc = 1 }, /* ep 10 */ > + { .nr_banks = 2, .can_isoc = 1 }, /* ep 11 */ > + { .nr_banks = 2, .can_isoc = 1 }, /* ep 12 */ > + { .nr_banks = 2, .can_isoc = 1 }, /* ep 13 */ > + { .nr_banks = 2, .can_isoc = 1 }, /* ep 14 */ > + { .nr_banks = 2, .can_isoc = 1 }, /* ep 15 */ > +}; > + > +static const struct usba_udc_config udc_at91sam9rl_cfg = { > + .errata = &at91sam9rl_errata, > + .config = ep_config_sam9, > + .num_ep = ARRAY_SIZE(ep_config_sam9), > +}; > + > +static const struct usba_udc_config udc_at91sam9g45_cfg = { > + .errata = &at91sam9g45_errata, > + .config = ep_config_sam9, > + .num_ep = ARRAY_SIZE(ep_config_sam9), > +}; > + > +static const struct usba_udc_config udc_sama5d3_cfg = { > + .config = ep_config_sama5, > + .num_ep = ARRAY_SIZE(ep_config_sama5), > +}; > + > static const struct of_device_id atmel_udc_dt_ids[] = { > - { .compatible = "atmel,at91sam9rl-udc", .data = &at91sam9rl_errata }, > - { .compatible = "atmel,at91sam9g45-udc", .data = &at91sam9g45_errata }, > - { .compatible = "atmel,sama5d3-udc" }, > + { .compatible = "atmel,at91sam9rl-udc", .data = &udc_at91sam9rl_cfg }, > + { .compatible = "atmel,at91sam9g45-udc", .data = &udc_at91sam9g45_cfg }, > + { .compatible = "atmel,sama5d3-udc", .data = &udc_sama5d3_cfg }, > { /* sentinel */ } > }; > > @@ -2052,18 +2098,19 @@ MODULE_DEVICE_TABLE(of, atmel_udc_dt_ids); > static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, > struct usba_udc *udc) > { > - u32 val; > struct device_node *np = pdev->dev.of_node; > const struct of_device_id *match; > struct device_node *pp; > int i, ret; > struct usba_ep *eps, *ep; > + const struct usba_udc_config *udc_config; > > match = of_match_node(atmel_udc_dt_ids, np); > if (!match) > return ERR_PTR(-EINVAL); > > - udc->errata = match->data; > + udc_config = match->data; > + udc->errata = udc_config->errata; > udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9g45-pmc"); > if (IS_ERR(udc->pmc)) > udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9rl-pmc"); > @@ -2079,8 +2126,7 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, > > if (fifo_mode == 0) { > pp = NULL; > - while ((pp = of_get_next_child(np, pp))) > - udc->num_ep++; > + udc->num_ep = udc_config->num_ep; > udc->configured_ep = 1; > } else { > udc->num_ep = usba_config_fifo_table(udc); > @@ -2097,52 +2143,38 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, > > pp = NULL; > i = 0; > - while ((pp = of_get_next_child(np, pp)) && i < udc->num_ep) { > + while (i < udc->num_ep) { > + const struct usba_ep_config *ep_cfg = &udc_config->config[i]; > + > ep = &eps[i]; > > - ret = of_property_read_u32(pp, "reg", &val); > - if (ret) { > - dev_err(&pdev->dev, "of_probe: reg error(%d)\n", ret); > - goto err; > - } > - ep->index = fifo_mode ? udc->fifo_cfg[i].hw_ep_num : val; > + ep->index = fifo_mode ? udc->fifo_cfg[i].hw_ep_num : i; > + > + /* Only the first EP is 64 bytes */ > + if (ep->index == 0) > + ep->fifo_size = 64; > + else > + ep->fifo_size = 1024; > > - ret = of_property_read_u32(pp, "atmel,fifo-size", &val); > - if (ret) { > - dev_err(&pdev->dev, "of_probe: fifo-size error(%d)\n", ret); > - goto err; > - } > if (fifo_mode) { > - if (val < udc->fifo_cfg[i].fifo_size) { > + if (ep->fifo_size < udc->fifo_cfg[i].fifo_size) > dev_warn(&pdev->dev, > - "Using max fifo-size value from DT\n"); > - ep->fifo_size = val; > - } else { > + "Using default max fifo-size value\n"); > + 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 = ep_cfg->nr_banks; > if (fifo_mode) { > - if (val < udc->fifo_cfg[i].nr_banks) { > + if (ep->nr_banks < udc->fifo_cfg[i].nr_banks) > dev_warn(&pdev->dev, > - "Using max nb-banks value from DT\n"); > - ep->nr_banks = val; > - } else { > + "Using default max nb-banks value\n"); > + 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"); > + ep->can_dma = ep_cfg->can_dma; > + ep->can_isoc = ep_cfg->can_isoc; > > sprintf(ep->name, "ep%d", ep->index); > ep->ep.name = ep->name; > diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.h b/drivers/usb/gadget/udc/atmel_usba_udc.h > index a0225e4543d4..48e332439ed5 100644 > --- a/drivers/usb/gadget/udc/atmel_usba_udc.h > +++ b/drivers/usb/gadget/udc/atmel_usba_udc.h > @@ -290,6 +290,12 @@ struct usba_ep { > #endif > }; > > +struct usba_ep_config { > + u8 nr_banks; > + unsigned int can_dma:1; > + unsigned int can_isoc:1; > +}; > + > struct usba_request { > struct usb_request req; > struct list_head queue; > @@ -307,6 +313,12 @@ struct usba_udc_errata { > void (*pulse_bias)(struct usba_udc *udc); > }; > > +struct usba_udc_config { > + const struct usba_udc_errata *errata; > + const struct usba_ep_config *config; > + const int num_ep; > +}; > + > struct usba_udc { > /* Protect hw registers from concurrent modifications */ > spinlock_t lock; > -- > 2.24.0.rc1 > -- Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] usb: gadget: udc: atmel: Don't use DT to configure end point 2019-11-22 14:50 ` Gregory CLEMENT @ 2019-11-22 16:02 ` Cristian.Birsan 0 siblings, 0 replies; 8+ messages in thread From: Cristian.Birsan @ 2019-11-22 16:02 UTC (permalink / raw) To: gregory.clement, balbi, gregkh, stern, linux-usb, linux-kernel Cc: robh+dt, devicetree, Nicolas.Ferre, alexandre.belloni, Ludovic.Desroches, linux-arm-kernel, thomas.petazzoni On 11/22/19 4:50 PM, Gregory CLEMENT wrote: > Hello, > >> The endpoint configuration used to be stored in the device tree, >> however the configuration depend on the "version" of the controller >> itself. >> >> This information is already documented by the compatible string. It >> then possible to just rely on the compatible string and completely >> remove the full ep configuration done in the device tree as it was >> already the case for all the other USB device controller. > > Do you have any feedback about this patch ? > > The binding being reviewed is there any chance that this patch will be > merged? Hi Gregory, Thank you for sending the patch. It looks good to me. I checked it briefly on sama5d2 with the in kernel cdc-acm. > > Thanks, > > Gregory > > >> >> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> Acked-by: Cristian Birsan <cristian.birsan@microchip.com> >> --- >> drivers/usb/gadget/udc/atmel_usba_udc.c | 112 +++++++++++++++--------- >> drivers/usb/gadget/udc/atmel_usba_udc.h | 12 +++ >> 2 files changed, 84 insertions(+), 40 deletions(-) >> >> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c >> index 86ffc8307864..2db833caeb09 100644 >> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c >> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c >> @@ -2040,10 +2040,56 @@ static const struct usba_udc_errata at91sam9g45_errata = { >> .pulse_bias = at91sam9g45_pulse_bias, >> }; >> >> +static const struct usba_ep_config ep_config_sam9[] __initconst = { >> + { .nr_banks = 1 }, /* ep 0 */ >> + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 1 */ >> + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 2 */ >> + { .nr_banks = 3, .can_dma = 1 }, /* ep 3 */ >> + { .nr_banks = 3, .can_dma = 1 }, /* ep 4 */ >> + { .nr_banks = 3, .can_dma = 1, .can_isoc = 1 }, /* ep 5 */ >> + { .nr_banks = 3, .can_dma = 1, .can_isoc = 1 }, /* ep 6 */ >> +}; >> + >> +static const struct usba_ep_config ep_config_sama5[] __initconst = { >> + { .nr_banks = 1 }, /* ep 0 */ >> + { .nr_banks = 3, .can_dma = 1, .can_isoc = 1 }, /* ep 1 */ >> + { .nr_banks = 3, .can_dma = 1, .can_isoc = 1 }, /* ep 2 */ >> + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 3 */ >> + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 4 */ >> + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 5 */ >> + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 6 */ >> + { .nr_banks = 2, .can_dma = 1, .can_isoc = 1 }, /* ep 7 */ >> + { .nr_banks = 2, .can_isoc = 1 }, /* ep 8 */ >> + { .nr_banks = 2, .can_isoc = 1 }, /* ep 9 */ >> + { .nr_banks = 2, .can_isoc = 1 }, /* ep 10 */ >> + { .nr_banks = 2, .can_isoc = 1 }, /* ep 11 */ >> + { .nr_banks = 2, .can_isoc = 1 }, /* ep 12 */ >> + { .nr_banks = 2, .can_isoc = 1 }, /* ep 13 */ >> + { .nr_banks = 2, .can_isoc = 1 }, /* ep 14 */ >> + { .nr_banks = 2, .can_isoc = 1 }, /* ep 15 */ >> +}; >> + >> +static const struct usba_udc_config udc_at91sam9rl_cfg = { >> + .errata = &at91sam9rl_errata, >> + .config = ep_config_sam9, >> + .num_ep = ARRAY_SIZE(ep_config_sam9), >> +}; >> + >> +static const struct usba_udc_config udc_at91sam9g45_cfg = { >> + .errata = &at91sam9g45_errata, >> + .config = ep_config_sam9, >> + .num_ep = ARRAY_SIZE(ep_config_sam9), >> +}; >> + >> +static const struct usba_udc_config udc_sama5d3_cfg = { >> + .config = ep_config_sama5, >> + .num_ep = ARRAY_SIZE(ep_config_sama5), >> +}; >> + >> static const struct of_device_id atmel_udc_dt_ids[] = { >> - { .compatible = "atmel,at91sam9rl-udc", .data = &at91sam9rl_errata }, >> - { .compatible = "atmel,at91sam9g45-udc", .data = &at91sam9g45_errata }, >> - { .compatible = "atmel,sama5d3-udc" }, >> + { .compatible = "atmel,at91sam9rl-udc", .data = &udc_at91sam9rl_cfg }, >> + { .compatible = "atmel,at91sam9g45-udc", .data = &udc_at91sam9g45_cfg }, >> + { .compatible = "atmel,sama5d3-udc", .data = &udc_sama5d3_cfg }, >> { /* sentinel */ } >> }; >> >> @@ -2052,18 +2098,19 @@ MODULE_DEVICE_TABLE(of, atmel_udc_dt_ids); >> static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, >> struct usba_udc *udc) >> { >> - u32 val; >> struct device_node *np = pdev->dev.of_node; >> const struct of_device_id *match; >> struct device_node *pp; >> int i, ret; >> struct usba_ep *eps, *ep; >> + const struct usba_udc_config *udc_config; >> >> match = of_match_node(atmel_udc_dt_ids, np); >> if (!match) >> return ERR_PTR(-EINVAL); >> >> - udc->errata = match->data; >> + udc_config = match->data; >> + udc->errata = udc_config->errata; >> udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9g45-pmc"); >> if (IS_ERR(udc->pmc)) >> udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9rl-pmc"); >> @@ -2079,8 +2126,7 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, >> >> if (fifo_mode == 0) { >> pp = NULL; >> - while ((pp = of_get_next_child(np, pp))) >> - udc->num_ep++; >> + udc->num_ep = udc_config->num_ep; >> udc->configured_ep = 1; >> } else { >> udc->num_ep = usba_config_fifo_table(udc); >> @@ -2097,52 +2143,38 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, >> >> pp = NULL; >> i = 0; >> - while ((pp = of_get_next_child(np, pp)) && i < udc->num_ep) { >> + while (i < udc->num_ep) { >> + const struct usba_ep_config *ep_cfg = &udc_config->config[i]; >> + >> ep = &eps[i]; >> >> - ret = of_property_read_u32(pp, "reg", &val); >> - if (ret) { >> - dev_err(&pdev->dev, "of_probe: reg error(%d)\n", ret); >> - goto err; >> - } >> - ep->index = fifo_mode ? udc->fifo_cfg[i].hw_ep_num : val; >> + ep->index = fifo_mode ? udc->fifo_cfg[i].hw_ep_num : i; >> + >> + /* Only the first EP is 64 bytes */ >> + if (ep->index == 0) >> + ep->fifo_size = 64; >> + else >> + ep->fifo_size = 1024; >> >> - ret = of_property_read_u32(pp, "atmel,fifo-size", &val); >> - if (ret) { >> - dev_err(&pdev->dev, "of_probe: fifo-size error(%d)\n", ret); >> - goto err; >> - } >> if (fifo_mode) { >> - if (val < udc->fifo_cfg[i].fifo_size) { >> + if (ep->fifo_size < udc->fifo_cfg[i].fifo_size) >> dev_warn(&pdev->dev, >> - "Using max fifo-size value from DT\n"); >> - ep->fifo_size = val; >> - } else { >> + "Using default max fifo-size value\n"); >> + 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 = ep_cfg->nr_banks; >> if (fifo_mode) { >> - if (val < udc->fifo_cfg[i].nr_banks) { >> + if (ep->nr_banks < udc->fifo_cfg[i].nr_banks) >> dev_warn(&pdev->dev, >> - "Using max nb-banks value from DT\n"); >> - ep->nr_banks = val; >> - } else { >> + "Using default max nb-banks value\n"); >> + 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"); >> + ep->can_dma = ep_cfg->can_dma; >> + ep->can_isoc = ep_cfg->can_isoc; >> >> sprintf(ep->name, "ep%d", ep->index); >> ep->ep.name = ep->name; >> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.h b/drivers/usb/gadget/udc/atmel_usba_udc.h >> index a0225e4543d4..48e332439ed5 100644 >> --- a/drivers/usb/gadget/udc/atmel_usba_udc.h >> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.h >> @@ -290,6 +290,12 @@ struct usba_ep { >> #endif >> }; >> >> +struct usba_ep_config { >> + u8 nr_banks; >> + unsigned int can_dma:1; >> + unsigned int can_isoc:1; >> +}; >> + >> struct usba_request { >> struct usb_request req; >> struct list_head queue; >> @@ -307,6 +313,12 @@ struct usba_udc_errata { >> void (*pulse_bias)(struct usba_udc *udc); >> }; >> >> +struct usba_udc_config { >> + const struct usba_udc_errata *errata; >> + const struct usba_ep_config *config; >> + const int num_ep; >> +}; >> + >> struct usba_udc { >> /* Protect hw registers from concurrent modifications */ >> spinlock_t lock; >> -- >> 2.24.0.rc1 >> > > -- > Gregory Clement, Bootlin > Embedded Linux and Kernel engineering > http://bootlin.com > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] dt-bindings: usb: atmel: Mark EP child node as deprecated 2019-11-07 15:31 [PATCH 0/3] Remove the USB EP configuration from device tree Gregory CLEMENT 2019-11-07 15:31 ` [PATCH 1/3] usb: gadget: udc: atmel: Don't use DT to configure end point Gregory CLEMENT @ 2019-11-07 15:31 ` Gregory CLEMENT 2019-11-14 1:30 ` Rob Herring 2019-11-07 15:31 ` [PATCH 3/3] ARM: dts: at91: Remove the USB EP child node Gregory CLEMENT 2 siblings, 1 reply; 8+ messages in thread From: Gregory CLEMENT @ 2019-11-07 15:31 UTC (permalink / raw) To: Cristian Birsan, Felipe Balbi, Greg Kroah-Hartman, Alan Stern, linux-usb, linux-kernel Cc: Rob Herring, devicetree, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel, Thomas Petazzoni, Gregory CLEMENT There is no need to describe the end point in the deice tree. These properties won't be use anymore, so mark them as deprecated to keep the old device tree documented. Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> --- .../devicetree/bindings/usb/atmel-usb.txt | 56 +------------------ 1 file changed, 3 insertions(+), 53 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/atmel-usb.txt b/Documentation/devicetree/bindings/usb/atmel-usb.txt index 44e80153b148..423b99a8fd97 100644 --- a/Documentation/devicetree/bindings/usb/atmel-usb.txt +++ b/Documentation/devicetree/bindings/usb/atmel-usb.txt @@ -88,13 +88,15 @@ Required properties: - clock-names: Should contain two strings "pclk" for the peripheral clock "hclk" for the host clock + +Deprecated property: - ep childnode: To specify the number of endpoints and their properties. Optional properties: - atmel,vbus-gpio: If present, specifies a gpio that allows to detect whether vbus is present (USB is connected). -Required child node properties: +Deprecated child node properties: - name: Name of the endpoint. - reg: Num of the endpoint. - atmel,fifo-size: Size of the fifo. @@ -112,56 +114,4 @@ usb2: gadget@fff78000 { clocks = <&utmi>, <&udphs_clk>; clock-names = "hclk", "pclk"; atmel,vbus-gpio = <&pioB 19 0>; - - ep@0 { - reg = <0>; - atmel,fifo-size = <64>; - atmel,nb-banks = <1>; - }; - - ep@1 { - reg = <1>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@2 { - reg = <2>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@3 { - reg = <3>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - }; - - ep@4 { - reg = <4>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - }; - - ep@5 { - reg = <5>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@6 { - reg = <6>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; }; -- 2.24.0.rc1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] dt-bindings: usb: atmel: Mark EP child node as deprecated 2019-11-07 15:31 ` [PATCH 2/3] dt-bindings: usb: atmel: Mark EP child node as deprecated Gregory CLEMENT @ 2019-11-14 1:30 ` Rob Herring 0 siblings, 0 replies; 8+ messages in thread From: Rob Herring @ 2019-11-14 1:30 UTC (permalink / raw) To: Gregory CLEMENT Cc: Cristian Birsan, Felipe Balbi, Greg Kroah-Hartman, Alan Stern, linux-usb, linux-kernel, devicetree, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel, Thomas Petazzoni, Gregory CLEMENT On Thu, 7 Nov 2019 16:31:27 +0100, Gregory CLEMENT wrote: > There is no need to describe the end point in the deice tree. These > properties won't be use anymore, so mark them as deprecated to keep > the old device tree documented. > > Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> > --- > .../devicetree/bindings/usb/atmel-usb.txt | 56 +------------------ > 1 file changed, 3 insertions(+), 53 deletions(-) > Reviewed-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] ARM: dts: at91: Remove the USB EP child node 2019-11-07 15:31 [PATCH 0/3] Remove the USB EP configuration from device tree Gregory CLEMENT 2019-11-07 15:31 ` [PATCH 1/3] usb: gadget: udc: atmel: Don't use DT to configure end point Gregory CLEMENT 2019-11-07 15:31 ` [PATCH 2/3] dt-bindings: usb: atmel: Mark EP child node as deprecated Gregory CLEMENT @ 2019-11-07 15:31 ` Gregory CLEMENT 2019-11-22 17:22 ` Robin Murphy 2 siblings, 1 reply; 8+ messages in thread From: Gregory CLEMENT @ 2019-11-07 15:31 UTC (permalink / raw) To: Cristian Birsan, Felipe Balbi, Greg Kroah-Hartman, Alan Stern, linux-usb, linux-kernel Cc: Rob Herring, devicetree, Nicolas Ferre, Alexandre Belloni, Ludovic Desroches, linux-arm-kernel, Thomas Petazzoni, Gregory CLEMENT The endpoint configuration used to be stored in the device tree, however the configuration depend on the "version" of the controller itself. Then the EP child node are useless and describe as deprecated in the documentation binding: remove all the nodes from the SoC device tree file. Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> --- arch/arm/boot/dts/at91sam9g45.dtsi | 52 ------------- arch/arm/boot/dts/at91sam9rl.dtsi | 52 ------------- arch/arm/boot/dts/at91sam9x5.dtsi | 52 ------------- arch/arm/boot/dts/sama5d2.dtsi | 118 ----------------------------- arch/arm/boot/dts/sama5d3.dtsi | 105 ------------------------- arch/arm/boot/dts/sama5d4.dtsi | 118 ----------------------------- 6 files changed, 497 deletions(-) diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index 691c95ea6175..63bfe546cd8d 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi @@ -1204,58 +1204,6 @@ clocks = <&udphs_clk>, <&utmi>; clock-names = "pclk", "hclk"; status = "disabled"; - - ep@0 { - reg = <0>; - atmel,fifo-size = <64>; - atmel,nb-banks = <1>; - }; - - ep@1 { - reg = <1>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@2 { - reg = <2>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@3 { - reg = <3>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - }; - - ep@4 { - reg = <4>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - }; - - ep@5 { - reg = <5>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@6 { - reg = <6>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; }; clk32k: sckc@fffffd50 { diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi index 8643b7151565..e118bacb7d7c 100644 --- a/arch/arm/boot/dts/at91sam9rl.dtsi +++ b/arch/arm/boot/dts/at91sam9rl.dtsi @@ -308,58 +308,6 @@ clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_CORE PMC_UTMI>; clock-names = "pclk", "hclk"; status = "disabled"; - - ep@0 { - reg = <0>; - atmel,fifo-size = <64>; - atmel,nb-banks = <1>; - }; - - ep@1 { - reg = <1>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@2 { - reg = <2>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@3 { - reg = <3>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - }; - - ep@4 { - reg = <4>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - }; - - ep@5 { - reg = <5>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@6 { - reg = <6>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; }; dma0: dma-controller@ffffe600 { diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 7c2eb93f8cac..685a1b9f3ae5 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi @@ -876,58 +876,6 @@ clocks = <&pmc PMC_TYPE_CORE PMC_UTMI>, <&pmc PMC_TYPE_PERIPHERAL 23>; clock-names = "hclk", "pclk"; status = "disabled"; - - ep@0 { - reg = <0>; - atmel,fifo-size = <64>; - atmel,nb-banks = <1>; - }; - - ep@1 { - reg = <1>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@2 { - reg = <2>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@3 { - reg = <3>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - }; - - ep@4 { - reg = <4>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - }; - - ep@5 { - reg = <5>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@6 { - reg = <6>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; }; watchdog: watchdog@fffffe40 { diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi index 2e2c1a7b1d1d..daafcffbe033 100644 --- a/arch/arm/boot/dts/sama5d2.dtsi +++ b/arch/arm/boot/dts/sama5d2.dtsi @@ -122,124 +122,6 @@ clocks = <&pmc PMC_TYPE_PERIPHERAL 42>, <&pmc PMC_TYPE_CORE PMC_UTMI>; clock-names = "pclk", "hclk"; status = "disabled"; - - ep@0 { - reg = <0>; - atmel,fifo-size = <64>; - atmel,nb-banks = <1>; - }; - - ep@1 { - reg = <1>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@2 { - reg = <2>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@3 { - reg = <3>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@4 { - reg = <4>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@5 { - reg = <5>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@6 { - reg = <6>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@7 { - reg = <7>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@8 { - reg = <8>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@9 { - reg = <9>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@10 { - reg = <10>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@11 { - reg = <11>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@12 { - reg = <12>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@13 { - reg = <13>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@14 { - reg = <14>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@15 { - reg = <15>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; }; usb1: ohci@400000 { diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi index f770aace0efd..dfd095f33f95 100644 --- a/arch/arm/boot/dts/sama5d3.dtsi +++ b/arch/arm/boot/dts/sama5d3.dtsi @@ -1402,111 +1402,6 @@ clocks = <&udphs_clk>, <&utmi>; clock-names = "pclk", "hclk"; status = "disabled"; - - ep@0 { - reg = <0>; - atmel,fifo-size = <64>; - atmel,nb-banks = <1>; - }; - - ep@1 { - reg = <1>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@2 { - reg = <2>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@3 { - reg = <3>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - }; - - ep@4 { - reg = <4>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - }; - - ep@5 { - reg = <5>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - }; - - ep@6 { - reg = <6>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - }; - - ep@7 { - reg = <7>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - }; - - ep@8 { - reg = <8>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - }; - - ep@9 { - reg = <9>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - }; - - ep@10 { - reg = <10>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - }; - - ep@11 { - reg = <11>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - }; - - ep@12 { - reg = <12>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - }; - - ep@13 { - reg = <13>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - }; - - ep@14 { - reg = <14>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - }; - - ep@15 { - reg = <15>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - }; }; usb1: ohci@600000 { diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi index 6ab27a7b388d..0ece6b22d287 100644 --- a/arch/arm/boot/dts/sama5d4.dtsi +++ b/arch/arm/boot/dts/sama5d4.dtsi @@ -105,124 +105,6 @@ clocks = <&pmc PMC_TYPE_PERIPHERAL 47>, <&pmc PMC_TYPE_CORE PMC_UTMI>; clock-names = "pclk", "hclk"; status = "disabled"; - - ep@0 { - reg = <0>; - atmel,fifo-size = <64>; - atmel,nb-banks = <1>; - }; - - ep@1 { - reg = <1>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@2 { - reg = <2>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <3>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@3 { - reg = <3>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@4 { - reg = <4>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@5 { - reg = <5>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@6 { - reg = <6>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@7 { - reg = <7>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-dma; - atmel,can-isoc; - }; - - ep@8 { - reg = <8>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@9 { - reg = <9>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@10 { - reg = <10>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@11 { - reg = <11>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@12 { - reg = <12>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@13 { - reg = <13>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@14 { - reg = <14>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; - - ep@15 { - reg = <15>; - atmel,fifo-size = <1024>; - atmel,nb-banks = <2>; - atmel,can-isoc; - }; }; usb1: ohci@500000 { -- 2.24.0.rc1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] ARM: dts: at91: Remove the USB EP child node 2019-11-07 15:31 ` [PATCH 3/3] ARM: dts: at91: Remove the USB EP child node Gregory CLEMENT @ 2019-11-22 17:22 ` Robin Murphy 0 siblings, 0 replies; 8+ messages in thread From: Robin Murphy @ 2019-11-22 17:22 UTC (permalink / raw) To: Gregory CLEMENT, Cristian Birsan, Felipe Balbi, Greg Kroah-Hartman, Alan Stern, linux-usb, linux-kernel Cc: devicetree, Alexandre Belloni, Ludovic Desroches, Rob Herring, Thomas Petazzoni, linux-arm-kernel On 07/11/2019 3:31 pm, Gregory CLEMENT wrote: > The endpoint configuration used to be stored in the device tree, > however the configuration depend on the "version" of the controller > itself. > > Then the EP child node are useless and describe as deprecated in the > documentation binding: remove all the nodes from the SoC device tree > file. Just as a drive-by comment, it's presumably worth getting rid of the #address-cells and #size-cells properties too (here and in the binding example). Robin. > Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> > --- > arch/arm/boot/dts/at91sam9g45.dtsi | 52 ------------- > arch/arm/boot/dts/at91sam9rl.dtsi | 52 ------------- > arch/arm/boot/dts/at91sam9x5.dtsi | 52 ------------- > arch/arm/boot/dts/sama5d2.dtsi | 118 ----------------------------- > arch/arm/boot/dts/sama5d3.dtsi | 105 ------------------------- > arch/arm/boot/dts/sama5d4.dtsi | 118 ----------------------------- > 6 files changed, 497 deletions(-) > > diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi > index 691c95ea6175..63bfe546cd8d 100644 > --- a/arch/arm/boot/dts/at91sam9g45.dtsi > +++ b/arch/arm/boot/dts/at91sam9g45.dtsi > @@ -1204,58 +1204,6 @@ > clocks = <&udphs_clk>, <&utmi>; > clock-names = "pclk", "hclk"; > status = "disabled"; > - > - ep@0 { > - reg = <0>; > - atmel,fifo-size = <64>; > - atmel,nb-banks = <1>; > - }; > - > - ep@1 { > - reg = <1>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@2 { > - reg = <2>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@3 { > - reg = <3>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - }; > - > - ep@4 { > - reg = <4>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - }; > - > - ep@5 { > - reg = <5>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@6 { > - reg = <6>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > }; > > clk32k: sckc@fffffd50 { > diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi > index 8643b7151565..e118bacb7d7c 100644 > --- a/arch/arm/boot/dts/at91sam9rl.dtsi > +++ b/arch/arm/boot/dts/at91sam9rl.dtsi > @@ -308,58 +308,6 @@ > clocks = <&pmc PMC_TYPE_PERIPHERAL 22>, <&pmc PMC_TYPE_CORE PMC_UTMI>; > clock-names = "pclk", "hclk"; > status = "disabled"; > - > - ep@0 { > - reg = <0>; > - atmel,fifo-size = <64>; > - atmel,nb-banks = <1>; > - }; > - > - ep@1 { > - reg = <1>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@2 { > - reg = <2>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@3 { > - reg = <3>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - }; > - > - ep@4 { > - reg = <4>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - }; > - > - ep@5 { > - reg = <5>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@6 { > - reg = <6>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > }; > > dma0: dma-controller@ffffe600 { > diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi > index 7c2eb93f8cac..685a1b9f3ae5 100644 > --- a/arch/arm/boot/dts/at91sam9x5.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5.dtsi > @@ -876,58 +876,6 @@ > clocks = <&pmc PMC_TYPE_CORE PMC_UTMI>, <&pmc PMC_TYPE_PERIPHERAL 23>; > clock-names = "hclk", "pclk"; > status = "disabled"; > - > - ep@0 { > - reg = <0>; > - atmel,fifo-size = <64>; > - atmel,nb-banks = <1>; > - }; > - > - ep@1 { > - reg = <1>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@2 { > - reg = <2>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@3 { > - reg = <3>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - }; > - > - ep@4 { > - reg = <4>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - }; > - > - ep@5 { > - reg = <5>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@6 { > - reg = <6>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > }; > > watchdog: watchdog@fffffe40 { > diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi > index 2e2c1a7b1d1d..daafcffbe033 100644 > --- a/arch/arm/boot/dts/sama5d2.dtsi > +++ b/arch/arm/boot/dts/sama5d2.dtsi > @@ -122,124 +122,6 @@ > clocks = <&pmc PMC_TYPE_PERIPHERAL 42>, <&pmc PMC_TYPE_CORE PMC_UTMI>; > clock-names = "pclk", "hclk"; > status = "disabled"; > - > - ep@0 { > - reg = <0>; > - atmel,fifo-size = <64>; > - atmel,nb-banks = <1>; > - }; > - > - ep@1 { > - reg = <1>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@2 { > - reg = <2>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@3 { > - reg = <3>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@4 { > - reg = <4>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@5 { > - reg = <5>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@6 { > - reg = <6>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@7 { > - reg = <7>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@8 { > - reg = <8>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@9 { > - reg = <9>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@10 { > - reg = <10>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@11 { > - reg = <11>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@12 { > - reg = <12>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@13 { > - reg = <13>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@14 { > - reg = <14>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@15 { > - reg = <15>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > }; > > usb1: ohci@400000 { > diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi > index f770aace0efd..dfd095f33f95 100644 > --- a/arch/arm/boot/dts/sama5d3.dtsi > +++ b/arch/arm/boot/dts/sama5d3.dtsi > @@ -1402,111 +1402,6 @@ > clocks = <&udphs_clk>, <&utmi>; > clock-names = "pclk", "hclk"; > status = "disabled"; > - > - ep@0 { > - reg = <0>; > - atmel,fifo-size = <64>; > - atmel,nb-banks = <1>; > - }; > - > - ep@1 { > - reg = <1>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@2 { > - reg = <2>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@3 { > - reg = <3>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - }; > - > - ep@4 { > - reg = <4>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - }; > - > - ep@5 { > - reg = <5>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - }; > - > - ep@6 { > - reg = <6>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - }; > - > - ep@7 { > - reg = <7>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - }; > - > - ep@8 { > - reg = <8>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - }; > - > - ep@9 { > - reg = <9>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - }; > - > - ep@10 { > - reg = <10>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - }; > - > - ep@11 { > - reg = <11>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - }; > - > - ep@12 { > - reg = <12>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - }; > - > - ep@13 { > - reg = <13>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - }; > - > - ep@14 { > - reg = <14>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - }; > - > - ep@15 { > - reg = <15>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - }; > }; > > usb1: ohci@600000 { > diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi > index 6ab27a7b388d..0ece6b22d287 100644 > --- a/arch/arm/boot/dts/sama5d4.dtsi > +++ b/arch/arm/boot/dts/sama5d4.dtsi > @@ -105,124 +105,6 @@ > clocks = <&pmc PMC_TYPE_PERIPHERAL 47>, <&pmc PMC_TYPE_CORE PMC_UTMI>; > clock-names = "pclk", "hclk"; > status = "disabled"; > - > - ep@0 { > - reg = <0>; > - atmel,fifo-size = <64>; > - atmel,nb-banks = <1>; > - }; > - > - ep@1 { > - reg = <1>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@2 { > - reg = <2>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <3>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@3 { > - reg = <3>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@4 { > - reg = <4>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@5 { > - reg = <5>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@6 { > - reg = <6>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@7 { > - reg = <7>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-dma; > - atmel,can-isoc; > - }; > - > - ep@8 { > - reg = <8>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@9 { > - reg = <9>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@10 { > - reg = <10>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@11 { > - reg = <11>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@12 { > - reg = <12>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@13 { > - reg = <13>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@14 { > - reg = <14>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > - > - ep@15 { > - reg = <15>; > - atmel,fifo-size = <1024>; > - atmel,nb-banks = <2>; > - atmel,can-isoc; > - }; > }; > > usb1: ohci@500000 { > ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-11-22 17:22 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-11-07 15:31 [PATCH 0/3] Remove the USB EP configuration from device tree Gregory CLEMENT 2019-11-07 15:31 ` [PATCH 1/3] usb: gadget: udc: atmel: Don't use DT to configure end point Gregory CLEMENT 2019-11-22 14:50 ` Gregory CLEMENT 2019-11-22 16:02 ` Cristian.Birsan 2019-11-07 15:31 ` [PATCH 2/3] dt-bindings: usb: atmel: Mark EP child node as deprecated Gregory CLEMENT 2019-11-14 1:30 ` Rob Herring 2019-11-07 15:31 ` [PATCH 3/3] ARM: dts: at91: Remove the USB EP child node Gregory CLEMENT 2019-11-22 17:22 ` Robin Murphy
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).