diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2016-07-07 17:51:35 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 17:51:42 +0200 |
| commit | 8d09251a81ecc22e542c3ff6a7dd3ca2b7e2b0e7 (patch) | |
| tree | dbe1c65d05735b5208eb4ac9fac81007e0423e90 /arch/arm64/boot | |
| parent | Merge tag 'arm-soc/for-4.8/devicetree-arm64-part2' of http://github.com/Broadcom/stblinux into next/dt64 (diff) | |
| download | linux-dev-8d09251a81ecc22e542c3ff6a7dd3ca2b7e2b0e7.tar.xz linux-dev-8d09251a81ecc22e542c3ff6a7dd3ca2b7e2b0e7.zip | |
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>
Diffstat (limited to 'arch/arm64/boot')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 3 |
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 @@ #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"; |