diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-26 11:18:53 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-26 11:18:53 -0400 |
| commit | 8dc1b17f14c9201c7d0da0f33e404a7e051b2ec6 (patch) | |
| tree | b4566d2d99140d4180efc2ca9f32b2ddf3e310a8 /arch | |
| parent | be62fbf376261ab3a4ed5db3bf54d5df9e216d9f (diff) | |
| parent | be71a179bdd935336fb0bee8283be729144ac965 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-nds32
Move FTMAC100 to where it should be, alphabetically in
drivers/net/Kconfig
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/nds32/dts/ae3xx.dts | 7 | ||||
| -rw-r--r-- | arch/nds32/dts/ag101p.dts | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/nds32/dts/ae3xx.dts b/arch/nds32/dts/ae3xx.dts index 9062760cb76..4221e4bf9ac 100644 --- a/arch/nds32/dts/ae3xx.dts +++ b/arch/nds32/dts/ae3xx.dts @@ -7,6 +7,7 @@ aliases { uart0 = &serial0; + ethernet0 = &mac0; } ; chosen { @@ -55,6 +56,12 @@ clock-frequency = <30000000>; }; + mac0: mac@e0100000 { + compatible = "andestech,atmac100"; + reg = <0xe0100000 0x1000>; + interrupts = <25 4>; + }; + nor@0,0 { compatible = "cfi-flash"; reg = <0x88000000 0x1000>; diff --git a/arch/nds32/dts/ag101p.dts b/arch/nds32/dts/ag101p.dts index 91314b5633b..99cde2f8b8f 100644 --- a/arch/nds32/dts/ag101p.dts +++ b/arch/nds32/dts/ag101p.dts @@ -7,6 +7,7 @@ aliases { uart0 = &serial0; + ethernet0 = &mac0; } ; chosen { @@ -54,4 +55,9 @@ clock-frequency = <15000000>; }; + mac0: mac@90900000 { + compatible = "andestech,atmac100"; + reg = <0x90900000 0x1000>; + interrupts = <25 4>; + }; }; |