| Message ID | 1430904693-1404-5-git-send-email-jenskuske@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | f008db8c00c18d3125ca551e6961e7bd9aba6503 |
| Headers | show |
On Wed, May 06, 2015 at 11:31:31AM +0200, Jens Kuske wrote: > The H3 SoC has the same dma engine as the A31 (sun6i), with a > reduced amount of endpoints and physical channels. Add the proper > config data and compatible string to support it. > > Signed-off-by: Jens Kuske <jenskuske@gmail.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Thanks! Maxime
On Wed, May 06, 2015 at 12:13:42PM +0200, Maxime Ripard wrote: > On Wed, May 06, 2015 at 11:31:31AM +0200, Jens Kuske wrote: > > The H3 SoC has the same dma engine as the A31 (sun6i), with a > > reduced amount of endpoints and physical channels. Add the proper > > config data and compatible string to support it. > > > > Signed-off-by: Jens Kuske <jenskuske@gmail.com> This looks fine to me, I think can be merged now. Do you guys want the mainatainers to pick up patches to their subsystem or merge them tgether, though don't see any dependency though
Hi Vinod, On Fri, May 08, 2015 at 09:14:26AM +0530, Vinod Koul wrote: > On Wed, May 06, 2015 at 12:13:42PM +0200, Maxime Ripard wrote: > > On Wed, May 06, 2015 at 11:31:31AM +0200, Jens Kuske wrote: > > > The H3 SoC has the same dma engine as the A31 (sun6i), with a > > > reduced amount of endpoints and physical channels. Add the proper > > > config data and compatible string to support it. > > > > > > Signed-off-by: Jens Kuske <jenskuske@gmail.com> > > This looks fine to me, I think can be merged now. Do you guys want the > mainatainers to pick up patches to their subsystem or merge them tgether, > though don't see any dependency though It can be merged through your tree, like you said there's no particular dependencies on our side. Thanks! Maxime
On Wed, May 06, 2015 at 11:31:31AM +0200, Jens Kuske wrote: > The H3 SoC has the same dma engine as the A31 (sun6i), with a > reduced amount of endpoints and physical channels. Add the proper > config data and compatible string to support it. Applied, thanks
diff --git a/Documentation/devicetree/bindings/dma/sun6i-dma.txt b/Documentation/devicetree/bindings/dma/sun6i-dma.txt index 9cdcba24d..d13c136 100644 --- a/Documentation/devicetree/bindings/dma/sun6i-dma.txt +++ b/Documentation/devicetree/bindings/dma/sun6i-dma.txt @@ -4,7 +4,10 @@ This driver follows the generic DMA bindings defined in dma.txt. Required properties: -- compatible: Must be "allwinner,sun6i-a31-dma" or "allwinner,sun8i-a23-dma" +- compatible: Must be one of + "allwinner,sun6i-a31-dma" + "allwinner,sun8i-a23-dma" + "allwinner,sun8i-h3-dma" - reg: Should contain the registers base address and length - interrupts: Should contain a reference to the interrupt used by this device - clocks: Should contain a reference to the parent AHB clock diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index 11e5365..842ff97 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -891,9 +891,21 @@ static struct sun6i_dma_config sun8i_a23_dma_cfg = { .nr_max_vchans = 37, }; +/* + * The H3 has 12 physical channels, a maximum DRQ port id of 27, + * and a total of 34 usable source and destination endpoints. + */ + +static struct sun6i_dma_config sun8i_h3_dma_cfg = { + .nr_max_channels = 12, + .nr_max_requests = 27, + .nr_max_vchans = 34, +}; + static const struct of_device_id sun6i_dma_match[] = { { .compatible = "allwinner,sun6i-a31-dma", .data = &sun6i_a31_dma_cfg }, { .compatible = "allwinner,sun8i-a23-dma", .data = &sun8i_a23_dma_cfg }, + { .compatible = "allwinner,sun8i-h3-dma", .data = &sun8i_h3_dma_cfg }, { /* sentinel */ } };
The H3 SoC has the same dma engine as the A31 (sun6i), with a reduced amount of endpoints and physical channels. Add the proper config data and compatible string to support it. Signed-off-by: Jens Kuske <jenskuske@gmail.com> --- Documentation/devicetree/bindings/dma/sun6i-dma.txt | 5 ++++- drivers/dma/sun6i-dma.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-)