diff options
author | Tom Rini <trini@konsulko.com> | 2020-07-07 22:58:18 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-07-07 22:58:18 -0400 |
commit | 0b59138690a93f3d880be3d5aa675f7219376e58 (patch) | |
tree | b139bf8d951a50c2196f3f36dc2f5ab2f3bb1cc7 /arch/arm/dts | |
parent | 1e88e78177da80fa8e9fa9fc7613657478d61d1e (diff) | |
parent | 9b9f10e3ccded02443162980d34be517886b0645 (diff) |
Merge branch '2020-07-07-misc-new-features'
- Improve s700 SoC support
- Fix building with clang on ARM.
- Juno platform updates
- fs/dm cmd improvements
- Other assorted improvements / fixes
Diffstat (limited to 'arch/arm/dts')
-rw-r--r-- | arch/arm/dts/s700-u-boot.dtsi | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/dts/s700-u-boot.dtsi b/arch/arm/dts/s700-u-boot.dtsi index a527cccc75..1b2768272c 100644 --- a/arch/arm/dts/s700-u-boot.dtsi +++ b/arch/arm/dts/s700-u-boot.dtsi @@ -6,6 +6,19 @@ /{ soc { u-boot,dm-pre-reloc; + + gmac: ethernet@e0220000 { + compatible = "actions,s700-ethernet"; + reg = <0 0xe0220000 0 0x2000>; + interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "macirq"; + local-mac-address = [ 00 18 fe 66 66 66 ]; + clocks = <&cmu CLK_ETHERNET>, <&cmu CLK_RMII_REF>; + clock-names = "ethernet", "rmii_ref"; + phy-mode = "rmii"; + status = "okay"; + }; + }; }; |