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
21 lines
632 B
Diff
21 lines
632 B
Diff
From 3953e4230483d6ce51b9f7e3b20db30e5ca6f4da Mon Sep 17 00:00:00 2001
|
|
From: Jason Cooper <jason@lakedaemon.net>
|
|
Date: Wed, 7 Aug 2013 20:04:21 +0000
|
|
Subject: [PATCH 069/203] ARM: mvebu: use dts pre-processor for mv78230
|
|
|
|
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
|
|
---
|
|
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
|
|
@@ -13,7 +13,7 @@
|
|
* common to all Armada XP SoCs.
|
|
*/
|
|
|
|
-/include/ "armada-xp.dtsi"
|
|
+#include "armada-xp.dtsi"
|
|
|
|
/ {
|
|
model = "Marvell Armada XP MV78230 SoC";
|