[PATCH 3.12 073/146] ARM: mvebu: fix NOR bus-width in Armada XP DB Device Tree

2014-06-09 Thread Jiri Slaby
From: Thomas Petazzoni 

3.12-stable review patch.  If anyone has any objections, please let me know.

===

commit f3aec8f3f05025e7b450102dae0759375346706e 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 DB 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
b484ff42df475c5087d614c4d477273e1906bcb9 ('ARM: mvebu: Add support for
NOR flash device on Armada XP-DB board') which was merged in v3.11.

Signed-off-by: Thomas Petazzoni 
Link: 
https://lkml.kernel.org/r/1397489361-5833-4-git-send-email-thomas.petazz...@free-electrons.com
Fixes: b484ff42df47 ('ARM: mvebu: Add support for NOR flash device on Armada 
XP-DB board')
Acked-by: Ezequiel Garcia 
Acked-by: Gregory CLEMENT 
Signed-off-by: Jason Cooper 
Signed-off-by: Jiri Slaby 
---
 arch/arm/boot/dts/armada-xp-db.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/armada-xp-db.dts 
b/arch/arm/boot/dts/armada-xp-db.dts
index bcf6d79a57ec..8c2fe44e4dfe 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -40,7 +40,7 @@
/* Device Bus parameters are required */
 
/* Read parameters */
-   devbus,bus-width= <8>;
+   devbus,bus-width= <16>;
devbus,turn-off-ps  = <6>;
devbus,badr-skew-ps = <0>;
devbus,acc-first-ps = <124000>;
-- 
1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 3.12 073/146] ARM: mvebu: fix NOR bus-width in Armada XP DB Device Tree

2014-06-09 Thread Jiri Slaby
From: Thomas Petazzoni thomas.petazz...@free-electrons.com

3.12-stable review patch.  If anyone has any objections, please let me know.

===

commit f3aec8f3f05025e7b450102dae0759375346706e 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 DB 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
b484ff42df475c5087d614c4d477273e1906bcb9 ('ARM: mvebu: Add support for
NOR flash device on Armada XP-DB board') which was merged in v3.11.

Signed-off-by: Thomas Petazzoni thomas.petazz...@free-electrons.com
Link: 
https://lkml.kernel.org/r/1397489361-5833-4-git-send-email-thomas.petazz...@free-electrons.com
Fixes: b484ff42df47 ('ARM: mvebu: Add support for NOR flash device on Armada 
XP-DB board')
Acked-by: Ezequiel Garcia ezequiel.gar...@free-electrons.com
Acked-by: Gregory CLEMENT gregory.clem...@free-electrons.com
Signed-off-by: Jason Cooper ja...@lakedaemon.net
Signed-off-by: Jiri Slaby jsl...@suse.cz
---
 arch/arm/boot/dts/armada-xp-db.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/armada-xp-db.dts 
b/arch/arm/boot/dts/armada-xp-db.dts
index bcf6d79a57ec..8c2fe44e4dfe 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -40,7 +40,7 @@
/* Device Bus parameters are required */
 
/* Read parameters */
-   devbus,bus-width= 8;
+   devbus,bus-width= 16;
devbus,turn-off-ps  = 6;
devbus,badr-skew-ps = 0;
devbus,acc-first-ps = 124000;
-- 
1.9.3

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/