diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:41 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:41 +0000 |
| commit | 608ad4b6932f72995144bc72a31b1e0843a5bb28 (patch) | |
| tree | 74954deb17c22532d39672450df39812b548af80 /target/linux/mvebu/patches-3.10/0069-ARM-mvebu-use-dts-pre-processor-for-mv78230.patch | |
| parent | a8c10d8f903682fb3dde82084665a9a72216b02e (diff) | |
| download | master-187ad058-608ad4b6932f72995144bc72a31b1e0843a5bb28.tar.gz master-187ad058-608ad4b6932f72995144bc72a31b1e0843a5bb28.tar.bz2 master-187ad058-608ad4b6932f72995144bc72a31b1e0843a5bb28.zip | |
mvebu: backport mainline patches from kernel 3.12
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39565 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0069-ARM-mvebu-use-dts-pre-processor-for-mv78230.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.10/0069-ARM-mvebu-use-dts-pre-processor-for-mv78230.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0069-ARM-mvebu-use-dts-pre-processor-for-mv78230.patch b/target/linux/mvebu/patches-3.10/0069-ARM-mvebu-use-dts-pre-processor-for-mv78230.patch new file mode 100644 index 0000000000..4961b714e5 --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0069-ARM-mvebu-use-dts-pre-processor-for-mv78230.patch @@ -0,0 +1,21 @@ +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"; |