aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-3.18/022-ARM-mvebu-A385-AP-Enable-the-NAND-controller.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-02-16 12:48:05 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-02-16 12:48:05 +0000
commit5fa26ab96ae22c215e2a86812a2c04bfd50a5fc3 (patch)
tree07b8cf2320086aed60e83252c03145fbfa772cf5 /target/linux/mvebu/patches-3.18/022-ARM-mvebu-A385-AP-Enable-the-NAND-controller.patch
parentc07d8fffd3bda085f52cf4f2c2a3f7fb43417f4b (diff)
downloadupstream-5fa26ab96ae22c215e2a86812a2c04bfd50a5fc3.tar.gz
upstream-5fa26ab96ae22c215e2a86812a2c04bfd50a5fc3.tar.bz2
upstream-5fa26ab96ae22c215e2a86812a2c04bfd50a5fc3.zip
mvebu: refresh 3.18 patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44462 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.18/022-ARM-mvebu-A385-AP-Enable-the-NAND-controller.patch')
-rw-r--r--target/linux/mvebu/patches-3.18/022-ARM-mvebu-A385-AP-Enable-the-NAND-controller.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/mvebu/patches-3.18/022-ARM-mvebu-A385-AP-Enable-the-NAND-controller.patch b/target/linux/mvebu/patches-3.18/022-ARM-mvebu-A385-AP-Enable-the-NAND-controller.patch
index 85a9511547..3c4a111e4a 100644
--- a/target/linux/mvebu/patches-3.18/022-ARM-mvebu-A385-AP-Enable-the-NAND-controller.patch
+++ b/target/linux/mvebu/patches-3.18/022-ARM-mvebu-A385-AP-Enable-the-NAND-controller.patch
@@ -10,11 +10,9 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
arch/arm/boot/dts/armada-385-db-ap.dts | 13 +++++++++++++
1 file changed, 13 insertions(+)
-diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
-index 3a51531eb37b..02db04867d8f 100644
--- a/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
-@@ -122,6 +122,19 @@
+@@ -150,6 +150,19 @@
phy = <&phy0>;
phy-mode = "rgmii-id";
};
@@ -34,6 +32,3 @@ index 3a51531eb37b..02db04867d8f 100644
};
pcie-controller {
---
-2.2.1
-