[PATCH v2 0/3]
v2 cover [PATCH v2 0/3]
Hello,
A few month ago this series was sent and has not been merged while it didn't have anything against it. I've ported the series onto v5.7-rc1, added the acked by and reviewed by received on the first series and took into account the comment from Robin Murphy for the last patch.
For the record this the original cover letter explaining the purpose of this series:
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 | 54 -------- arch/arm/boot/dts/at91sam9rl.dtsi | 54 -------- arch/arm/boot/dts/at91sam9x5.dtsi | 54 -------- arch/arm/boot/dts/sama5d2.dtsi | 120 ------------------ arch/arm/boot/dts/sama5d3.dtsi | 107 ---------------- arch/arm/boot/dts/sama5d4.dtsi | 120 ------------------ drivers/usb/gadget/udc/atmel_usba_udc.c | 112 ++++++++++------ drivers/usb/gadget/udc/atmel_usba_udc.h | 12 ++ 9 files changed, 87 insertions(+), 602 deletions(-)
Signature · 1 line
2.26.2
PATCH v2 1/3 usb: gadget: udc: atmel: Don't use DT to configure end point
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.
--- 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(-)
drivers/usb/gadget/udc/atmel_usba_udc.c +72 -40
@@ -2043,10 +2043,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 */ } };
@@ -2055,18 +2101,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" );
@@ -2082,8 +2129,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);
@@ -2100,52 +2146,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;
drivers/usb/gadget/udc/atmel_usba_udc.h +12 -0
@@ -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;
Signature · 7 lines
2.26.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 2/3 dt-bindings: usb: atmel: Mark EP child node as deprecated
In reply to Gregory CLEMENTThere 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.
--- .../devicetree/bindings/usb/atmel-usb.txt | 56 +------------------ 1 file changed, 3 insertions(+), 53 deletions(-)
Documentation/devicetree/bindings/usb/atmel-usb.txt +3 -53
@@ -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; - }; };
Signature · 1 line
2.26.2
PATCH v2 3/3 ARM: dts: at91: Remove the USB EP child node
In reply to Gregory CLEMENTThe 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. Remove also the #address-cells and #size-cells properties that are no longer needed.
--- arch/arm/boot/dts/at91sam9g45.dtsi | 54 ------------- arch/arm/boot/dts/at91sam9rl.dtsi | 54 ------------- arch/arm/boot/dts/at91sam9x5.dtsi | 54 ------------- arch/arm/boot/dts/sama5d2.dtsi | 120 ----------------------------- arch/arm/boot/dts/sama5d3.dtsi | 107 ------------------------- arch/arm/boot/dts/sama5d4.dtsi | 120 ----------------------------- 6 files changed, 509 deletions(-)
arch/arm/boot/dts/at91sam9g45.dtsi +0 -54
@@ -1195,8 +1195,6 @@ spi1: spi@fffa8000 { }; usb2: gadget@fff78000 { - #address-cells = <1>; - #size-cells = <0>; compatible = "atmel,at91sam9g45-udc"; reg = <0x00600000 0x80000 0xfff78000 0x400>;
@@ -1204,58 +1202,6 @@ usb2: gadget@fff78000 { 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 {
arch/arm/boot/dts/at91sam9rl.dtsi +0 -54
66 lines not on this page · raw message
arch/arm/boot/dts/at91sam9x5.dtsi +0 -54
66 lines not on this page · raw message
arch/arm/boot/dts/sama5d2.dtsi +0 -120
132 lines not on this page · raw message
arch/arm/boot/dts/sama5d3.dtsi +0 -107
119 lines not on this page · raw message
arch/arm/boot/dts/sama5d4.dtsi +0 -120
132 lines not on this page · raw message
Signature · 1 line
2.26.2
Re: [PATCH v2 0/3] Remove the USB EP configuration from device tree
In reply to Gregory CLEMENTSorry I forgot to add back the title of the series which was:
"Remove the USB EP configuration from device tree"
Gregory
Quoted 48 lines · Gregory CLEMENT
Hello,
A few month ago this series was sent and has not been merged while it didn't have anything against it. I've ported the series onto v5.7-rc1, added the acked by and reviewed by received on the first series and took into account the comment from Robin Murphy for the last patch.
For the record this the original cover letter explaining the purpose of this series:
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 | 54 -------- arch/arm/boot/dts/at91sam9rl.dtsi | 54 -------- arch/arm/boot/dts/at91sam9x5.dtsi | 54 -------- arch/arm/boot/dts/sama5d2.dtsi | 120 ------------------ arch/arm/boot/dts/sama5d3.dtsi | 107 ---------------- arch/arm/boot/dts/sama5d4.dtsi | 120 ------------------ drivers/usb/gadget/udc/atmel_usba_udc.c | 112 ++++++++++------ drivers/usb/gadget/udc/atmel_usba_udc.h | 12 ++ 9 files changed, 87 insertions(+), 602 deletions(-)Signature · 1 line
2.26.2
Signature · 3 lines
Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com