Skip to contentSkip to conversation

at_hdmac: dt dma bindings update

PATCH Superseded ludovic.desroches at atmel.com 7 participants 24 messages May 30, 2013 – Jun 4, 2013 3 messages not in the archive

Subsystems (4)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover at_hdmac: dt dma bindings update

From: Ludovic Desroches <[email protected]>

Hi,

This set of patches update the dt dma binding for at_hdmac since we need one more parameter. In order to keep backward compatibility, an existing cell will be used to add this parameter. Since the content of that cell will become a magic value due to the concatenation of the two parameters, it is time to use macros.

Regards

Ludovic Desroches (3):
ARM: at91: dt: add header to define at_hdmac configuration
ARM: at91: dt: switch DMA DT bindings to pre-processor
at_hdmac: add FIFO configuration parameter to DMA DT binding

 .../devicetree/bindings/dma/atmel-dma.txt          |  7 ++++--
 arch/arm/boot/dts/at91sam9g45.dtsi                 |  5 ++--
 arch/arm/boot/dts/at91sam9n12.dtsi                 | 11 +++++----
 arch/arm/boot/dts/at91sam9x5.dtsi                  | 17 +++++++-------
 arch/arm/boot/dts/sama5d3.dtsi                     | 19 +++++++--------
 drivers/dma/at_hdmac.c                             | 25 ++++++++++++++++----
 include/dt-bindings/dma/at91.h                     | 27 ++++++++++++++++++++++
 7 files changed, 81 insertions(+), 30 deletions(-)
 create mode 100644 include/dt-bindings/dma/at91.h
Signature · 1 line
1.7.11.3
#1 lore raw

PATCH 1/3 ARM: at91: dt: add header to define at_hdmac configuration

From: Ludovic Desroches <[email protected]>

DMA-cell content is a concatenation of several values. In order to keep this stuff human readable, macros are introduced.

The values for the FIFO configuration are not the same as the ones used in the configuration register in order to keep backward compatibility. Most devices use the half FIFO configuration but USART ones have to use the ASAP configuration. This parameter was not initially planed to be into the at91 dma dt binding. The third cell will be used to store this parameter, it will become a concatenation of the FIFO configuration and of the peripheral ID. In order to keep backward compatibility i.e. FIFO configuration is equal to 0, we have to perform a translation since the value to put in the register to set half FIFO is 1.

---
 include/dt-bindings/dma/at91.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 include/dt-bindings/dma/at91.h
include/dt-bindings/dma/at91.h new file +27 -0
new file mode 100644
index 0000000..e835037
@@ -0,0 +1,27 @@
+/*
+ * This header provides macros for at91 dma bindings.
+ *
+ * Copyright (C) 2013 Ludovic Desroches <[email protected]>
+ *
+ * GPLv2 only
+ */
+
+#ifndef __DT_BINDINGS_AT91_DMA_H__
+#define __DT_BINDINGS_AT91_DMA_H__
+
+/*
+ * Source and/or destination peripheral ID
+ */
+#define AT91_DMA_CFG_PER_ID_MASK	(0xff)
+#define AT91_DMA_CFG_PER_ID(id)		(id & AT91_DMA_CFG_PER_ID_MASK)
+
+/*
+ * FIFO configuration: it defines when a request is serviced.
+ */
+#define AT91_DMA_CFG_FIFOCFG_OFFSET	(8)
+#define AT91_DMA_CFG_FIFOCFG_MASK	(0xf << AT91_DMA_CFG_FIFOCFG_OFFSET)
+#define AT91_DMA_CFG_FIFOCFG_HALF	(0x0 << AT91_DMA_CFG_FIFOCFG_OFFSET)	/* half FIFO (default behavior) */
+#define AT91_DMA_CFG_FIFOCFG_ALAP	(0x1 << AT91_DMA_CFG_FIFOCFG_OFFSET)	/* largest defined AHB burst */
+#define AT91_DMA_CFG_FIFOCFG_ASAP	(0x2 << AT91_DMA_CFG_FIFOCFG_OFFSET)	/* single AHB access */
+
+#endif /* __DT_BINDINGS_AT91_DMA_H__ */
Signature · 1 line
1.7.11.3
#2 lore raw

PATCH 1/3 ARM: at91: dt: add header to define at_hdmac configuration

include/dt-bindings/dma/at91.h line 17

Quoted 6 lines · ludovic.desroches at atmel.com
include/dt-bindings/dma/at91.h new file +6 -0
+/*
+ * Source and/or destination peripheral ID
+ */
+#define AT91_DMA_CFG_PER_ID_MASK       (0xff)
+#define AT91_DMA_CFG_PER_ID(id)                (id & AT91_DMA_CFG_PER_ID_MASK)
+

I'm a little worried about macros like this one spreading in the name of readability, and I don't see this as actual value-add here:

The output of the macro is always the same as the input, and passing an invalid number still results in an invalid output and no error message, it actually prevents us from warning about the mistake at run-time.

The other macros are fine.

Arnd

#3 lore raw

PATCH 1/3 ARM: at91: dt: add header to define at_hdmac configuration

Quoted 11 lines · Arnd Bergmann

include/dt-bindings/dma/at91.h line 17

Quoted 6 lines · ludovic.desroches at atmel.com
include/dt-bindings/dma/at91.h new file +6 -0
+/*
+ * Source and/or destination peripheral ID
+ */
+#define AT91_DMA_CFG_PER_ID_MASK       (0xff)
+#define AT91_DMA_CFG_PER_ID(id)                (id & AT91_DMA_CFG_PER_ID_MASK)
+

I'm a little worried about macros like this one spreading in the name of readability, and I don't see this as actual value-add here:

Quoted 4 lines

The output of the macro is always the same as the input, and passing an invalid number still results in an invalid output and no error message, it actually prevents us from warning about the mistake at run-time.

You are right, this macro is here only for readability in order to not have something like this:

dmas = <&dma0 AT91_DMA_CFG_FIFOCFG_ASAP | 13>

In this case, I prefer having a macro instead of using a numeric value which can stand for other things than the peripheral id and which could conflict with other parameters such as the FIFO configuration.

If adding this macro is really an issue, it could be removed of course but in this case I am in favour of readability.

Ludovic

Quoted 3 lines

The other macros are fine.

Arnd

#4 lore raw

PATCH 1/3 ARM: at91: dt: add header to define at_hdmac configuration

On 03/06/2013 09:32, Ludovic Desroches :

Quoted 20 lines · Arnd Bergmann
Quoted 11 lines · ludovic.desroches at atmel.com

include/dt-bindings/dma/at91.h line 17

Quoted 6 lines
include/dt-bindings/dma/at91.h new file +6 -0
+/*
+ * Source and/or destination peripheral ID
+ */
+#define AT91_DMA_CFG_PER_ID_MASK       (0xff)
+#define AT91_DMA_CFG_PER_ID(id)                (id & AT91_DMA_CFG_PER_ID_MASK)
+

I'm a little worried about macros like this one spreading in the name of readability, and I don't see this as actual value-add here:

Quoted 4 lines

The output of the macro is always the same as the input, and passing an invalid number still results in an invalid output and no error message, it actually prevents us from warning about the mistake at run-time.

You are right, this macro is here only for readability in order to not have something like this:

Quoted 8 lines

dmas = <&dma0 AT91_DMA_CFG_FIFOCFG_ASAP | 13>

In this case, I prefer having a macro instead of using a numeric value which can stand for other things than the peripheral id and which could conflict with other parameters such as the FIFO configuration.

If adding this macro is really an issue, it could be removed of course but in this case I am in favor of readability.

Arnd,

I think that the case highlighted by Ludovic is indeed a case where someone can be confused by the presentation of data in the cell... even if I like the use of macro as implemented by Ludovic, I do not have a strong opinion about this.

Best regards,

Signature · 1 line
Nicolas Ferre

A message that is not in the archive (sent off-list or not yet received): [email protected]

#6 lore raw

Re: [PATCH 1/3] ARM: at91: dt: add header to define at_hdmac configuration

Quoted 11 lines · Arnd Bergmann

include/dt-bindings/dma/at91.h line 17

Quoted 6 lines · On Thursday 30 May 2013, [email protected].…
include/dt-bindings/dma/at91.h new file +6 -0
+/*
+ * Source and/or destination peripheral ID
+ */
+#define AT91_DMA_CFG_PER_ID_MASK       (0xff)
+#define AT91_DMA_CFG_PER_ID(id)                (id & AT91_DMA_CFG_PER_ID_MASK)
+

I'm a little worried about macros like this one spreading in the name of readability, and I don't see this as actual value-add here:

Quoted 4 lines

The output of the macro is always the same as the input, and passing an invalid number still results in an invalid output and no error message, it actually prevents us from warning about the mistake at run-time.

You are right, this macro is here only for readability in order to not have something like this:

dmas = <&dma0 AT91_DMA_CFG_FIFOCFG_ASAP | 13>

In this case, I prefer having a macro instead of using a numeric value which can stand for other things than the peripheral id and which could conflict with other parameters such as the FIFO configuration.

If adding this macro is really an issue, it could be removed of course but in this case I am in favour of readability.

Ludovic

Quoted 3 lines

The other macros are fine.

Arnd

#7 lore raw

Re: [PATCH 1/3] ARM: at91: dt: add header to define at_hdmac configuration

In reply to Arnd Bergmann
Quoted 11 lines · Arnd Bergmann

include/dt-bindings/dma/at91.h line 17

Quoted 6 lines · On Thursday 30 May 2013, [email protected] wrote:
include/dt-bindings/dma/at91.h new file +6 -0
+/*
+ * Source and/or destination peripheral ID
+ */
+#define AT91_DMA_CFG_PER_ID_MASK       (0xff)
+#define AT91_DMA_CFG_PER_ID(id)                (id & AT91_DMA_CFG_PER_ID_MASK)
+

I'm a little worried about macros like this one spreading in the name of readability, and I don't see this as actual value-add here:

Quoted 4 lines

The output of the macro is always the same as the input, and passing an invalid number still results in an invalid output and no error message, it actually prevents us from warning about the mistake at run-time.

You are right, this macro is here only for readability in order to not have something like this:

dmas = <&dma0 AT91_DMA_CFG_FIFOCFG_ASAP | 13>

In this case, I prefer having a macro instead of using a numeric value which can stand for other things than the peripheral id and which could conflict with other parameters such as the FIFO configuration.

If adding this macro is really an issue, it could be removed of course but in this case I am in favour of readability.

Ludovic

Quoted 3 lines

The other macros are fine.

Arnd

#8 lore raw

PATCH 2/3 ARM: at91: dt: switch DMA DT bindings to pre-processor

In reply to ludovic.desroches at atmel.com

From: Ludovic Desroches <[email protected]>

---
 arch/arm/boot/dts/at91sam9g45.dtsi |  5 +++--
 arch/arm/boot/dts/at91sam9n12.dtsi | 11 ++++++-----
 arch/arm/boot/dts/at91sam9x5.dtsi  | 17 +++++++++--------
 arch/arm/boot/dts/sama5d3.dtsi     | 19 ++++++++++---------
 4 files changed, 28 insertions(+), 24 deletions(-)
arch/arm/boot/dts/at91sam9g45.dtsi +3 -2
index f0091af..fe84404 100644
@@ -10,6 +10,7 @@
  */
 
 #include "skeleton.dtsi"
+#include <dt-bindings/dma/at91.h>
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
@@ -537,7 +538,7 @@
 				compatible = "atmel,hsmci";
 				reg = <0xfff80000 0x600>;
 				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
-				dmas = <&dma 1 0>;
+				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>;
 				dma-names = "rxtx";
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -548,7 +549,7 @@
 				compatible = "atmel,hsmci";
 				reg = <0xfffd0000 0x600>;
 				interrupts = <29 IRQ_TYPE_LEVEL_HIGH 0>;
-				dmas = <&dma 1 13>;
+				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(13)>;
 				dma-names = "rxtx";
 				#address-cells = <1>;
 				#size-cells = <0>;
arch/arm/boot/dts/at91sam9n12.dtsi +6 -5
index 566af32..3076693 100644
@@ -8,6 +8,7 @@
  */
 
 #include "skeleton.dtsi"
+#include <dt-bindings/dma/at91.h>
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
@@ -92,7 +93,7 @@
 				compatible = "atmel,hsmci";
 				reg = <0xf0008000 0x600>;
 				interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
-				dmas = <&dma 1 0>;
+				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>;
 				dma-names = "rxtx";
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -384,8 +385,8 @@
 				compatible = "atmel,at91sam9x5-i2c";
 				reg = <0xf8010000 0x100>;
 				interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>;
-				dmas = <&dma 1 13>,
-				       <&dma 1 14>;
+				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(13)>,
+				       <&dma 1 AT91_DMA_CFG_PER_ID(14)>;
 				dma-names = "tx", "rx";
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -396,8 +397,8 @@
 				compatible = "atmel,at91sam9x5-i2c";
 				reg = <0xf8014000 0x100>;
 				interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>;
-				dmas = <&dma 1 15>,
-				       <&dma 1 16>;
+				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(15)>,
+				       <&dma 1 AT91_DMA_CFG_PER_ID(16)>;
 				dma-names = "tx", "rx";
 				#address-cells = <1>;
 				#size-cells = <0>;
arch/arm/boot/dts/at91sam9x5.dtsi +9 -8
index af91599..a08bf77 100644
@@ -10,6 +10,7 @@
  */
 
 #include "skeleton.dtsi"
+#include <dt-bindings/dma/at91.h>
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
@@ -470,7 +471,7 @@
 				compatible = "atmel,hsmci";
 				reg = <0xf0008000 0x600>;
 				interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
-				dmas = <&dma0 1 0>;
+				dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(0)>;
 				dma-names = "rxtx";
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -481,7 +482,7 @@
 				compatible = "atmel,hsmci";
 				reg = <0xf000c000 0x600>;
 				interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;
-				dmas = <&dma1 1 0>;
+				dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(0)>;
 				dma-names = "rxtx";
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -544,8 +545,8 @@
 				compatible = "atmel,at91sam9x5-i2c";
 				reg = <0xf8010000 0x100>;
 				interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>;
-				dmas = <&dma0 1 7>,
-				       <&dma0 1 8>;
+				dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(7)>,
+				       <&dma0 1 AT91_DMA_CFG_PER_ID(8)>;
 				dma-names = "tx", "rx";
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -558,8 +559,8 @@
 				compatible = "atmel,at91sam9x5-i2c";
 				reg = <0xf8014000 0x100>;
 				interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>;
-				dmas = <&dma1 1 5>,
-				       <&dma1 1 6>;
+				dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(5)>,
+				       <&dma1 1 AT91_DMA_CFG_PER_ID(6)>;
 				dma-names = "tx", "rx";
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -572,8 +573,8 @@
 				compatible = "atmel,at91sam9x5-i2c";
 				reg = <0xf8018000 0x100>;
 				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>;
-				dmas = <&dma0 1 9>,
-				       <&dma0 1 10>;
+				dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(9)>,
+				       <&dma0 1 AT91_DMA_CFG_PER_ID(10)>;
 				dma-names = "tx", "rx";
 				#address-cells = <1>;
 				#size-cells = <0>;
arch/arm/boot/dts/sama5d3.dtsi +10 -9
index c00e158..03b8c02 100644
@@ -9,6 +9,7 @@
  */
 
 #include "skeleton.dtsi"
+#include <dt-bindings/dma/at91.h>
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
@@ -63,7 +64,7 @@
 				compatible = "atmel,hsmci";
 				reg = <0xf0000000 0x600>;
 				interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;
-				dmas = <&dma0 2 0>;
+				dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(0)>;
 				dma-names = "rxtx";
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7>;
@@ -116,8 +117,8 @@
 				compatible = "atmel,at91sam9x5-i2c";
 				reg = <0xf0014000 0x4000>;
 				interrupts = <18 IRQ_TYPE_LEVEL_HIGH 6>;
-				dmas = <&dma0 2 7>,
-				       <&dma0 2 8>;
+				dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(7)>,
+				       <&dma0 2 AT91_DMA_CFG_PER_ID(8)>;
 				dma-names = "tx", "rx";
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_i2c0>;
@@ -130,8 +131,8 @@
 				compatible = "atmel,at91sam9x5-i2c";
 				reg = <0xf0018000 0x4000>;
 				interrupts = <19 IRQ_TYPE_LEVEL_HIGH 6>;
-				dmas = <&dma0 2 9>,
-				       <&dma0 2 10>;
+				dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(9)>,
+				       <&dma0 2 AT91_DMA_CFG_PER_ID(10)>;
 				dma-names = "tx", "rx";
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_i2c1>;
@@ -178,7 +179,7 @@
 				compatible = "atmel,hsmci";
 				reg = <0xf8000000 0x600>;
 				interrupts = <22 IRQ_TYPE_LEVEL_HIGH 0>;
-				dmas = <&dma1 2 0>;
+				dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(0)>;
 				dma-names = "rxtx";
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3>;
@@ -191,7 +192,7 @@
 				compatible = "atmel,hsmci";
 				reg = <0xf8004000 0x600>;
 				interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;
-				dmas = <&dma1 2 1>;
+				dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(1)>;
 				dma-names = "rxtx";
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_mmc2_clk_cmd_dat0 &pinctrl_mmc2_dat1_3>;
@@ -309,8 +310,8 @@
 				compatible = "atmel,at91sam9x5-i2c";
 				reg = <0xf801c000 0x4000>;
 				interrupts = <20 IRQ_TYPE_LEVEL_HIGH 6>;
-				dmas = <&dma1 2 11>,
-				       <&dma1 2 12>;
+				dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(11)>,
+				       <&dma1 2 AT91_DMA_CFG_PER_ID(12)>;
 				dma-names = "tx", "rx";
 				#address-cells = <1>;
 				#size-cells = <0>;
Signature · 1 line
1.7.11.3
#9 lore raw

PATCH 3/3 at_hdmac: add FIFO configuration parameter to DMA DT binding

In reply to ludovic.desroches at atmel.com

From: Ludovic Desroches <[email protected]>

For most devices the FIFO configuration is the same i.e. when half FIFO size is available/filled, a source/destination request is serviced. But USART devices have to do it when there is enough space/data available to perform a single AHB access so the ASAP configuration.

---
 .../devicetree/bindings/dma/atmel-dma.txt          |  7 ++++--
 drivers/dma/at_hdmac.c                             | 25 ++++++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/dma/atmel-dma.txt +5 -2
index c80e8a3..c280a0e 100644
@@ -24,8 +24,11 @@ The three cells in order are:
 1. A phandle pointing to the DMA controller.
 2. The memory interface (16 most significant bits), the peripheral interface
 (16 less significant bits).
-3. The peripheral identifier for the hardware handshaking interface. The
-identifier can be different for tx and rx.
+3. Parameters for the at91 DMA configuration register which are device
+dependant:
+  - bit 7-0: peripheral identifier for the hardware handshaking interface. The
+  identifier can be different for tx and rx.
+  - bit 11-8: FIFO configuration. 0 for half FIFO, 1 for ALAP, 1 for ASAP.
 
 Example:
 
drivers/dma/at_hdmac.c +21 -4
index e923cda..bfd73e1 100644
@@ -14,6 +14,7 @@
  * found on AT91SAM9263.
  */
 
+#include <dt-bindings/dma/at91.h>
 #include <linux/clk.h>
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
@@ -1223,14 +1224,30 @@ static struct dma_chan *at_dma_xlate(struct of_phandle_args *dma_spec,
 	atslave = devm_kzalloc(&dmac_pdev->dev, sizeof(*atslave), GFP_KERNEL);
 	if (!atslave)
 		return NULL;
+
+	atslave->cfg = ATC_DST_H2SEL_HW | ATC_SRC_H2SEL_HW;
 	/*
 	 * We can fill both SRC_PER and DST_PER, one of these fields will be
 	 * ignored depending on DMA transfer direction.
 	 */
-	per_id = dma_spec->args[1];
-	atslave->cfg = ATC_FIFOCFG_HALFFIFO | ATC_DST_H2SEL_HW
-		      | ATC_SRC_H2SEL_HW | ATC_DST_PER(per_id)
-		      | ATC_SRC_PER(per_id);
+	per_id = dma_spec->args[1] & AT91_DMA_CFG_PER_ID_MASK;
+	atslave->cfg |= ATC_DST_PER(per_id) | ATC_SRC_PER(per_id);
+	/*
+	 * We have to translate the value we get from the device tree since
+	 * the half FIFO configuration value had to be 0 to keep backward
+	 * compatibility.
+	 */
+	switch(dma_spec->args[1] & AT91_DMA_CFG_FIFOCFG_MASK) {
+		case AT91_DMA_CFG_FIFOCFG_ALAP:
+			atslave->cfg |= ATC_FIFOCFG_LARGESTBURST;
+			break;
+		case AT91_DMA_CFG_FIFOCFG_ASAP:
+			atslave->cfg |= ATC_FIFOCFG_ENOUGHSPACE;
+			break;
+		case AT91_DMA_CFG_FIFOCFG_HALF:
+		default:
+			atslave->cfg |= ATC_FIFOCFG_HALFFIFO;
+	}
 	atslave->dma_dev = &dmac_pdev->dev;
 
 	chan = dma_request_channel(mask, at_dma_filter, atslave);
Signature · 1 line
1.7.11.3
#10 lore raw

PATCH 3/3 at_hdmac: add FIFO configuration parameter to DMA DT binding

On 30/05/2013 18:08, ludovic.desroches at atmel.com :

Quoted 9 lines

From: Ludovic Desroches <[email protected]>

For most devices the FIFO configuration is the same i.e. when half FIFO size is available/filled, a source/destination request is serviced. But USART devices have to do it when there is enough space/data available to perform a single AHB access so the ASAP configuration.

Clear and neat: thanks Ludo.

Quoted 71 lines
---
  .../devicetree/bindings/dma/atmel-dma.txt          |  7 ++++--
  drivers/dma/at_hdmac.c                             | 25 ++++++++++++++++++----
  2 files changed, 26 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/dma/atmel-dma.txt +5 -2
index c80e8a3..c280a0e 100644
@@ -24,8 +24,11 @@ The three cells in order are:
  1. A phandle pointing to the DMA controller.
  2. The memory interface (16 most significant bits), the peripheral interface
  (16 less significant bits).
-3. The peripheral identifier for the hardware handshaking interface. The
-identifier can be different for tx and rx.
+3. Parameters for the at91 DMA configuration register which are device
+dependant:
+  - bit 7-0: peripheral identifier for the hardware handshaking interface. The
+  identifier can be different for tx and rx.
+  - bit 11-8: FIFO configuration. 0 for half FIFO, 1 for ALAP, 1 for ASAP.
 
  Example:
 
drivers/dma/at_hdmac.c +21 -4
index e923cda..bfd73e1 100644
@@ -14,6 +14,7 @@
   * found on AT91SAM9263.
   */
 
+#include <dt-bindings/dma/at91.h>
  #include <linux/clk.h>
  #include <linux/dmaengine.h>
  #include <linux/dma-mapping.h>
@@ -1223,14 +1224,30 @@ static struct dma_chan *at_dma_xlate(struct of_phandle_args *dma_spec,
  	atslave = devm_kzalloc(&dmac_pdev->dev, sizeof(*atslave), GFP_KERNEL);
  	if (!atslave)
  		return NULL;
+
+	atslave->cfg = ATC_DST_H2SEL_HW | ATC_SRC_H2SEL_HW;
  	/*
  	 * We can fill both SRC_PER and DST_PER, one of these fields will be
  	 * ignored depending on DMA transfer direction.
  	 */
-	per_id = dma_spec->args[1];
-	atslave->cfg = ATC_FIFOCFG_HALFFIFO | ATC_DST_H2SEL_HW
-		      | ATC_SRC_H2SEL_HW | ATC_DST_PER(per_id)
-		      | ATC_SRC_PER(per_id);
+	per_id = dma_spec->args[1] & AT91_DMA_CFG_PER_ID_MASK;
+	atslave->cfg |= ATC_DST_PER(per_id) | ATC_SRC_PER(per_id);
+	/*
+	 * We have to translate the value we get from the device tree since
+	 * the half FIFO configuration value had to be 0 to keep backward
+	 * compatibility.
+	 */
+	switch(dma_spec->args[1] & AT91_DMA_CFG_FIFOCFG_MASK) {
+		case AT91_DMA_CFG_FIFOCFG_ALAP:
+			atslave->cfg |= ATC_FIFOCFG_LARGESTBURST;
+			break;
+		case AT91_DMA_CFG_FIFOCFG_ASAP:
+			atslave->cfg |= ATC_FIFOCFG_ENOUGHSPACE;
+			break;
+		case AT91_DMA_CFG_FIFOCFG_HALF:
+		default:
+			atslave->cfg |= ATC_FIFOCFG_HALFFIFO;
+	}
  	atslave->dma_dev = &dmac_pdev->dev;
 
  	chan = dma_request_channel(mask, at_dma_filter, atslave);
Signature · 1 line
Nicolas Ferre
#11 lore raw

PATCH 3/3 at_hdmac: add FIFO configuration parameter to DMA DT binding

Quoted 8 lines · Nicolas Ferre

On 30/05/2013 18:08, ludovic.desroches at atmel.com :

Quoted 7 lines

From: Ludovic Desroches <[email protected]>

For most devices the FIFO configuration is the same i.e. when half FIFO size is available/filled, a source/destination request is serviced. But USART devices have to do it when there is enough space/data available to perform a single AHB access so the ASAP configuration.

Quoted 4 lines
Quoted 2 lines

Clear and neat: thanks Ludo.

agreed

can we apply this via AT91 as this depends on some cleanup I did on DT and could result on some nigthmware conflict

Best Regards,
J.

#12 lore raw

PATCH 3/3 at_hdmac: add FIFO configuration parameter to DMA DT binding

Quoted 12 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 11 lines · Nicolas Ferre

On 30/05/2013 18:08, ludovic.desroches at atmel.com :

Quoted 9 lines

From: Ludovic Desroches <[email protected]>

For most devices the FIFO configuration is the same i.e. when half FIFO size is available/filled, a source/destination request is serviced. But USART devices have to do it when there is enough space/data available to perform a single AHB access so the ASAP configuration.

Quoted 7 lines
Quoted 1 line

Clear and neat: thanks Ludo.

agreed

can we apply this via AT91 as this depends on some cleanup I did on DT and could result on some nigthmware conflict

In fact, I am not sure it's the best solution. I have noticed that there is a conflict with a patch sent by Nicolas (dmaengine: at_hdmac: extend hardware handshaking interface identification) which is already in Vinod's tree but which is not present on Jean-Christophe's cleanup tree on which I based these patches.

Moreover this patch doesn't use macros introduced by Nicolas' patch. I may update it and it should go through Vinod's tree with a dependence on patch 1/3.

What's your point of view?

#13 lore raw

PATCH 3/3 at_hdmac: add FIFO configuration parameter to DMA DT binding

On 31/05/2013 11:16, Ludovic Desroches :

Quoted 27 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 12 lines · Nicolas Ferre
Quoted 11 lines

On 30/05/2013 18:08, ludovic.desroches at atmel.com :

Quoted 9 lines

From: Ludovic Desroches <[email protected]>

For most devices the FIFO configuration is the same i.e. when half FIFO size is available/filled, a source/destination request is serviced. But USART devices have to do it when there is enough space/data available to perform a single AHB access so the ASAP configuration.

Quoted 7 lines
Quoted 1 line

Clear and neat: thanks Ludo.

agreed

can we apply this via AT91 as this depends on some cleanup I did on DT and could result on some nigthmware conflict

In fact, I am not sure it's the best solution. I have noticed that there is a conflict with a patch sent by Nicolas (dmaengine: at_hdmac: extend hardware handshaking interface identification) which is already in Vinod's tree but which is not present on Jean-Christophe's cleanup tree on which I based these patches.

Quoted 4 lines

Moreover this patch doesn't use macros introduced by Nicolas' patch. I may update it and it should go through Vinod's tree with a dependence on patch 1/3.

What's your point of view?

Indeed. Another option could be to push patches 1 and 3 in dmaengine's tree and make the 2nd patch go through arm-soc with a dependency on slave-dma GIT tree (it seems it is an usual patern).

Arnd, Jean-Christophe, what do you think?

Bye,

Signature · 1 line
Nicolas Ferre
#14 lore raw

PATCH 3/3 at_hdmac: add FIFO configuration parameter to DMA DT binding

Quoted 31 lines · Nicolas Ferre

On 31/05/2013 11:16, Ludovic Desroches :

Quoted 30 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 12 lines · Nicolas Ferre
Quoted 11 lines

On 30/05/2013 18:08, ludovic.desroches at atmel.com :

Quoted 9 lines

From: Ludovic Desroches <[email protected]>

For most devices the FIFO configuration is the same i.e. when half FIFO size is available/filled, a source/destination request is serviced. But USART devices have to do it when there is enough space/data available to perform a single AHB access so the ASAP configuration.

Quoted 7 lines
Quoted 1 line

Clear and neat: thanks Ludo.

agreed

can we apply this via AT91 as this depends on some cleanup I did on DT and could result on some nigthmware conflict

In fact, I am not sure it's the best solution. I have noticed that there is a conflict with a patch sent by Nicolas (dmaengine: at_hdmac: extend hardware handshaking interface identification) which is already in Vinod's tree but which is not present on Jean-Christophe's cleanup tree on which I based these patches.

Moreover this patch doesn't use macros introduced by Nicolas' patch. I may update it and it should go through Vinod's tree with a dependence on patch 1/3.

Quoted 7 lines
Quoted 1 line

What's your point of view?

Indeed. Another option could be to push patches 1 and 3 in dmaengine's tree and make the 2nd patch go through arm-soc with a dependency on slave-dma GIT tree (it seems it is an usual patern).

Arnd, Jean-Christophe, what do you think?

Nico I let you handle this one my only concern is that the cleanup work can cause nightware conflict

Best Regards,
J.

Quoted 4 lines

Bye,

Signature · 1 line
Nicolas Ferre
#15 lore raw

PATCH 3/3 at_hdmac: add FIFO configuration parameter to DMA DT binding

In reply to Nicolas Ferre
Quoted 46 lines · Nicolas Ferre

On 31/05/2013 11:16, Ludovic Desroches :

Quoted 45 lines
Quoted 19 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 17 lines · Nicolas Ferre

On 30/05/2013 18:08, ludovic.desroches at atmel.com :

Quoted 13 lines

From: Ludovic Desroches <[email protected]>

For most devices the FIFO configuration is the same i.e. when half FIFO size is
available/filled, a source/destination request is serviced. But USART devices
have to do it when there is enough space/data available to perform a single
AHB access so the ASAP configuration.

Quoted 9 lines
Quoted 1 line

Clear and neat: thanks Ludo.

agreed

can we apply this via AT91 as this depends on some cleanup I did on DT and
could result on some nigthmware conflict

In fact, I am not sure it's the best solution. I have noticed that there is a
conflict with a patch sent by Nicolas (dmaengine: at_hdmac: extend hardware
handshaking interface identification) which is already in Vinod's tree but which is not present on Jean-Christophe's cleanup tree on which I based these
patches.

Moreover this patch doesn't use macros introduced by Nicolas' patch. I may update it and it should go through Vinod's tree with a dependence on patch 1/3.

Quoted 8 lines
Quoted 1 line

What's your point of view?

Indeed. Another option could be to push patches 1 and 3 in dmaengine's tree and make the 2nd patch go through arm-soc with a dependency on slave-dma GIT tree (it seems it is an usual patern).

Arnd, Jean-Christophe, what do you think?

I'm not sure patch 1 needs to go through the dma-engine tree? Sure, it's a dma-related header file but it's only used to craft the device tree in patch 2, it doesn't affect the driver.

(Arnd has comments on the patch that should be resolved though).

-Olof

#16 lore raw

PATCH 3/3 at_hdmac: add FIFO configuration parameter to DMA DT binding

Quoted 54 lines · Olof Johansson
Quoted 53 lines · Nicolas Ferre

On 31/05/2013 11:16, Ludovic Desroches :

Quoted 41 lines
Quoted 19 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 17 lines · Nicolas Ferre

On 30/05/2013 18:08, ludovic.desroches at atmel.com :

Quoted 13 lines

From: Ludovic Desroches <[email protected]>

For most devices the FIFO configuration is the same i.e. when half FIFO size is
available/filled, a source/destination request is serviced. But USART devices
have to do it when there is enough space/data available to perform a single
AHB access so the ASAP configuration.

Quoted 9 lines
Quoted 1 line

Clear and neat: thanks Ludo.

agreed

can we apply this via AT91 as this depends on some cleanup I did on DT and
could result on some nigthmware conflict

In fact, I am not sure it's the best solution. I have noticed that there is a
conflict with a patch sent by Nicolas (dmaengine: at_hdmac: extend hardware
handshaking interface identification) which is already in Vinod's tree but which is not present on Jean-Christophe's cleanup tree on which I based these
patches.

Quoted 5 lines

Moreover this patch doesn't use macros introduced by Nicolas' patch. I may update it and it should go through Vinod's tree with a dependence on patch 1/3.

What's your point of view?

Indeed. Another option could be to push patches 1 and 3 in dmaengine's tree and make the 2nd patch go through arm-soc with a dependency on slave-dma GIT tree (it seems it is an usual patern).

Quoted 6 lines
Quoted 1 line

Arnd, Jean-Christophe, what do you think?

I'm not sure patch 1 needs to go through the dma-engine tree? Sure, it's a dma-related header file but it's only used to craft the device tree in patch 2, it doesn't affect the driver.

Some macros are used into the at_hdmac driver.

Ludovic

Quoted 4 lines

(Arnd has comments on the patch that should be resolved though).

-Olof

#17 lore raw

Re: [PATCH 3/3] at_hdmac: add FIFO configuration parameter to DMA DT binding

In reply to Olof Johansson
Quoted 54 lines · Olof Johansson
Quoted 53 lines · Nicolas Ferre

On 31/05/2013 11:16, Ludovic Desroches :

Quoted 41 lines
Quoted 19 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 17 lines · Nicolas Ferre

On 30/05/2013 18:08, [email protected] :

Quoted 13 lines

From: Ludovic Desroches <[email protected]>

For most devices the FIFO configuration is the same i.e. when half FIFO size is
available/filled, a source/destination request is serviced. But USART devices
have to do it when there is enough space/data available to perform a single
AHB access so the ASAP configuration.

Quoted 9 lines
Quoted 1 line

Clear and neat: thanks Ludo.

agreed

can we apply this via AT91 as this depends on some cleanup I did on DT and
could result on some nigthmware conflict

In fact, I am not sure it's the best solution. I have noticed that there is a
conflict with a patch sent by Nicolas (dmaengine: at_hdmac: extend hardware
handshaking interface identification) which is already in Vinod's tree but which is not present on Jean-Christophe's cleanup tree on which I based these
patches.

Quoted 5 lines

Moreover this patch doesn't use macros introduced by Nicolas' patch. I may update it and it should go through Vinod's tree with a dependence on patch 1/3.

What's your point of view?

Indeed. Another option could be to push patches 1 and 3 in dmaengine's tree and make the 2nd patch go through arm-soc with a dependency on slave-dma GIT tree (it seems it is an usual patern).

Quoted 6 lines
Quoted 1 line

Arnd, Jean-Christophe, what do you think?

I'm not sure patch 1 needs to go through the dma-engine tree? Sure, it's a dma-related header file but it's only used to craft the device tree in patch 2, it doesn't affect the driver.

Some macros are used into the at_hdmac driver.

Ludovic

Quoted 4 lines

(Arnd has comments on the patch that should be resolved though).

-Olof

A message that is not in the archive (sent off-list or not yet received): CAOesGMhQetZfyzMpCax63xoRqtRW2ZRXt04MCbgCT-CcvUq43A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#19 lore raw

Re: [PATCH 3/3] at_hdmac: add FIFO configuration parameter to DMA DT binding

Quoted 54 lines · Olof Johansson
Quoted 53 lines · Nicolas Ferre

On 31/05/2013 11:16, Ludovic Desroches :

Quoted 41 lines
Quoted 19 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 17 lines · Nicolas Ferre

On 30/05/2013 18:08, [email protected] :

Quoted 13 lines

From: Ludovic Desroches <[email protected]>

For most devices the FIFO configuration is the same i.e. when half FIFO size is
available/filled, a source/destination request is serviced. But USART devices
have to do it when there is enough space/data available to perform a single
AHB access so the ASAP configuration.

Quoted 9 lines
Quoted 1 line

Clear and neat: thanks Ludo.

agreed

can we apply this via AT91 as this depends on some cleanup I did on DT and
could result on some nigthmware conflict

In fact, I am not sure it's the best solution. I have noticed that there is a
conflict with a patch sent by Nicolas (dmaengine: at_hdmac: extend hardware
handshaking interface identification) which is already in Vinod's tree but which is not present on Jean-Christophe's cleanup tree on which I based these
patches.

Quoted 5 lines

Moreover this patch doesn't use macros introduced by Nicolas' patch. I may update it and it should go through Vinod's tree with a dependence on patch 1/3.

What's your point of view?

Indeed. Another option could be to push patches 1 and 3 in dmaengine's tree and make the 2nd patch go through arm-soc with a dependency on slave-dma GIT tree (it seems it is an usual patern).

Quoted 6 lines
Quoted 1 line

Arnd, Jean-Christophe, what do you think?

I'm not sure patch 1 needs to go through the dma-engine tree? Sure, it's a dma-related header file but it's only used to craft the device tree in patch 2, it doesn't affect the driver.

Some macros are used into the at_hdmac driver.

Ludovic

Quoted 4 lines

(Arnd has comments on the patch that should be resolved though).

-Olof

A message that is not in the archive (sent off-list or not yet received): 20130530163936.GC23653-RQcB7r2h9QmfDR2tN2SG5Ni2O/[email protected]

#21 lore raw

Re: [PATCH 3/3] at_hdmac: add FIFO configuration parameter to DMA DT binding

Quoted 12 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 11 lines · Nicolas Ferre

On 30/05/2013 18:08, [email protected] :

Quoted 9 lines

From: Ludovic Desroches <[email protected]>

For most devices the FIFO configuration is the same i.e. when half FIFO size is available/filled, a source/destination request is serviced. But USART devices have to do it when there is enough space/data available to perform a single AHB access so the ASAP configuration.

Quoted 7 lines
Quoted 1 line

Clear and neat: thanks Ludo.

agreed

can we apply this via AT91 as this depends on some cleanup I did on DT and could result on some nigthmware conflict

In fact, I am not sure it's the best solution. I have noticed that there is a conflict with a patch sent by Nicolas (dmaengine: at_hdmac: extend hardware handshaking interface identification) which is already in Vinod's tree but which is not present on Jean-Christophe's cleanup tree on which I based these patches.

Moreover this patch doesn't use macros introduced by Nicolas' patch. I may update it and it should go through Vinod's tree with a dependence on patch 1/3.

What's your point of view?

#22 lore raw

Re: [PATCH 3/3] at_hdmac: add FIFO configuration parameter to DMA DT binding

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 12 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 11 lines · Nicolas Ferre

On 30/05/2013 18:08, [email protected] :

Quoted 9 lines

From: Ludovic Desroches <[email protected]>

For most devices the FIFO configuration is the same i.e. when half FIFO size is available/filled, a source/destination request is serviced. But USART devices have to do it when there is enough space/data available to perform a single AHB access so the ASAP configuration.

Quoted 7 lines
Quoted 1 line

Clear and neat: thanks Ludo.

agreed

can we apply this via AT91 as this depends on some cleanup I did on DT and could result on some nigthmware conflict

In fact, I am not sure it's the best solution. I have noticed that there is a conflict with a patch sent by Nicolas (dmaengine: at_hdmac: extend hardware handshaking interface identification) which is already in Vinod's tree but which is not present on Jean-Christophe's cleanup tree on which I based these patches.

Moreover this patch doesn't use macros introduced by Nicolas' patch. I may update it and it should go through Vinod's tree with a dependence on patch 1/3.

What's your point of view?

#23 lore raw

cover at_hdmac: dt dma bindings update

In reply to ludovic.desroches at atmel.com
Quoted 9 lines · ludovic.desroches at atmel.com

From: Ludovic Desroches <[email protected]>

Hi,

This set of patches update the dt dma binding for at_hdmac since we need one more parameter. In order to keep backward compatibility, an existing cell will be used to add this parameter. Since the content of that cell will become a magic value due to the concatenation of the two parameters, it is time to use macros.

For the record this is based on the cleanup branch for 3.11

Best Regards,
J.

Quoted 21 lines

Regards

Ludovic Desroches (3):
ARM: at91: dt: add header to define at_hdmac configuration
ARM: at91: dt: switch DMA DT bindings to pre-processor
at_hdmac: add FIFO configuration parameter to DMA DT binding

 .../devicetree/bindings/dma/atmel-dma.txt          |  7 ++++--
 arch/arm/boot/dts/at91sam9g45.dtsi                 |  5 ++--
 arch/arm/boot/dts/at91sam9n12.dtsi                 | 11 +++++----
 arch/arm/boot/dts/at91sam9x5.dtsi                  | 17 +++++++-------
 arch/arm/boot/dts/sama5d3.dtsi                     | 19 +++++++--------
 drivers/dma/at_hdmac.c                             | 25 ++++++++++++++++----
 include/dt-bindings/dma/at91.h                     | 27 ++++++++++++++++++++++
 7 files changed, 81 insertions(+), 30 deletions(-)
 create mode 100644 include/dt-bindings/dma/at91.h
Signature · 1 line
1.7.11.3
#24 lore raw

cover at_hdmac: dt dma bindings update

In reply to ludovic.desroches at atmel.com
Quoted 9 lines · ludovic.desroches at atmel.com

From: Ludovic Desroches <[email protected]>

Hi,

This set of patches update the dt dma binding for at_hdmac since we need one more parameter. In order to keep backward compatibility, an existing cell will be used to add this parameter. Since the content of that cell will become a magic value due to the concatenation of the two parameters, it is time to use macros.

which tree is this targetted to be applied?

Arnd, can you review this series and ack if this needs to be applied thru dmaengine?

--
~Vinod

Quoted 21 lines

Regards

Ludovic Desroches (3):
ARM: at91: dt: add header to define at_hdmac configuration
ARM: at91: dt: switch DMA DT bindings to pre-processor
at_hdmac: add FIFO configuration parameter to DMA DT binding

 .../devicetree/bindings/dma/atmel-dma.txt          |  7 ++++--
 arch/arm/boot/dts/at91sam9g45.dtsi                 |  5 ++--
 arch/arm/boot/dts/at91sam9n12.dtsi                 | 11 +++++----
 arch/arm/boot/dts/at91sam9x5.dtsi                  | 17 +++++++-------
 arch/arm/boot/dts/sama5d3.dtsi                     | 19 +++++++--------
 drivers/dma/at_hdmac.c                             | 25 ++++++++++++++++----
 include/dt-bindings/dma/at91.h                     | 27 ++++++++++++++++++++++
 7 files changed, 81 insertions(+), 30 deletions(-)
 create mode 100644 include/dt-bindings/dma/at91.h
Signature · 1 line
1.7.11.3
#25 lore raw

cover at_hdmac: dt dma bindings update

Quoted 11 lines · Vinod Koul
Quoted 9 lines · ludovic.desroches at atmel.com

From: Ludovic Desroches <[email protected]>

Hi,

This set of patches update the dt dma binding for at_hdmac since we need one more parameter. In order to keep backward compatibility, an existing cell will be used to add this parameter. Since the content of that cell will become a magic value due to the concatenation of the two parameters, it is time to use macros.

which tree is this targetted to be applied?

arm-soc as this depends on alreadied applied cleanup I've

Quoted 3 lines

Arnd, can you review this series and ack if this needs to be applied thru dmaengine?

I prefer the invert

Best Regards,
J.

Quoted 26 lines

--
~Vinod

Quoted 21 lines

Regards

Ludovic Desroches (3):
ARM: at91: dt: add header to define at_hdmac configuration
ARM: at91: dt: switch DMA DT bindings to pre-processor
at_hdmac: add FIFO configuration parameter to DMA DT binding

 .../devicetree/bindings/dma/atmel-dma.txt          |  7 ++++--
 arch/arm/boot/dts/at91sam9g45.dtsi                 |  5 ++--
 arch/arm/boot/dts/at91sam9n12.dtsi                 | 11 +++++----
 arch/arm/boot/dts/at91sam9x5.dtsi                  | 17 +++++++-------
 arch/arm/boot/dts/sama5d3.dtsi                     | 19 +++++++--------
 drivers/dma/at_hdmac.c                             | 25 ++++++++++++++++----
 include/dt-bindings/dma/at91.h                     | 27 ++++++++++++++++++++++
 7 files changed, 81 insertions(+), 30 deletions(-)
 create mode 100644 include/dt-bindings/dma/at91.h
Signature · 1 line
1.7.11.3
#26 lore raw

cover at_hdmac: dt dma bindings update

On 30/05/2013 22:13, Jean-Christophe PLAGNIOL-VILLARD :

Quoted 6 lines · Vinod Koul
Quoted 5 lines · ludovic.desroches at atmel.com
Quoted 4 lines

From: Ludovic Desroches <[email protected]>

Hi,

Quoted 8 lines
Quoted 6 lines
Quoted 5 lines

This set of patches update the dt dma binding for at_hdmac since we need one more parameter. In order to keep backward compatibility, an existing cell will be used to add this parameter. Since the content of that cell will become a magic value due to the concatenation of the two parameters, it is time to use macros.

which tree is this targetted to be applied?

arm-soc as this depends on alreadied applied cleanup I've

... already pushed (it must be the end of your sentence, Jean-Christophe...)

Vinod, Arnd,

- patch 1 shall be applied before any of the two others of the series
- patch 2 is pure DT modification, but relies on Jean-Christophe's already pushed cleanup branch in arm-soc
- patch 3 is the pure dmaengine one, but relies on the 1st patch

So, maybe the preferred way to include this material upstream is to go through arm-soc as suggested by Jean-Christophe.

Bye,

Quoted 34 lines
Quoted 2 lines

Arnd, can you review this series and ack if this needs to be applied thru dmaengine?

I prefer the invert

Best Regards,
J.

Quoted 26 lines

--
~Vinod

Quoted 16 lines

Regards

Ludovic Desroches (3):
ARM: at91: dt: add header to define at_hdmac configuration
ARM: at91: dt: switch DMA DT bindings to pre-processor
at_hdmac: add FIFO configuration parameter to DMA DT binding

  .../devicetree/bindings/dma/atmel-dma.txt          |  7 ++++--
  arch/arm/boot/dts/at91sam9g45.dtsi                 |  5 ++--
  arch/arm/boot/dts/at91sam9n12.dtsi                 | 11 +++++----
  arch/arm/boot/dts/at91sam9x5.dtsi                  | 17 +++++++-------
  arch/arm/boot/dts/sama5d3.dtsi                     | 19 +++++++--------
  drivers/dma/at_hdmac.c                             | 25 ++++++++++++++++----
  include/dt-bindings/dma/at91.h                     | 27 ++++++++++++++++++++++
  7 files changed, 81 insertions(+), 30 deletions(-)
Quoted 5 lines

create mode 100644 include/dt-bindings/dma/at91.h

--
1.7.11.3

--

Signature · 1 line
Nicolas Ferre