summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-08-25 16:52:29 -0700
committerOlof Johansson <olof@lixom.net>2016-08-25 16:52:29 -0700
commit2586d61f81ea4d84e325cbde2b316c9a8ca43e38 (patch)
tree67b0320244117467099fcdecc617e9957449eae0 /arch/arm/boot
parentfa8410b355251fd30341662a40ac6b22d3e38468 (diff)
parentd9fd3c918114cfd3995947339549c7341181efb0 (diff)
downloadop-kernel-dev-2586d61f81ea4d84e325cbde2b316c9a8ca43e38.zip
op-kernel-dev-2586d61f81ea4d84e325cbde2b316c9a8ca43e38.tar.gz
Merge tag 'mvebu-fixes-4.8-1' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for 4.8 (part 1) Fix lan numbering for the Armada 388 clearfog board * tag 'mvebu-fixes-4.8-1' of git://git.infradead.org/linux-mvebu: ARM: dts: armada-388-clearfog: number LAN ports properly Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/armada-388-clearfog.dts8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts
index 2e0556a..d3e6bd8 100644
--- a/arch/arm/boot/dts/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog.dts
@@ -390,12 +390,12 @@
port@0 {
reg = <0>;
- label = "lan1";
+ label = "lan5";
};
port@1 {
reg = <1>;
- label = "lan2";
+ label = "lan4";
};
port@2 {
@@ -405,12 +405,12 @@
port@3 {
reg = <3>;
- label = "lan4";
+ label = "lan2";
};
port@4 {
reg = <4>;
- label = "lan5";
+ label = "lan1";
};
port@5 {
OpenPOWER on IntegriCloud