69d323f231
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.10, and Linux v3.11. This work mainly covers: * Enabling USB storage, and PCI to mvebu_defconfig. * Add support for NOR flash. * Some PCI device tree related updates, and bus parsing. * Adding Armada XP & 370 PCI driver, and update some clock gating specifics. * Introduce Marvell EBU Device Bus driver. * Enaling USB in the armada*.dts. * Enabling, and updating the mvebu-mbus. * Some SATA and Ethernet related fixes. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39564
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From fc7dfe5cd096f5b5343f01f679a96ebc23e9da67 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Tue, 21 May 2013 12:33:26 +0200
|
|
Subject: [PATCH 018/203] arm: mvebu: fix length of SATA registers area in
|
|
.dtsi
|
|
|
|
The length of the registers area for the Marvell 370/XP SATA
|
|
controller was incorrect in the .dtsi: 0x2400 while it should have
|
|
been 0x5000. Until now, this problem wasn't noticed because there was
|
|
a large static mapping for all I/Os set up by ->map_io(). But since
|
|
we're going to get rid of this static mapping, we need to ensure that
|
|
the register areas are properly sized.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
|
|
---
|
|
arch/arm/boot/dts/armada-370-xp.dtsi | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
|
|
@@ -80,7 +80,7 @@
|
|
|
|
sata@a0000 {
|
|
compatible = "marvell,orion-sata";
|
|
- reg = <0xa0000 0x2400>;
|
|
+ reg = <0xa0000 0x5000>;
|
|
interrupts = <55>;
|
|
clocks = <&gateclk 15>, <&gateclk 30>;
|
|
clock-names = "0", "1";
|