3af779eb17
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.11, and Linux v3.12. This work mainly covers: * Ground work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family,and the Armada family. * Further updates to the mvebu MBus. * Work and ground work for enabling MSI on the Armada family. * some phy / mdio bus initialization related work. * Device tree binding documentation update. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39565
133 lines
3.4 KiB
Diff
133 lines
3.4 KiB
Diff
From 09aa74a11d05763043b1925628f65a5ac0d42237 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Wed, 12 Jun 2013 15:42:00 -0300
|
|
Subject: [PATCH 055/203] ARM: mvebu: Use the preprocessor on Armada 370/XP
|
|
device tree files
|
|
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Tested-by: Andrew Lunn <andrew@lunn.ch>
|
|
Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/armada-370-db.dts | 2 +-
|
|
arch/arm/boot/dts/armada-370-mirabox.dts | 2 +-
|
|
arch/arm/boot/dts/armada-370-rd.dts | 2 +-
|
|
arch/arm/boot/dts/armada-370.dtsi | 2 +-
|
|
arch/arm/boot/dts/armada-xp-db.dts | 2 +-
|
|
arch/arm/boot/dts/armada-xp-gp.dts | 2 +-
|
|
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 2 +-
|
|
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 2 +-
|
|
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 +-
|
|
arch/arm/boot/dts/armada-xp.dtsi | 2 +-
|
|
10 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/armada-370-db.dts
|
|
+++ b/arch/arm/boot/dts/armada-370-db.dts
|
|
@@ -14,7 +14,7 @@
|
|
*/
|
|
|
|
/dts-v1/;
|
|
-/include/ "armada-370.dtsi"
|
|
+#include "armada-370.dtsi"
|
|
|
|
/ {
|
|
model = "Marvell Armada 370 Evaluation Board";
|
|
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
|
|
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
|
|
@@ -9,7 +9,7 @@
|
|
*/
|
|
|
|
/dts-v1/;
|
|
-/include/ "armada-370.dtsi"
|
|
+#include "armada-370.dtsi"
|
|
|
|
/ {
|
|
model = "Globalscale Mirabox";
|
|
--- a/arch/arm/boot/dts/armada-370-rd.dts
|
|
+++ b/arch/arm/boot/dts/armada-370-rd.dts
|
|
@@ -12,7 +12,7 @@
|
|
*/
|
|
|
|
/dts-v1/;
|
|
-/include/ "armada-370.dtsi"
|
|
+#include "armada-370.dtsi"
|
|
|
|
/ {
|
|
model = "Marvell Armada 370 Reference Design";
|
|
--- a/arch/arm/boot/dts/armada-370.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-370.dtsi
|
|
@@ -15,7 +15,7 @@
|
|
* common to all Armada SoCs.
|
|
*/
|
|
|
|
-/include/ "armada-370-xp.dtsi"
|
|
+#include "armada-370-xp.dtsi"
|
|
/include/ "skeleton.dtsi"
|
|
|
|
/ {
|
|
--- a/arch/arm/boot/dts/armada-xp-db.dts
|
|
+++ b/arch/arm/boot/dts/armada-xp-db.dts
|
|
@@ -14,7 +14,7 @@
|
|
*/
|
|
|
|
/dts-v1/;
|
|
-/include/ "armada-xp-mv78460.dtsi"
|
|
+#include "armada-xp-mv78460.dtsi"
|
|
|
|
/ {
|
|
model = "Marvell Armada XP Evaluation Board";
|
|
--- a/arch/arm/boot/dts/armada-xp-gp.dts
|
|
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
|
|
@@ -14,7 +14,7 @@
|
|
*/
|
|
|
|
/dts-v1/;
|
|
-/include/ "armada-xp-mv78460.dtsi"
|
|
+#include "armada-xp-mv78460.dtsi"
|
|
|
|
/ {
|
|
model = "Marvell Armada XP Development Board DB-MV784MP-GP";
|
|
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
|
|
@@ -13,7 +13,7 @@
|
|
* common to all Armada XP SoCs.
|
|
*/
|
|
|
|
-/include/ "armada-xp.dtsi"
|
|
+#include "armada-xp.dtsi"
|
|
|
|
/ {
|
|
model = "Marvell Armada XP MV78260 SoC";
|
|
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
|
|
@@ -13,7 +13,7 @@
|
|
* common to all Armada XP SoCs.
|
|
*/
|
|
|
|
-/include/ "armada-xp.dtsi"
|
|
+#include "armada-xp.dtsi"
|
|
|
|
/ {
|
|
model = "Marvell Armada XP MV78460 SoC";
|
|
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
|
|
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
|
|
@@ -11,7 +11,7 @@
|
|
*/
|
|
|
|
/dts-v1/;
|
|
-/include/ "armada-xp-mv78260.dtsi"
|
|
+#include "armada-xp-mv78260.dtsi"
|
|
|
|
/ {
|
|
model = "PlatHome OpenBlocks AX3-4 board";
|
|
--- a/arch/arm/boot/dts/armada-xp.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp.dtsi
|
|
@@ -16,7 +16,7 @@
|
|
* common to all Armada SoCs.
|
|
*/
|
|
|
|
-/include/ "armada-370-xp.dtsi"
|
|
+#include "armada-370-xp.dtsi"
|
|
|
|
/ {
|
|
model = "Marvell Armada XP family SoC";
|