3.10-stable patches

added patches:
	arm-mvebu-fix-nor-bus-width-in-armada-xp-gp-device-tree.patch
	arm-mvebu-fix-nor-bus-width-in-armada-xp-openblocks-ax3-device-tree.patch

diff --git a/queue-3.10/arm-mvebu-fix-nor-bus-width-in-armada-xp-gp-device-tree.patch b/queue-3.10/arm-mvebu-fix-nor-bus-width-in-armada-xp-gp-device-tree.patch
new file mode 100644 (file)
index 0000000..7456ded
--- /dev/null
+++ b/queue-3.10/arm-mvebu-fix-nor-bus-width-in-armada-xp-gp-device-tree.patch
@@ -0,0 +1,50 @@
+From 1a88f809ccb5db1509a7514b187c00b3a995fc82 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Mon, 14 Apr 2014 17:29:19 +0200
+Subject: ARM: mvebu: fix NOR bus-width in Armada XP GP Device Tree
+
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+commit 1a88f809ccb5db1509a7514b187c00b3a995fc82 upstream.
+
+The mvebu-devbus driver had a serious bug, which lead to a 8 bits bus
+width declared in the Device Tree being considered as a 16 bits bus
+width when configuring the hardware.
+
+This bug in mvebu-devbus driver was compensated by a symetric mistake
+in the Armada XP GP Device Tree: a 8 bits bus width was declared, even
+though the hardware actually has a 16 bits bus width connection with
+the NOR flash.
+
+Now that we have fixed the mvebu-devbus driver to behave according to
+its Device Tree binding, this commit fixes the problematic Device Tree
+files as well.
+
+This bug was introduced in commit
+da8d1b38356853c37116f9afa29f15648d7fb159 ('ARM: mvebu: Add support for
+NOR flash device on Armada XP-GP board') which was merged in v3.10.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Link: https://lkml.kernel.org/r/1397489361-5833-3-git-send-email-thomas.petazzoni@free-electrons.com
+Fixes: da8d1b383568 ('ARM: mvebu: Add support for NOR flash device on Armada XP-GP board')
+Cc: stable@vger.kernel.org # v3.10+
+Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
+Signed-off-by: Jason Cooper <jason@lakedaemon.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/armada-xp-gp.dts |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/armada-xp-gp.dts
++++ b/arch/arm/boot/dts/armada-xp-gp.dts
+@@ -124,7 +124,7 @@
+                               /* Device Bus parameters are required */
+ 
+                               /* Read parameters */
+-                              devbus,bus-width    = <8>;
++                              devbus,bus-width    = <16>;
+                               devbus,turn-off-ps  = <60000>;
+                               devbus,badr-skew-ps = <0>;
+                               devbus,acc-first-ps = <124000>;

diff --git a/queue-3.10/arm-mvebu-fix-nor-bus-width-in-armada-xp-openblocks-ax3-device-tree.patch b/queue-3.10/arm-mvebu-fix-nor-bus-width-in-armada-xp-openblocks-ax3-device-tree.patch
new file mode 100644 (file)
index 0000000..8d1fecc
--- /dev/null
+++ b/queue-3.10/arm-mvebu-fix-nor-bus-width-in-armada-xp-openblocks-ax3-device-tree.patch
@@ -0,0 +1,51 @@
+From 6e20bae8a39c40d4e03698e4160bad2d2629062b Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Mon, 14 Apr 2014 17:29:21 +0200
+Subject: ARM: mvebu: fix NOR bus-width in Armada XP OpenBlocks AX3 Device Tree
+
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+commit 6e20bae8a39c40d4e03698e4160bad2d2629062b upstream.
+
+The mvebu-devbus driver had a serious bug, which lead to a 8 bits bus
+width declared in the Device Tree being considered as a 16 bits bus
+width when configuring the hardware.
+
+This bug in mvebu-devbus driver was compensated by a symetric mistake
+in the Armada XP OpenBlocks AX3 Device Tree: a 8 bits bus width was
+declared, even though the hardware actually has a 16 bits bus width
+connection with the NOR flash.
+
+Now that we have fixed the mvebu-devbus driver to behave according to
+its Device Tree binding, this commit fixes the problematic Device Tree
+files as well.
+
+This bug was introduced in commit
+a7d4f81821f7eec3175f8e23dd6949c71ab2da43 ('ARM: mvebu: Add support for
+NOR flash device on Openblocks AX3 board') which was merged in v3.10.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Link: https://lkml.kernel.org/r/1397489361-5833-5-git-send-email-thomas.petazzoni@free-electrons.com
+Fixes: a7d4f81821f7 ('ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board')
+Cc: stable@vger.kernel.org # v3.10+
+Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
+Signed-off-by: Jason Cooper <jason@lakedaemon.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+---
+ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
++++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+@@ -152,7 +152,7 @@
+                               /* Device Bus parameters are required */
+ 
+                               /* Read parameters */
+-                              devbus,bus-width    = <8>;
++                              devbus,bus-width    = <16>;
+                               devbus,turn-off-ps  = <60000>;
+                               devbus,badr-skew-ps = <0>;
+                               devbus,acc-first-ps = <124000>;

diff --git a/queue-3.10/series b/queue-3.10/series
index 99a30ded7660d8d83f82ce2a6be6618623b570f3..d82e043d22369628c10a5a9a1ea8b5c1c960754d 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -1,2 +1,4 @@
 fs-userns-change-inode_capable-to-capable_wrt_inode_uidgid.patch
 mlx4_en-don-t-use-napi_synchronize-inside-mlx4_en_netpoll.patch
+arm-mvebu-fix-nor-bus-width-in-armada-xp-gp-device-tree.patch
+arm-mvebu-fix-nor-bus-width-in-armada-xp-openblocks-ax3-device-tree.patch