diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 16:20:25 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 16:20:25 +0100 |
commit | ea7cdc066e479cb7d8a3551d206c7aa9c7f8b33a (patch) | |
tree | 27a31beb74235a9b6b45996b9e1633242414d8db /arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | |
parent | 2cdc614b07bc284115f136c20a898a86e632cbf7 (diff) | |
parent | 16416084e06e1ebff51a9e7721a8cc4ccc186f28 (diff) |
Merge tag 'sunxi-dt64-for-4.15-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt
Pull "Allwinner arm64 changes, take 2" from Maxime Ripard:
Reintroduction of the EMAC bindings that were reverted in 4.13.
* tag 'sunxi-dt64-for-4.15-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
arm64: dts: allwinner: add snps,dwmac-mdio compatible to emac/mdio
arm64: dts: allwinner: A64: Restore EMAC changes
Diffstat (limited to 'arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 062040ec2fed..d783d164b9c3 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -505,6 +505,27 @@ #size-cells = <0>; }; + emac: ethernet@1c30000 { + compatible = "allwinner,sun50i-a64-emac"; + syscon = <&syscon>; + reg = <0x01c30000 0x10000>; + interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "macirq"; + resets = <&ccu RST_BUS_EMAC>; + reset-names = "stmmaceth"; + clocks = <&ccu CLK_BUS_EMAC>; + clock-names = "stmmaceth"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + + mdio: mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + gic: interrupt-controller@1c81000 { compatible = "arm,gic-400"; reg = <0x01c81000 0x1000>, |