| Message ID | 20170117134540.9988-3-abailon@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jan 17, 2017 at 02:45:35PM +0100, Alexandre Bailon wrote: > In order to make CPPI 4.1 DMA driver more generic, accesses to USBSS > have been removed. So it is not required anymore to define "glue" > register's address and size in DT. > Update dsps device tree bindings. Looks like you are breaking compatibility here. Are the glue registers already in the USB node? If so, then the DMA driver just needs to ignore the first reg entry when 4 entries are present. Or add a fixup to the DT somewhere. > > Signed-off-by: Alexandre Bailon <abailon@baylibre.com> > --- > Documentation/devicetree/bindings/usb/am33xx-usb.txt | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/Documentation/devicetree/bindings/usb/am33xx-usb.txt b/Documentation/devicetree/bindings/usb/am33xx-usb.txt > index 20c2ff2..ef89010 100644 > --- a/Documentation/devicetree/bindings/usb/am33xx-usb.txt > +++ b/Documentation/devicetree/bindings/usb/am33xx-usb.txt > @@ -54,9 +54,9 @@ node. > DMA > ~~~ > - compatible: ti,am3359-cppi41 > -- reg: offset and length of the following register spaces: USBSS, USB > +- reg: offset and length of the following register spaces: USB > CPPI DMA Controller, USB CPPI DMA Scheduler, USB Queue Manager > -- reg-names: glue, controller, scheduler, queuemgr > +- reg-names: controller, scheduler, queuemgr > - #dma-cells: should be set to 2. The first number represents the > endpoint number (0 … 14 for endpoints 1 … 15 on instance 0 and 15 … 29 > for endpoints 1 … 15 on instance 1). The second number is 0 for RX and > @@ -183,11 +183,10 @@ usb: usb@47400000 { > > cppi41dma: dma-controller@07402000 { > compatible = "ti,am3359-cppi41"; > - reg = <0x47400000 0x1000 > - 0x47402000 0x1000 > + reg = <0x47402000 0x1000 > 0x47403000 0x1000 > 0x47404000 0x4000>; > - reg-names = "glue", "controller", "scheduler", "queuemgr"; > + reg-names = "controller", "scheduler", "queuemgr"; > interrupts = <17>; > interrupt-names = "glue"; > #dma-cells = <2>; > -- > 2.10.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 01/19/2017 07:15 PM, Rob Herring wrote: > On Tue, Jan 17, 2017 at 02:45:35PM +0100, Alexandre Bailon wrote: >> In order to make CPPI 4.1 DMA driver more generic, accesses to USBSS >> have been removed. So it is not required anymore to define "glue" >> register's address and size in DT. >> Update dsps device tree bindings. > > Looks like you are breaking compatibility here. > > Are the glue registers already in the USB node? If so, then the DMA > driver just needs to ignore the first reg entry when 4 entries are > present. Or add a fixup to the DT somewhere. In the v3 of the patch updating the driver, I have the made the driver compatible with the old and new bindings. It gets the index of "controller" and so just ignore "glue" if it defined. Best Regards, Alexandre > >> >> Signed-off-by: Alexandre Bailon <abailon@baylibre.com> >> --- >> Documentation/devicetree/bindings/usb/am33xx-usb.txt | 9 ++++----- >> 1 file changed, 4 insertions(+), 5 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/usb/am33xx-usb.txt b/Documentation/devicetree/bindings/usb/am33xx-usb.txt >> index 20c2ff2..ef89010 100644 >> --- a/Documentation/devicetree/bindings/usb/am33xx-usb.txt >> +++ b/Documentation/devicetree/bindings/usb/am33xx-usb.txt >> @@ -54,9 +54,9 @@ node. >> DMA >> ~~~ >> - compatible: ti,am3359-cppi41 >> -- reg: offset and length of the following register spaces: USBSS, USB >> +- reg: offset and length of the following register spaces: USB >> CPPI DMA Controller, USB CPPI DMA Scheduler, USB Queue Manager >> -- reg-names: glue, controller, scheduler, queuemgr >> +- reg-names: controller, scheduler, queuemgr >> - #dma-cells: should be set to 2. The first number represents the >> endpoint number (0 … 14 for endpoints 1 … 15 on instance 0 and 15 … 29 >> for endpoints 1 … 15 on instance 1). The second number is 0 for RX and >> @@ -183,11 +183,10 @@ usb: usb@47400000 { >> >> cppi41dma: dma-controller@07402000 { >> compatible = "ti,am3359-cppi41"; >> - reg = <0x47400000 0x1000 >> - 0x47402000 0x1000 >> + reg = <0x47402000 0x1000 >> 0x47403000 0x1000 >> 0x47404000 0x4000>; >> - reg-names = "glue", "controller", "scheduler", "queuemgr"; >> + reg-names = "controller", "scheduler", "queuemgr"; >> interrupts = <17>; >> interrupt-names = "glue"; >> #dma-cells = <2>; >> -- >> 2.10.2 >> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/usb/am33xx-usb.txt b/Documentation/devicetree/bindings/usb/am33xx-usb.txt index 20c2ff2..ef89010 100644 --- a/Documentation/devicetree/bindings/usb/am33xx-usb.txt +++ b/Documentation/devicetree/bindings/usb/am33xx-usb.txt @@ -54,9 +54,9 @@ node. DMA ~~~ - compatible: ti,am3359-cppi41 -- reg: offset and length of the following register spaces: USBSS, USB +- reg: offset and length of the following register spaces: USB CPPI DMA Controller, USB CPPI DMA Scheduler, USB Queue Manager -- reg-names: glue, controller, scheduler, queuemgr +- reg-names: controller, scheduler, queuemgr - #dma-cells: should be set to 2. The first number represents the endpoint number (0 … 14 for endpoints 1 … 15 on instance 0 and 15 … 29 for endpoints 1 … 15 on instance 1). The second number is 0 for RX and @@ -183,11 +183,10 @@ usb: usb@47400000 { cppi41dma: dma-controller@07402000 { compatible = "ti,am3359-cppi41"; - reg = <0x47400000 0x1000 - 0x47402000 0x1000 + reg = <0x47402000 0x1000 0x47403000 0x1000 0x47404000 0x4000>; - reg-names = "glue", "controller", "scheduler", "queuemgr"; + reg-names = "controller", "scheduler", "queuemgr"; interrupts = <17>; interrupt-names = "glue"; #dma-cells = <2>;
In order to make CPPI 4.1 DMA driver more generic, accesses to USBSS have been removed. So it is not required anymore to define "glue" register's address and size in DT. Update dsps device tree bindings. Signed-off-by: Alexandre Bailon <abailon@baylibre.com> --- Documentation/devicetree/bindings/usb/am33xx-usb.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)