aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2016-06-24 10:55:08 +0100
committerArvind Chauhan <arvind.chauhan@arm.com>2018-01-24 13:23:27 +0530
commit0a6c37788b00855fce8264fabae09ca8a7cf5a6f (patch)
treeef80152efd5c627c44d8eb7a9a9f6dd3cc7efa3c
parentf4679eac1f3afaaf8fe448cf424b51cefa24ee96 (diff)
HACK: arm64: dts: Disable motherboard ethernet for Juno r2
Because Android picks that one to try and use but fails to do DHCP. Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--arch/arm64/boot/dts/arm/juno-motherboard.dtsi2
-rw-r--r--arch/arm64/boot/dts/arm/juno-r2.dts4
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 3ad4c3000611..97a857198aa1 100644
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -118,7 +118,7 @@
status = "disabled";
};
- ethernet@2,00000000 {
+ smsc_ethernet: ethernet@2,00000000 {
compatible = "smsc,lan9118", "smsc,lan9115";
reg = <2 0x00000000 0x10000>;
interrupts = <3>;
diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts
index 060b58669ea3..f2331556f0cd 100644
--- a/arch/arm64/boot/dts/arm/juno-r2.dts
+++ b/arch/arm64/boot/dts/arm/juno-r2.dts
@@ -238,3 +238,7 @@
&gpu1_thermal_zone {
status = "okay";
};
+
+&smsc_ethernet {
+ status = "disabled";
+};