diff options
| author | Kevin Hilman <khilman@baylibre.com> | 2020-11-20 22:34:10 +0300 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2020-11-20 22:34:10 +0300 |
| commit | 5bc0d7561aa0973016d46c2e387a58c5e66565dc (patch) | |
| tree | 8a1ebe7ce2789cf25bd2f50b61b4667ad00e3aeb /arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | |
| parent | 7bd5175918eb4b294c0979c75056f20fd90a50bf (diff) | |
| parent | f7d933388f11f66e5af9e5663a17f26523fddd07 (diff) | |
| download | linux-5bc0d7561aa0973016d46c2e387a58c5e66565dc.tar.xz | |
Merge tag 'amlogic-fixes' into v5.11/dt64
Amlogic fixes for v5.10-rc1
- misc DT only fixes
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 314095b79a45..9c90d562ada1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -209,7 +209,7 @@ }; ethmac: ethernet@ff3f0000 { - compatible = "amlogic,meson-axg-dwmac", + compatible = "amlogic,meson-g12a-dwmac", "snps,dwmac-3.70a", "snps,dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000>, @@ -224,6 +224,8 @@ "timing-adjustment"; rx-fifo-depth = <4096>; tx-fifo-depth = <2048>; + resets = <&reset RESET_ETHERNET>; + reset-names = "stmmaceth"; status = "disabled"; mdio0: mdio { @@ -282,6 +284,8 @@ hwrng: rng@218 { compatible = "amlogic,meson-rng"; reg = <0x0 0x218 0x0 0x4>; + clocks = <&clkc CLKID_RNG0>; + clock-names = "core"; }; }; |