aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-3.18/024-ARM-mvebu-a38x-Fix-node-names.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
commit29130d39e3f002b684d4fdbcb3dff4ecc202be2c (patch)
tree481f328f8e8475fbd2b56a0a375da99e187d1cb9 /target/linux/mvebu/patches-3.18/024-ARM-mvebu-a38x-Fix-node-names.patch
parent00d422fc600232d02f70877305288501d15ed07d (diff)
downloadupstream-29130d39e3f002b684d4fdbcb3dff4ecc202be2c.tar.gz
upstream-29130d39e3f002b684d4fdbcb3dff4ecc202be2c.tar.bz2
upstream-29130d39e3f002b684d4fdbcb3dff4ecc202be2c.zip
mvebu: refresh 3.18 patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 44462
Diffstat (limited to 'target/linux/mvebu/patches-3.18/024-ARM-mvebu-a38x-Fix-node-names.patch')
-rw-r--r--target/linux/mvebu/patches-3.18/024-ARM-mvebu-a38x-Fix-node-names.patch17
1 files changed, 2 insertions, 15 deletions
diff --git a/target/linux/mvebu/patches-3.18/024-ARM-mvebu-a38x-Fix-node-names.patch b/target/linux/mvebu/patches-3.18/024-ARM-mvebu-a38x-Fix-node-names.patch
index 7b506e75a8..37dd4c257c 100644
--- a/target/linux/mvebu/patches-3.18/024-ARM-mvebu-a38x-Fix-node-names.patch
+++ b/target/linux/mvebu/patches-3.18/024-ARM-mvebu-a38x-Fix-node-names.patch
@@ -19,8 +19,6 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
-diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi
-index 4173a8ab34e7..13400ce88c54 100644
--- a/arch/arm/boot/dts/armada-380.dtsi
+++ b/arch/arm/boot/dts/armada-380.dtsi
@@ -32,7 +32,7 @@
@@ -32,8 +30,6 @@ index 4173a8ab34e7..13400ce88c54 100644
compatible = "marvell,mv88f6810-pinctrl";
reg = <0x18000 0x20>;
};
-diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts
-index 2aaa9d2ac284..212605ccc7b6 100644
--- a/arch/arm/boot/dts/armada-385-db.dts
+++ b/arch/arm/boot/dts/armada-385-db.dts
@@ -74,7 +74,7 @@
@@ -45,8 +41,6 @@ index 2aaa9d2ac284..212605ccc7b6 100644
phy0: ethernet-phy@0 {
reg = <0>;
};
-diff --git a/arch/arm/boot/dts/armada-385-rd.dts b/arch/arm/boot/dts/armada-385-rd.dts
-index aaca2861dc87..74a3bfe6efd7 100644
--- a/arch/arm/boot/dts/armada-385-rd.dts
+++ b/arch/arm/boot/dts/armada-385-rd.dts
@@ -67,7 +67,7 @@
@@ -58,8 +52,6 @@ index aaca2861dc87..74a3bfe6efd7 100644
phy0: ethernet-phy@0 {
reg = <0>;
};
-diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi
-index 6283d7912f71..5249a4d3c207 100644
--- a/arch/arm/boot/dts/armada-385.dtsi
+++ b/arch/arm/boot/dts/armada-385.dtsi
@@ -37,7 +37,7 @@
@@ -71,8 +63,6 @@ index 6283d7912f71..5249a4d3c207 100644
compatible = "marvell,mv88f6820-pinctrl";
reg = <0x18000 0x20>;
};
-diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
-index 74391dace9e7..ada1f206028b 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -193,7 +193,7 @@
@@ -83,8 +73,8 @@ index 74391dace9e7..ada1f206028b 100644
+ pinctrl@18000 {
compatible = "marvell,mv88f6820-pinctrl";
reg = <0x18000 0x20>;
- };
-@@ -373,7 +373,7 @@
+
+@@ -412,7 +412,7 @@
status = "disabled";
};
@@ -93,6 +83,3 @@ index 74391dace9e7..ada1f206028b 100644
#address-cells = <1>;
#size-cells = <0>;
compatible = "marvell,orion-mdio";
---
-2.2.1
-