diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-06-24 10:55:08 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-06-24 10:55:08 +0100 |
| commit | 147e48c3bf73bfc088183734d46821feaafb0152 (patch) | |
| tree | ea1e169270124594c4edf5842413268b800d9f09 | |
| parent | 3db2c6de04e441cd2abaea9acbc02ff1d6b07e57 (diff) | |
HACK: arm64: dts: Disabled motherboard ethernet for Juno r2lsk-3.18-armlt-20160624
Because Android picks that one to try and use but fails to do DHCP.
Quick hack to fix 16.06 release.
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno-r2.dts | 4 |
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 c138b95a8356..399d9df37ae8 100644 --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi @@ -40,7 +40,7 @@ regulator-always-on; }; - 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 699a180a0726..c32440c288f0 100644 --- a/arch/arm64/boot/dts/arm/juno-r2.dts +++ b/arch/arm64/boot/dts/arm/juno-r2.dts @@ -239,3 +239,7 @@ &pcie_ctlr { status = "okay"; }; + +&smsc_ethernet { + status = "disabled"; +}; |