aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-07 11:51:35 -0400
committerArnd Bergmann <arnd@arndb.de>2016-07-07 11:51:42 -0400
commit8d09251a81ecc22e542c3ff6a7dd3ca2b7e2b0e7 (patch)
treedbe1c65d05735b5208eb4ac9fac81007e0423e90
parent62a4d9b588f429f2f325c013df7f9fc680586e7b (diff)
Revert "ARM64: DTS: meson-gxbb: switch ethernet to real clock"
This reverts commit f3abd6296168, which caused a build regression: arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi:48:41: fatal error: dt-bindings/clock/gxbb-clkc.h: No such file or directory We should apply this patch one merge window later, once the clk branch is merged as well. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 35c8b2beb05c..e502c24b0ac7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -45,7 +45,6 @@
45#include <dt-bindings/interrupt-controller/arm-gic.h> 45#include <dt-bindings/interrupt-controller/arm-gic.h>
46#include <dt-bindings/gpio/meson-gxbb-gpio.h> 46#include <dt-bindings/gpio/meson-gxbb-gpio.h>
47#include <dt-bindings/reset/amlogic,meson-gxbb-reset.h> 47#include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>
48#include <dt-bindings/clock/gxbb-clkc.h>
49 48
50/ { 49/ {
51 compatible = "amlogic,meson-gxbb"; 50 compatible = "amlogic,meson-gxbb";
@@ -338,7 +337,7 @@
338 0x0 0xc8834540 0x0 0x4>; 337 0x0 0xc8834540 0x0 0x4>;
339 interrupts = <0 8 1>; 338 interrupts = <0 8 1>;
340 interrupt-names = "macirq"; 339 interrupt-names = "macirq";
341 clocks = <&clkc CLKID_ETH>; 340 clocks = <&xtal>;
342 clock-names = "stmmaceth"; 341 clock-names = "stmmaceth";
343 phy-mode = "rgmii"; 342 phy-mode = "rgmii";
344 status = "disabled"; 343 status = "disabled";