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
25 lines
849 B
Diff
25 lines
849 B
Diff
From 32016796bb28ebf748851c166b03159600aa9a00 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Tue, 23 Jul 2013 08:33:39 -0300
|
|
Subject: [PATCH 063/203] ARM: kirkwood: Introduce MBUS_ID
|
|
|
|
This macro is used to define window's target ID and attribute cells
|
|
for the MBus ranges entries.
|
|
|
|
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/kirkwood.dtsi | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/arch/arm/boot/dts/kirkwood.dtsi
|
|
+++ b/arch/arm/boot/dts/kirkwood.dtsi
|
|
@@ -1,5 +1,7 @@
|
|
/include/ "skeleton.dtsi"
|
|
|
|
+#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
|
|
+
|
|
/ {
|
|
compatible = "marvell,kirkwood";
|
|
interrupt-parent = <&intc>;
|