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
63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From d887da014c3fabf5fa4da47b143edc069e72fd62 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Tue, 21 May 2013 12:33:27 +0200
|
|
Subject: [PATCH 019/203] arm: mvebu: fix length of Ethernet registers area in
|
|
.dtsi
|
|
|
|
The length of the registers area for the Marvell 370/XP Ethernet
|
|
controller was incorrect in the .dtsi: 0x2400 while it should have
|
|
been 0x4000. 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 | 4 ++--
|
|
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 2 +-
|
|
arch/arm/boot/dts/armada-xp.dtsi | 2 +-
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
|
|
@@ -96,7 +96,7 @@
|
|
|
|
ethernet@70000 {
|
|
compatible = "marvell,armada-370-neta";
|
|
- reg = <0x70000 0x2500>;
|
|
+ reg = <0x70000 0x4000>;
|
|
interrupts = <8>;
|
|
clocks = <&gateclk 4>;
|
|
status = "disabled";
|
|
@@ -104,7 +104,7 @@
|
|
|
|
ethernet@74000 {
|
|
compatible = "marvell,armada-370-neta";
|
|
- reg = <0x74000 0x2500>;
|
|
+ reg = <0x74000 0x4000>;
|
|
interrupts = <10>;
|
|
clocks = <&gateclk 3>;
|
|
status = "disabled";
|
|
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
|
|
@@ -107,7 +107,7 @@
|
|
|
|
ethernet@34000 {
|
|
compatible = "marvell,armada-370-neta";
|
|
- reg = <0x34000 0x2500>;
|
|
+ reg = <0x34000 0x4000>;
|
|
interrupts = <14>;
|
|
clocks = <&gateclk 1>;
|
|
status = "disabled";
|
|
--- a/arch/arm/boot/dts/armada-xp.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp.dtsi
|
|
@@ -88,7 +88,7 @@
|
|
|
|
ethernet@30000 {
|
|
compatible = "marvell,armada-370-neta";
|
|
- reg = <0x30000 0x2500>;
|
|
+ reg = <0x30000 0x4000>;
|
|
interrupts = <12>;
|
|
clocks = <&gateclk 2>;
|
|
status = "disabled";
|