Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / arm / boot / dts / socfpga_cyclone5.dts

diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dts b/arch/arm/boot/dts/socfpga_cyclone5.dts
index 2495958f10168383b3a80e9ee26c707ceb54bb8c..973999d2c69759b7303073bb06db3cc3533417f0 100644 (file)
--- a/arch/arm/boot/dts/socfpga_cyclone5.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5.dts
@@ -32,6 +32,13 @@
                reg = <0x0 0x40000000>; /* 1GB */
        };
 
+       aliases {
+               /* this allow the ethaddr uboot environmnet variable contents
+                * to be added to the gmac1 device tree blob.
+                */
+               ethernet0 = &gmac1;
+       };
+
        soc {
                clkmgr@ffd04000 {
                        clocks {
@@ -41,6 +48,12 @@
                        };
                };
 
+               ethernet@ff702000 {
+                       phy-mode = "rgmii";
+                       phy-addr = <0xffffffff>; /* probe for phy addr */
+                       status = "okay";
+               };
+
                timer0@ffc08000 {
                        clock-frequency = <100000000>;
                };