* [PATCH 0/2] ARM: mvebu: fixes for v3.11
@ 2013-07-02 10:54 Sebastian Hesselbarth
[not found] ` <1372762453-12018-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-07-02 10:54 ` [PATCH 2/2] ARM: orion5x: add missing mbus include Sebastian Hesselbarth
0 siblings, 2 replies; 5+ messages in thread
From: Sebastian Hesselbarth @ 2013-07-02 10:54 UTC (permalink / raw)
Cc: Andrew Lunn, Russell King, Jason Cooper,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
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-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
Cc: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>
Cc: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
Cc: Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
--
1.7.2.5
^ permalink raw reply [flat|nested] 5+ messages in thread[parent not found: <1372762453-12018-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* [PATCH 1/2] ARM: remove dmacap,memset from Device tree binding [not found] ` <1372762453-12018-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2013-07-02 10:54 ` Sebastian Hesselbarth 0 siblings, 0 replies; 5+ messages in thread From: Sebastian Hesselbarth @ 2013-07-02 10:54 UTC (permalink / raw) Cc: Andrew Lunn, Jason Cooper, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, 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-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> Cc: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> Cc: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> Cc: Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Cc: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.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@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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: orion5x: add missing mbus include 2013-07-02 10:54 [PATCH 0/2] ARM: mvebu: fixes for v3.11 Sebastian Hesselbarth [not found] ` <1372762453-12018-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2013-07-02 10:54 ` Sebastian Hesselbarth 2013-07-25 15:38 ` Jason Cooper 1 sibling, 1 reply; 5+ messages in thread From: Sebastian Hesselbarth @ 2013-07-02 10:54 UTC (permalink / raw) Cc: Sebastian Hesselbarth, Jason Cooper, Andrew Lunn, Thomas Petazzoni, devicetree-discuss, linux-kernel, linux-arm-kernel 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@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ARM: orion5x: add missing mbus include 2013-07-02 10:54 ` [PATCH 2/2] ARM: orion5x: add missing mbus include Sebastian Hesselbarth @ 2013-07-25 15:38 ` Jason Cooper 2013-07-25 21:07 ` Jason Cooper 0 siblings, 1 reply; 5+ messages in thread From: Jason Cooper @ 2013-07-25 15:38 UTC (permalink / raw) To: Sebastian Hesselbarth Cc: Thomas Petazzoni, Andrew Lunn, devicetree-discuss, linux-kernel, linux-arm-kernel 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@lists.ozlabs.org > Cc: linux-kernel@vger.kernel.org > Cc: linux-arm-kernel@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. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ARM: orion5x: add missing mbus include 2013-07-25 15:38 ` Jason Cooper @ 2013-07-25 21:07 ` Jason Cooper 0 siblings, 0 replies; 5+ messages in thread From: Jason Cooper @ 2013-07-25 21:07 UTC (permalink / raw) To: Sebastian Hesselbarth Cc: Thomas Petazzoni, Andrew Lunn, devicetree-discuss, linux-kernel, linux-arm-kernel 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@lists.ozlabs.org > > Cc: linux-kernel@vger.kernel.org > > Cc: linux-arm-kernel@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. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-07-25 21:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-02 10:54 [PATCH 0/2] ARM: mvebu: fixes for v3.11 Sebastian Hesselbarth
[not found] ` <1372762453-12018-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-07-02 10:54 ` [PATCH 1/2] ARM: remove dmacap,memset from Device tree binding Sebastian Hesselbarth
2013-07-02 10:54 ` [PATCH 2/2] ARM: orion5x: add missing mbus include Sebastian Hesselbarth
2013-07-25 15:38 ` Jason Cooper
2013-07-25 21:07 ` Jason Cooper
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).