From: Linus Walleij <[email protected]>
The commit
"dmaengine: ste_dma40: Assign memcpy channels in the driver"
had two problems:
- It assigned magic numbers to the memcpy event lines
instead of giving them symbolic names.
- It seems to have missed one of the memcpy event lines,
number 51.
This patch fixes it up.
Cc: Lee Jones <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
---
Vinod: seeking an ACK for this to take it with the rest of
Lee's patches in a DMA40 branch in ARM SoC.
---
drivers/dma/ste_dma40.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 12de79e..cd7b480 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -56,7 +56,21 @@
#define MAX(a, b) (((a) < (b)) ? (b) : (a))
/* Reserved event lines for memcpy only. */
-static int dma40_memcpy_channels[] = { 56, 57, 58, 59, 60 };
+#define DB8500_DMA_MEMCPY_EV_0 51
+#define DB8500_DMA_MEMCPY_EV_1 56
+#define DB8500_DMA_MEMCPY_EV_2 57
+#define DB8500_DMA_MEMCPY_EV_3 58
+#define DB8500_DMA_MEMCPY_EV_4 59
+#define DB8500_DMA_MEMCPY_EV_5 60
+
+static int dma40_memcpy_channels[] = {
+ DB8500_DMA_MEMCPY_EV_0,
+ DB8500_DMA_MEMCPY_EV_1,
+ DB8500_DMA_MEMCPY_EV_2,
+ DB8500_DMA_MEMCPY_EV_3,
+ DB8500_DMA_MEMCPY_EV_4,
+ DB8500_DMA_MEMCPY_EV_5,
+};
/**
* enum 40_command - The different commands and/or statuses.
--
1.7.11.3
On Fri, 03 May 2013, Linus Walleij wrote:
> From: Linus Walleij <[email protected]>
>
> The commit
> "dmaengine: ste_dma40: Assign memcpy channels in the driver"
> had two problems:
> - It assigned magic numbers to the memcpy event lines
> instead of giving them symbolic names.
> - It seems to have missed one of the memcpy event lines,
> number 51.
>
> This patch fixes it up.
Looks good to me: Acked-by Lee Jones <[email protected]>
> Cc: Lee Jones <[email protected]>
> Signed-off-by: Linus Walleij <[email protected]>
> ---
> Vinod: seeking an ACK for this to take it with the rest of
> Lee's patches in a DMA40 branch in ARM SoC.
> ---
> drivers/dma/ste_dma40.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
> index 12de79e..cd7b480 100644
> --- a/drivers/dma/ste_dma40.c
> +++ b/drivers/dma/ste_dma40.c
> @@ -56,7 +56,21 @@
> #define MAX(a, b) (((a) < (b)) ? (b) : (a))
>
> /* Reserved event lines for memcpy only. */
> -static int dma40_memcpy_channels[] = { 56, 57, 58, 59, 60 };
> +#define DB8500_DMA_MEMCPY_EV_0 51
> +#define DB8500_DMA_MEMCPY_EV_1 56
> +#define DB8500_DMA_MEMCPY_EV_2 57
> +#define DB8500_DMA_MEMCPY_EV_3 58
> +#define DB8500_DMA_MEMCPY_EV_4 59
> +#define DB8500_DMA_MEMCPY_EV_5 60
> +
> +static int dma40_memcpy_channels[] = {
> + DB8500_DMA_MEMCPY_EV_0,
> + DB8500_DMA_MEMCPY_EV_1,
> + DB8500_DMA_MEMCPY_EV_2,
> + DB8500_DMA_MEMCPY_EV_3,
> + DB8500_DMA_MEMCPY_EV_4,
> + DB8500_DMA_MEMCPY_EV_5,
> +};
>
> /**
> * enum 40_command - The different commands and/or statuses.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
On Fri, May 3, 2013 at 9:49 PM, Linus Walleij
<[email protected]> wrote:
> From: Linus Walleij <[email protected]>
>
> The commit
> "dmaengine: ste_dma40: Assign memcpy channels in the driver"
> had two problems:
> - It assigned magic numbers to the memcpy event lines
> instead of giving them symbolic names.
> - It seems to have missed one of the memcpy event lines,
> number 51.
>
> This patch fixes it up.
>
> Cc: Lee Jones <[email protected]>
> Signed-off-by: Linus Walleij <[email protected]>
> ---
> Vinod: seeking an ACK for this to take it with the rest of
> Lee's patches in a DMA40 branch in ARM SoC.
Vinod, ping on this as well...
Yours,
Linus Walleij
On Fri, May 03, 2013 at 09:49:38PM +0200, Linus Walleij wrote:
> From: Linus Walleij <[email protected]>
>
> The commit
> "dmaengine: ste_dma40: Assign memcpy channels in the driver"
> had two problems:
> - It assigned magic numbers to the memcpy event lines
> instead of giving them symbolic names.
> - It seems to have missed one of the memcpy event lines,
> number 51.
>
> This patch fixes it up.
>
> Cc: Lee Jones <[email protected]>
> Signed-off-by: Linus Walleij <[email protected]>
> ---
> Vinod: seeking an ACK for this to take it with the rest of
> Lee's patches in a DMA40 branch in ARM SoC.
> ---
Acked-by: Vinod Koul <[email protected]>
Anyone else remaining, if so pls do ping :)
--
~Vinod
> drivers/dma/ste_dma40.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
> index 12de79e..cd7b480 100644
> --- a/drivers/dma/ste_dma40.c
> +++ b/drivers/dma/ste_dma40.c
> @@ -56,7 +56,21 @@
> #define MAX(a, b) (((a) < (b)) ? (b) : (a))
>
> /* Reserved event lines for memcpy only. */
> -static int dma40_memcpy_channels[] = { 56, 57, 58, 59, 60 };
> +#define DB8500_DMA_MEMCPY_EV_0 51
> +#define DB8500_DMA_MEMCPY_EV_1 56
> +#define DB8500_DMA_MEMCPY_EV_2 57
> +#define DB8500_DMA_MEMCPY_EV_3 58
> +#define DB8500_DMA_MEMCPY_EV_4 59
> +#define DB8500_DMA_MEMCPY_EV_5 60
> +
> +static int dma40_memcpy_channels[] = {
> + DB8500_DMA_MEMCPY_EV_0,
> + DB8500_DMA_MEMCPY_EV_1,
> + DB8500_DMA_MEMCPY_EV_2,
> + DB8500_DMA_MEMCPY_EV_3,
> + DB8500_DMA_MEMCPY_EV_4,
> + DB8500_DMA_MEMCPY_EV_5,
> +};
>
> /**
> * enum 40_command - The different commands and/or statuses.
> --
> 1.7.11.3
>