[PATCH 0/2] ARM: mvebu: fixes for v3.11

[PATCH 0/2] ARM: mvebu: fixes for v3.11

[Sebastian Hesselbarth]

This patch set comprises two unrelated fixes for Marvell SoCs based on
what is currently in next-20130701. There may be fixes already pending
for the issues.

The first patch is a clean-up patch removing dmacap,memset from the
device tree binding and users. DMA_MEMSET support has been removed from
DMA API and mv_xor driver.

The second patch fixes compilation of orion5x edmini_v2 by adding a
missing include.

devicetree-discuss is added on Cc for completeness, this is all Marvell
related and should go through Jason Cooper's branch if there are no
objections.

Sebastian Hesselbarth (2):
  ARM: remove dmacap,memset from Device tree binding
  ARM: orion5x: add missing mbus include

 Documentation/devicetree/bindings/dma/mv-xor.txt |    2 --
 arch/arm/boot/dts/armada-370.dtsi                |    2 --
 arch/arm/boot/dts/armada-xp.dtsi                 |    2 --
 arch/arm/boot/dts/dove.dtsi                      |    2 --
 arch/arm/boot/dts/kirkwood.dtsi                  |    2 --
 arch/arm/boot/dts/orion5x.dtsi                   |    1 -
 arch/arm/mach-orion5x/edmini_v2-setup.c          |    1 +
 7 files changed, 1 insertions(+), 11 deletions(-)

---
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: devicetree-discuss at lists.ozlabs.org
Cc: linux-kernel at vger.kernel.org
Cc: linux-arm-kernel at lists.infradead.org
-- 
1.7.2.5

[PATCH 1/2] ARM: remove dmacap,memset from Device tree binding

[Sebastian Hesselbarth]

DMA_MEMSET support has been removed, so update the device tree files
and corresponding binding documentation for Marvell SoCs.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Russell King <linux@arm.linux.org.uk> 
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> 
Cc: devicetree-discuss at lists.ozlabs.org 
Cc: linux-kernel at vger.kernel.org 
Cc: linux-arm-kernel at lists.infradead.org 
---
 Documentation/devicetree/bindings/dma/mv-xor.txt |    2 --
 arch/arm/boot/dts/armada-370.dtsi                |    2 --
 arch/arm/boot/dts/armada-xp.dtsi                 |    2 --
 arch/arm/boot/dts/dove.dtsi                      |    2 --
 arch/arm/boot/dts/kirkwood.dtsi                  |    2 --
 arch/arm/boot/dts/orion5x.dtsi                   |    1 -
 6 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/Documentation/devicetree/bindings/dma/mv-xor.txt b/Documentation/devicetree/bindings/dma/mv-xor.txt
index 7c6cb7f..68f7004 100644
--- a/Documentation/devicetree/bindings/dma/mv-xor.txt
+++ b/Documentation/devicetree/bindings/dma/mv-xor.txt
@@ -14,7 +14,6 @@ properties:
 
 And the following optional properties:
 - dmacap,memcpy to indicate that the XOR channel is capable of memcpy operations
-- dmacap,memset to indicate that the XOR channel is capable of memset operations
 - dmacap,xor to indicate that the XOR channel is capable of xor operations
 
 Example:
@@ -35,6 +34,5 @@ xor at d0060900 {
 	      interrupts = <52>;
 	      dmacap,memcpy;
 	      dmacap,xor;
-	      dmacap,memset;
 	};
 };
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index fa3dfc6..a315ad1 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -132,7 +132,6 @@
 					interrupts = <52>;
 					dmacap,memcpy;
 					dmacap,xor;
-					dmacap,memset;
 				};
 			};
 
@@ -151,7 +150,6 @@
 					interrupts = <95>;
 					dmacap,memcpy;
 					dmacap,xor;
-					dmacap,memset;
 				};
 			};
 
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 416eb94..4b3dd56 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -114,7 +114,6 @@
 					interrupts = <52>;
 					dmacap,memcpy;
 					dmacap,xor;
-					dmacap,memset;
 				};
 			};
 
@@ -134,7 +133,6 @@
 					interrupts = <95>;
 					dmacap,memcpy;
 					dmacap,xor;
-					dmacap,memset;
 				};
 			};
 
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 6cab468..2cef34f 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -232,7 +232,6 @@
 
 			channel1 {
 				interrupts = <40>;
-				dmacap,memset;
 				dmacap,memcpy;
 				dmacap,xor;
 			};
@@ -253,7 +252,6 @@
 
 			channel1 {
 				interrupts = <43>;
-				dmacap,memset;
 				dmacap,memcpy;
 				dmacap,xor;
 			};
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 9809fc1..078637c 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -126,7 +126,6 @@
 			      interrupts = <6>;
 			      dmacap,memcpy;
 			      dmacap,xor;
-			      dmacap,memset;
 			};
 		};
 
@@ -146,7 +145,6 @@
 			      interrupts = <8>;
 			      dmacap,memcpy;
 			      dmacap,xor;
-			      dmacap,memset;
 			};
 		};
 
diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index 892c64e..f82ece7 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -120,7 +120,6 @@
 			      interrupts = <31>;
 			      dmacap,memcpy;
 			      dmacap,xor;
-			      dmacap,memset;
 			};
 		};
 
-- 
1.7.2.5

[PATCH 2/2] ARM: orion5x: add missing mbus include

[Sebastian Hesselbarth]

edmini_v2-setup is missing an include of linux/mbus.h which causes
compiler error because of missing reference to mvebu_mbus_add_window.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Russell King <linux@arm.linux.org.uk> 
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> 
Cc: devicetree-discuss at lists.ozlabs.org 
Cc: linux-kernel at vger.kernel.org 
Cc: linux-arm-kernel at lists.infradead.org 
---
 arch/arm/mach-orion5x/edmini_v2-setup.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-orion5x/edmini_v2-setup.c b/arch/arm/mach-orion5x/edmini_v2-setup.c
index 1476155..1cecedc 100644
--- a/arch/arm/mach-orion5x/edmini_v2-setup.c
+++ b/arch/arm/mach-orion5x/edmini_v2-setup.c
@@ -23,6 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/pci.h>
 #include <linux/irq.h>
+#include <linux/mbus.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/leds.h>
-- 
1.7.2.5

[PATCH 1/2] ARM: remove dmacap,memset from Device tree binding

[Jason Cooper]

On Tue, Jul 02, 2013 at 12:54:12PM +0200, Sebastian Hesselbarth wrote:
> DMA_MEMSET support has been removed, so update the device tree files
> and corresponding binding documentation for Marvell SoCs.
> 
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> Cc: Russell King <linux@arm.linux.org.uk> 
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> 
> Cc: devicetree-discuss at lists.ozlabs.org 
> Cc: linux-kernel at vger.kernel.org 
> Cc: linux-arm-kernel at lists.infradead.org 
> ---
>  Documentation/devicetree/bindings/dma/mv-xor.txt |    2 --
>  arch/arm/boot/dts/armada-370.dtsi                |    2 --
>  arch/arm/boot/dts/armada-xp.dtsi                 |    2 --
>  arch/arm/boot/dts/dove.dtsi                      |    2 --
>  arch/arm/boot/dts/kirkwood.dtsi                  |    2 --
>  arch/arm/boot/dts/orion5x.dtsi                   |    1 -
>  6 files changed, 0 insertions(+), 11 deletions(-)

Adding the new devicetree ml to the Cc:

I'm fine with the changes to the dts{i} files, but I think the binding
document should be handled differently.

thx,

Jason.

> 
> diff --git a/Documentation/devicetree/bindings/dma/mv-xor.txt b/Documentation/devicetree/bindings/dma/mv-xor.txt
> index 7c6cb7f..68f7004 100644
> --- a/Documentation/devicetree/bindings/dma/mv-xor.txt
> +++ b/Documentation/devicetree/bindings/dma/mv-xor.txt
> @@ -14,7 +14,6 @@ properties:
>  
>  And the following optional properties:
>  - dmacap,memcpy to indicate that the XOR channel is capable of memcpy operations
> -- dmacap,memset to indicate that the XOR channel is capable of memset operations
>  - dmacap,xor to indicate that the XOR channel is capable of xor operations
>  
>  Example:
> @@ -35,6 +34,5 @@ xor at d0060900 {
>  	      interrupts = <52>;
>  	      dmacap,memcpy;
>  	      dmacap,xor;
> -	      dmacap,memset;
>  	};
>  };
> diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
> index fa3dfc6..a315ad1 100644
> --- a/arch/arm/boot/dts/armada-370.dtsi
> +++ b/arch/arm/boot/dts/armada-370.dtsi
> @@ -132,7 +132,6 @@
>  					interrupts = <52>;
>  					dmacap,memcpy;
>  					dmacap,xor;
> -					dmacap,memset;
>  				};
>  			};
>  
> @@ -151,7 +150,6 @@
>  					interrupts = <95>;
>  					dmacap,memcpy;
>  					dmacap,xor;
> -					dmacap,memset;
>  				};
>  			};
>  
> diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
> index 416eb94..4b3dd56 100644
> --- a/arch/arm/boot/dts/armada-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-xp.dtsi
> @@ -114,7 +114,6 @@
>  					interrupts = <52>;
>  					dmacap,memcpy;
>  					dmacap,xor;
> -					dmacap,memset;
>  				};
>  			};
>  
> @@ -134,7 +133,6 @@
>  					interrupts = <95>;
>  					dmacap,memcpy;
>  					dmacap,xor;
> -					dmacap,memset;
>  				};
>  			};
>  
> diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
> index 6cab468..2cef34f 100644
> --- a/arch/arm/boot/dts/dove.dtsi
> +++ b/arch/arm/boot/dts/dove.dtsi
> @@ -232,7 +232,6 @@
>  
>  			channel1 {
>  				interrupts = <40>;
> -				dmacap,memset;
>  				dmacap,memcpy;
>  				dmacap,xor;
>  			};
> @@ -253,7 +252,6 @@
>  
>  			channel1 {
>  				interrupts = <43>;
> -				dmacap,memset;
>  				dmacap,memcpy;
>  				dmacap,xor;
>  			};
> diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
> index 9809fc1..078637c 100644
> --- a/arch/arm/boot/dts/kirkwood.dtsi
> +++ b/arch/arm/boot/dts/kirkwood.dtsi
> @@ -126,7 +126,6 @@
>  			      interrupts = <6>;
>  			      dmacap,memcpy;
>  			      dmacap,xor;
> -			      dmacap,memset;
>  			};
>  		};
>  
> @@ -146,7 +145,6 @@
>  			      interrupts = <8>;
>  			      dmacap,memcpy;
>  			      dmacap,xor;
> -			      dmacap,memset;
>  			};
>  		};
>  
> diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
> index 892c64e..f82ece7 100644
> --- a/arch/arm/boot/dts/orion5x.dtsi
> +++ b/arch/arm/boot/dts/orion5x.dtsi
> @@ -120,7 +120,6 @@
>  			      interrupts = <31>;
>  			      dmacap,memcpy;
>  			      dmacap,xor;
> -			      dmacap,memset;
>  			};
>  		};
>  
> -- 
> 1.7.2.5
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/2] ARM: orion5x: add missing mbus include

[Jason Cooper]

On Tue, Jul 02, 2013 at 12:54:13PM +0200, Sebastian Hesselbarth wrote:
> edmini_v2-setup is missing an include of linux/mbus.h which causes
> compiler error because of missing reference to mvebu_mbus_add_window.
> 
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> Cc: Russell King <linux@arm.linux.org.uk> 
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> 
> Cc: devicetree-discuss at lists.ozlabs.org 
> Cc: linux-kernel at vger.kernel.org 
> Cc: linux-arm-kernel at lists.infradead.org 
> ---
>  arch/arm/mach-orion5x/edmini_v2-setup.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Applied to mvebu/stable-3.10

thx,

Jason.

[PATCH 2/2] ARM: orion5x: add missing mbus include

[Jason Cooper]

On Thu, Jul 25, 2013 at 11:38:56AM -0400, Jason Cooper wrote:
> On Tue, Jul 02, 2013 at 12:54:13PM +0200, Sebastian Hesselbarth wrote:
> > edmini_v2-setup is missing an include of linux/mbus.h which causes
> > compiler error because of missing reference to mvebu_mbus_add_window.
> > 
> > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> > ---
> > Cc: Russell King <linux@arm.linux.org.uk> 
> > Cc: Jason Cooper <jason@lakedaemon.net>
> > Cc: Andrew Lunn <andrew@lunn.ch>
> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> 
> > Cc: devicetree-discuss at lists.ozlabs.org 
> > Cc: linux-kernel at vger.kernel.org 
> > Cc: linux-arm-kernel at lists.infradead.org 
> > ---
> >  arch/arm/mach-orion5x/edmini_v2-setup.c |    1 +
> >  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> Applied to mvebu/stable-3.10

nevermind, Olof caught that v3.10 builds fine without this patch (I
should've checked).  The build error was introduced by

  ARM: orion5x: remove legacy mv643xx_eth board setup

which removed mv643xx_eth.h include, which had included the needed
mbus.h.  This patch is queued for v3.12.

I'll squash this patch into the above mentioned patch and call it a day.

thx,

Jason.

[PATCH 1/2] ARM: remove dmacap,memset from Device tree binding

[Jason Cooper]

DT Maintainers,

It's been a week with no comment.  Shall I assume it's ok to apply
this?

thx,

Jason.

On Thu, Jul 25, 2013 at 11:31:04AM -0400, Jason Cooper wrote:
> On Tue, Jul 02, 2013 at 12:54:12PM +0200, Sebastian Hesselbarth wrote:
> > DMA_MEMSET support has been removed, so update the device tree files
> > and corresponding binding documentation for Marvell SoCs.
> > 
> > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> > ---
> > Cc: Russell King <linux@arm.linux.org.uk> 
> > Cc: Jason Cooper <jason@lakedaemon.net>
> > Cc: Andrew Lunn <andrew@lunn.ch>
> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> 
> > Cc: devicetree-discuss at lists.ozlabs.org 
> > Cc: linux-kernel at vger.kernel.org 
> > Cc: linux-arm-kernel at lists.infradead.org 
> > ---
> >  Documentation/devicetree/bindings/dma/mv-xor.txt |    2 --
> >  arch/arm/boot/dts/armada-370.dtsi                |    2 --
> >  arch/arm/boot/dts/armada-xp.dtsi                 |    2 --
> >  arch/arm/boot/dts/dove.dtsi                      |    2 --
> >  arch/arm/boot/dts/kirkwood.dtsi                  |    2 --
> >  arch/arm/boot/dts/orion5x.dtsi                   |    1 -
> >  6 files changed, 0 insertions(+), 11 deletions(-)
> 
> Adding the new devicetree ml to the Cc:
> 
> I'm fine with the changes to the dts{i} files, but I think the binding
> document should be handled differently.
> 
> thx,
> 
> Jason.
> 
> > 
> > diff --git a/Documentation/devicetree/bindings/dma/mv-xor.txt b/Documentation/devicetree/bindings/dma/mv-xor.txt
> > index 7c6cb7f..68f7004 100644
> > --- a/Documentation/devicetree/bindings/dma/mv-xor.txt
> > +++ b/Documentation/devicetree/bindings/dma/mv-xor.txt
> > @@ -14,7 +14,6 @@ properties:
> >  
> >  And the following optional properties:
> >  - dmacap,memcpy to indicate that the XOR channel is capable of memcpy operations
> > -- dmacap,memset to indicate that the XOR channel is capable of memset operations
> >  - dmacap,xor to indicate that the XOR channel is capable of xor operations
> >  
> >  Example:
> > @@ -35,6 +34,5 @@ xor at d0060900 {
> >  	      interrupts = <52>;
> >  	      dmacap,memcpy;
> >  	      dmacap,xor;
> > -	      dmacap,memset;
> >  	};
> >  };
> > diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
> > index fa3dfc6..a315ad1 100644
> > --- a/arch/arm/boot/dts/armada-370.dtsi
> > +++ b/arch/arm/boot/dts/armada-370.dtsi
> > @@ -132,7 +132,6 @@
> >  					interrupts = <52>;
> >  					dmacap,memcpy;
> >  					dmacap,xor;
> > -					dmacap,memset;
> >  				};
> >  			};
> >  
> > @@ -151,7 +150,6 @@
> >  					interrupts = <95>;
> >  					dmacap,memcpy;
> >  					dmacap,xor;
> > -					dmacap,memset;
> >  				};
> >  			};
> >  
> > diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
> > index 416eb94..4b3dd56 100644
> > --- a/arch/arm/boot/dts/armada-xp.dtsi
> > +++ b/arch/arm/boot/dts/armada-xp.dtsi
> > @@ -114,7 +114,6 @@
> >  					interrupts = <52>;
> >  					dmacap,memcpy;
> >  					dmacap,xor;
> > -					dmacap,memset;
> >  				};
> >  			};
> >  
> > @@ -134,7 +133,6 @@
> >  					interrupts = <95>;
> >  					dmacap,memcpy;
> >  					dmacap,xor;
> > -					dmacap,memset;
> >  				};
> >  			};
> >  
> > diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
> > index 6cab468..2cef34f 100644
> > --- a/arch/arm/boot/dts/dove.dtsi
> > +++ b/arch/arm/boot/dts/dove.dtsi
> > @@ -232,7 +232,6 @@
> >  
> >  			channel1 {
> >  				interrupts = <40>;
> > -				dmacap,memset;
> >  				dmacap,memcpy;
> >  				dmacap,xor;
> >  			};
> > @@ -253,7 +252,6 @@
> >  
> >  			channel1 {
> >  				interrupts = <43>;
> > -				dmacap,memset;
> >  				dmacap,memcpy;
> >  				dmacap,xor;
> >  			};
> > diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
> > index 9809fc1..078637c 100644
> > --- a/arch/arm/boot/dts/kirkwood.dtsi
> > +++ b/arch/arm/boot/dts/kirkwood.dtsi
> > @@ -126,7 +126,6 @@
> >  			      interrupts = <6>;
> >  			      dmacap,memcpy;
> >  			      dmacap,xor;
> > -			      dmacap,memset;
> >  			};
> >  		};
> >  
> > @@ -146,7 +145,6 @@
> >  			      interrupts = <8>;
> >  			      dmacap,memcpy;
> >  			      dmacap,xor;
> > -			      dmacap,memset;
> >  			};
> >  		};
> >  
> > diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
> > index 892c64e..f82ece7 100644
> > --- a/arch/arm/boot/dts/orion5x.dtsi
> > +++ b/arch/arm/boot/dts/orion5x.dtsi
> > @@ -120,7 +120,6 @@
> >  			      interrupts = <31>;
> >  			      dmacap,memcpy;
> >  			      dmacap,xor;
> > -			      dmacap,memset;
> >  			};
> >  		};
> >  
> > -- 
> > 1.7.2.5
> > 
> > 
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/2] ARM: remove dmacap,memset from Device tree binding

[Mark Rutland]

On Sun, Aug 04, 2013 at 02:09:04AM +0100, Jason Cooper wrote:
> DT Maintainers,
> 
> It's been a week with no comment.  Shall I assume it's ok to apply
> this?

Apologies for the delay, still catching up on binding review.

I'm not entirely sure on this. The property described is still true for
the device, even if the kernel's not using that information now. My
feeling would be to keep them, unless there's a plan to better describe
the properties of the XOR channels.

It shouldn't harm the kernel to have some properties we don't use at
this point in time. If we want to reorganise the binding, the first step
would be to make the properties as deprecated, rather than removing them
outright.

Thanks,
Mark.

> 
> thx,
> 
> Jason.
> 
> On Thu, Jul 25, 2013 at 11:31:04AM -0400, Jason Cooper wrote:
> > On Tue, Jul 02, 2013 at 12:54:12PM +0200, Sebastian Hesselbarth wrote:
> > > DMA_MEMSET support has been removed, so update the device tree files
> > > and corresponding binding documentation for Marvell SoCs.
> > > 
> > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> > > ---
> > > Cc: Russell King <linux@arm.linux.org.uk> 
> > > Cc: Jason Cooper <jason@lakedaemon.net>
> > > Cc: Andrew Lunn <andrew@lunn.ch>
> > > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > > Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> 
> > > Cc: devicetree-discuss at lists.ozlabs.org 
> > > Cc: linux-kernel at vger.kernel.org 
> > > Cc: linux-arm-kernel at lists.infradead.org 
> > > ---
> > >  Documentation/devicetree/bindings/dma/mv-xor.txt |    2 --
> > >  arch/arm/boot/dts/armada-370.dtsi                |    2 --
> > >  arch/arm/boot/dts/armada-xp.dtsi                 |    2 --
> > >  arch/arm/boot/dts/dove.dtsi                      |    2 --
> > >  arch/arm/boot/dts/kirkwood.dtsi                  |    2 --
> > >  arch/arm/boot/dts/orion5x.dtsi                   |    1 -
> > >  6 files changed, 0 insertions(+), 11 deletions(-)
> > 
> > Adding the new devicetree ml to the Cc:
> > 
> > I'm fine with the changes to the dts{i} files, but I think the binding
> > document should be handled differently.
> > 
> > thx,
> > 
> > Jason.
> > 
> > > 
> > > diff --git a/Documentation/devicetree/bindings/dma/mv-xor.txt b/Documentation/devicetree/bindings/dma/mv-xor.txt
> > > index 7c6cb7f..68f7004 100644
> > > --- a/Documentation/devicetree/bindings/dma/mv-xor.txt
> > > +++ b/Documentation/devicetree/bindings/dma/mv-xor.txt
> > > @@ -14,7 +14,6 @@ properties:
> > >  
> > >  And the following optional properties:
> > >  - dmacap,memcpy to indicate that the XOR channel is capable of memcpy operations
> > > -- dmacap,memset to indicate that the XOR channel is capable of memset operations
> > >  - dmacap,xor to indicate that the XOR channel is capable of xor operations
> > >  
> > >  Example:
> > > @@ -35,6 +34,5 @@ xor at d0060900 {
> > >  	      interrupts = <52>;
> > >  	      dmacap,memcpy;
> > >  	      dmacap,xor;
> > > -	      dmacap,memset;
> > >  	};
> > >  };
> > > diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
> > > index fa3dfc6..a315ad1 100644
> > > --- a/arch/arm/boot/dts/armada-370.dtsi
> > > +++ b/arch/arm/boot/dts/armada-370.dtsi
> > > @@ -132,7 +132,6 @@
> > >  					interrupts = <52>;
> > >  					dmacap,memcpy;
> > >  					dmacap,xor;
> > > -					dmacap,memset;
> > >  				};
> > >  			};
> > >  
> > > @@ -151,7 +150,6 @@
> > >  					interrupts = <95>;
> > >  					dmacap,memcpy;
> > >  					dmacap,xor;
> > > -					dmacap,memset;
> > >  				};
> > >  			};
> > >  
> > > diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
> > > index 416eb94..4b3dd56 100644
> > > --- a/arch/arm/boot/dts/armada-xp.dtsi
> > > +++ b/arch/arm/boot/dts/armada-xp.dtsi
> > > @@ -114,7 +114,6 @@
> > >  					interrupts = <52>;
> > >  					dmacap,memcpy;
> > >  					dmacap,xor;
> > > -					dmacap,memset;
> > >  				};
> > >  			};
> > >  
> > > @@ -134,7 +133,6 @@
> > >  					interrupts = <95>;
> > >  					dmacap,memcpy;
> > >  					dmacap,xor;
> > > -					dmacap,memset;
> > >  				};
> > >  			};
> > >  
> > > diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
> > > index 6cab468..2cef34f 100644
> > > --- a/arch/arm/boot/dts/dove.dtsi
> > > +++ b/arch/arm/boot/dts/dove.dtsi
> > > @@ -232,7 +232,6 @@
> > >  
> > >  			channel1 {
> > >  				interrupts = <40>;
> > > -				dmacap,memset;
> > >  				dmacap,memcpy;
> > >  				dmacap,xor;
> > >  			};
> > > @@ -253,7 +252,6 @@
> > >  
> > >  			channel1 {
> > >  				interrupts = <43>;
> > > -				dmacap,memset;
> > >  				dmacap,memcpy;
> > >  				dmacap,xor;
> > >  			};
> > > diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
> > > index 9809fc1..078637c 100644
> > > --- a/arch/arm/boot/dts/kirkwood.dtsi
> > > +++ b/arch/arm/boot/dts/kirkwood.dtsi
> > > @@ -126,7 +126,6 @@
> > >  			      interrupts = <6>;
> > >  			      dmacap,memcpy;
> > >  			      dmacap,xor;
> > > -			      dmacap,memset;
> > >  			};
> > >  		};
> > >  
> > > @@ -146,7 +145,6 @@
> > >  			      interrupts = <8>;
> > >  			      dmacap,memcpy;
> > >  			      dmacap,xor;
> > > -			      dmacap,memset;
> > >  			};
> > >  		};
> > >  
> > > diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
> > > index 892c64e..f82ece7 100644
> > > --- a/arch/arm/boot/dts/orion5x.dtsi
> > > +++ b/arch/arm/boot/dts/orion5x.dtsi
> > > @@ -120,7 +120,6 @@
> > >  			      interrupts = <31>;
> > >  			      dmacap,memcpy;
> > >  			      dmacap,xor;
> > > -			      dmacap,memset;
> > >  			};
> > >  		};
> > >  
> > > -- 
> > > 1.7.2.5
> > > 
> > > 
> > > _______________________________________________
> > > linux-arm-kernel mailing list
> > > linux-arm-kernel at lists.infradead.org
> > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> > --
> > To unsubscribe from this list: send the line "unsubscribe devicetree" in
> > the body of a message to majordomo at vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

[PATCH 1/2] ARM: remove dmacap,memset from Device tree binding

[Jason Cooper]

On Mon, Aug 05, 2013 at 10:53:41AM +0100, Mark Rutland wrote:
> On Sun, Aug 04, 2013 at 02:09:04AM +0100, Jason Cooper wrote:
> > DT Maintainers,
> > 
> > It's been a week with no comment.  Shall I assume it's ok to apply
> > this?
> 
> Apologies for the delay, still catching up on binding review.
> 
> I'm not entirely sure on this. The property described is still true for
> the device, even if the kernel's not using that information now. My
> feeling would be to keep them, unless there's a plan to better describe
> the properties of the XOR channels.
> 
> It shouldn't harm the kernel to have some properties we don't use at
> this point in time. If we want to reorganise the binding, the first step
> would be to make the properties as deprecated, rather than removing them
> outright.

Ok, that matches what I was originally thinking.  The bindings are
supposed to be OS-agnostic, so the fact that we no longer use it is
irrelevant.  The hardware still has the capability.

Sebastian, I'm just going to drop this patch.

thx,

Jason.

> > On Thu, Jul 25, 2013 at 11:31:04AM -0400, Jason Cooper wrote:
> > > On Tue, Jul 02, 2013 at 12:54:12PM +0200, Sebastian Hesselbarth wrote:
> > > > DMA_MEMSET support has been removed, so update the device tree files
> > > > and corresponding binding documentation for Marvell SoCs.
> > > > 
> > > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> > > > ---
> > > > Cc: Russell King <linux@arm.linux.org.uk> 
> > > > Cc: Jason Cooper <jason@lakedaemon.net>
> > > > Cc: Andrew Lunn <andrew@lunn.ch>
> > > > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > > > Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> 
> > > > Cc: devicetree-discuss at lists.ozlabs.org 
> > > > Cc: linux-kernel at vger.kernel.org 
> > > > Cc: linux-arm-kernel at lists.infradead.org 
> > > > ---
> > > >  Documentation/devicetree/bindings/dma/mv-xor.txt |    2 --
> > > >  arch/arm/boot/dts/armada-370.dtsi                |    2 --
> > > >  arch/arm/boot/dts/armada-xp.dtsi                 |    2 --
> > > >  arch/arm/boot/dts/dove.dtsi                      |    2 --
> > > >  arch/arm/boot/dts/kirkwood.dtsi                  |    2 --
> > > >  arch/arm/boot/dts/orion5x.dtsi                   |    1 -
> > > >  6 files changed, 0 insertions(+), 11 deletions(-)
> > > 
> > > Adding the new devicetree ml to the Cc:
> > > 
> > > I'm fine with the changes to the dts{i} files, but I think the binding
> > > document should be handled differently.
> > > 
> > > thx,
> > > 
> > > Jason.
> > > 
> > > > 
> > > > diff --git a/Documentation/devicetree/bindings/dma/mv-xor.txt b/Documentation/devicetree/bindings/dma/mv-xor.txt
> > > > index 7c6cb7f..68f7004 100644
> > > > --- a/Documentation/devicetree/bindings/dma/mv-xor.txt
> > > > +++ b/Documentation/devicetree/bindings/dma/mv-xor.txt
> > > > @@ -14,7 +14,6 @@ properties:
> > > >  
> > > >  And the following optional properties:
> > > >  - dmacap,memcpy to indicate that the XOR channel is capable of memcpy operations
> > > > -- dmacap,memset to indicate that the XOR channel is capable of memset operations
> > > >  - dmacap,xor to indicate that the XOR channel is capable of xor operations
> > > >  
> > > >  Example:
> > > > @@ -35,6 +34,5 @@ xor at d0060900 {
> > > >  	      interrupts = <52>;
> > > >  	      dmacap,memcpy;
> > > >  	      dmacap,xor;
> > > > -	      dmacap,memset;
> > > >  	};
> > > >  };
> > > > diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
> > > > index fa3dfc6..a315ad1 100644
> > > > --- a/arch/arm/boot/dts/armada-370.dtsi
> > > > +++ b/arch/arm/boot/dts/armada-370.dtsi
> > > > @@ -132,7 +132,6 @@
> > > >  					interrupts = <52>;
> > > >  					dmacap,memcpy;
> > > >  					dmacap,xor;
> > > > -					dmacap,memset;
> > > >  				};
> > > >  			};
> > > >  
> > > > @@ -151,7 +150,6 @@
> > > >  					interrupts = <95>;
> > > >  					dmacap,memcpy;
> > > >  					dmacap,xor;
> > > > -					dmacap,memset;
> > > >  				};
> > > >  			};
> > > >  
> > > > diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
> > > > index 416eb94..4b3dd56 100644
> > > > --- a/arch/arm/boot/dts/armada-xp.dtsi
> > > > +++ b/arch/arm/boot/dts/armada-xp.dtsi
> > > > @@ -114,7 +114,6 @@
> > > >  					interrupts = <52>;
> > > >  					dmacap,memcpy;
> > > >  					dmacap,xor;
> > > > -					dmacap,memset;
> > > >  				};
> > > >  			};
> > > >  
> > > > @@ -134,7 +133,6 @@
> > > >  					interrupts = <95>;
> > > >  					dmacap,memcpy;
> > > >  					dmacap,xor;
> > > > -					dmacap,memset;
> > > >  				};
> > > >  			};
> > > >  
> > > > diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
> > > > index 6cab468..2cef34f 100644
> > > > --- a/arch/arm/boot/dts/dove.dtsi
> > > > +++ b/arch/arm/boot/dts/dove.dtsi
> > > > @@ -232,7 +232,6 @@
> > > >  
> > > >  			channel1 {
> > > >  				interrupts = <40>;
> > > > -				dmacap,memset;
> > > >  				dmacap,memcpy;
> > > >  				dmacap,xor;
> > > >  			};
> > > > @@ -253,7 +252,6 @@
> > > >  
> > > >  			channel1 {
> > > >  				interrupts = <43>;
> > > > -				dmacap,memset;
> > > >  				dmacap,memcpy;
> > > >  				dmacap,xor;
> > > >  			};
> > > > diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
> > > > index 9809fc1..078637c 100644
> > > > --- a/arch/arm/boot/dts/kirkwood.dtsi
> > > > +++ b/arch/arm/boot/dts/kirkwood.dtsi
> > > > @@ -126,7 +126,6 @@
> > > >  			      interrupts = <6>;
> > > >  			      dmacap,memcpy;
> > > >  			      dmacap,xor;
> > > > -			      dmacap,memset;
> > > >  			};
> > > >  		};
> > > >  
> > > > @@ -146,7 +145,6 @@
> > > >  			      interrupts = <8>;
> > > >  			      dmacap,memcpy;
> > > >  			      dmacap,xor;
> > > > -			      dmacap,memset;
> > > >  			};
> > > >  		};
> > > >  
> > > > diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
> > > > index 892c64e..f82ece7 100644
> > > > --- a/arch/arm/boot/dts/orion5x.dtsi
> > > > +++ b/arch/arm/boot/dts/orion5x.dtsi
> > > > @@ -120,7 +120,6 @@
> > > >  			      interrupts = <31>;
> > > >  			      dmacap,memcpy;
> > > >  			      dmacap,xor;
> > > > -			      dmacap,memset;
> > > >  			};
> > > >  		};
> > > >  
> > > > -- 
> > > > 1.7.2.5
> > > > 
> > > > 
> > > > _______________________________________________
> > > > linux-arm-kernel mailing list
> > > > linux-arm-kernel at lists.infradead.org
> > > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> > > --
> > > To unsubscribe from this list: send the line "unsubscribe devicetree" in
> > > the body of a message to majordomo at vger.kernel.org
> > > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > 
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> > 
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/2] ARM: remove dmacap,memset from Device tree binding

[Sebastian Hesselbarth]

On 08/05/13 14:26, Jason Cooper wrote:
> On Mon, Aug 05, 2013 at 10:53:41AM +0100, Mark Rutland wrote:
>> I'm not entirely sure on this. The property described is still true for
>> the device, even if the kernel's not using that information now. My
>> feeling would be to keep them, unless there's a plan to better describe
>> the properties of the XOR channels.
>>
>> It shouldn't harm the kernel to have some properties we don't use at
>> this point in time. If we want to reorganise the binding, the first step
>> would be to make the properties as deprecated, rather than removing them
>> outright.
>
> Ok, that matches what I was originally thinking.  The bindings are
> supposed to be OS-agnostic, so the fact that we no longer use it is
> irrelevant.  The hardware still has the capability.
>
> Sebastian, I'm just going to drop this patch.

Sure, I am fine with dropping it.

Sebastian