From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 7 Jul 2016 15:51:35 +0000 (+0200)
Subject: Revert "ARM64: DTS: meson-gxbb: switch ethernet to real clock"
X-Git-Tag: v4.8-rc1~65^2~8
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=8d09251a81ecc22e542c3ff6a7dd3ca2b7e2b0e7;p=cascardo%2Flinux.git

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>
---

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 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/gpio/meson-gxbb-gpio.h>
 #include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>
-#include <dt-bindings/clock/gxbb-clkc.h>
 
 / {
 	compatible = "amlogic,meson-gxbb";
@@ -338,7 +337,7 @@
 			       0x0 0xc8834540 0x0 0x4>;
 			interrupts = <0 8 1>;
 			interrupt-names = "macirq";
-			clocks = <&clkc CLKID_ETH>;
+			clocks = <&xtal>;
 			clock-names = "stmmaceth";
 			phy-mode = "rgmii";
 			status = "disabled";