OSDN Git Service

Merge branch 'emac-RK3036'
authorDavid S. Miller <davem@davemloft.net>
Mon, 11 Jan 2016 03:21:32 +0000 (22:21 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Jan 2016 03:21:32 +0000 (22:21 -0500)
commit1f76f7315dd2ac7b462a36d2971a9328583b5eb7
tree8ac27e4043ff95aa7da00cd1a1bfdac61ce0c057
parent0652cb5b8b228db53b686c735c64bdb9071979de
parentaf72261f33ee4958bb53e299746014f44e1134c4
Merge branch 'emac-RK3036'

Xing Zheng says:

====================
Add support emac for the RK3036 SoC platform

  We have supported the emac for RK3066/RK3188, but the RK3036 have
some configuration different with them. We should let the driver of
emac_rockchip compatible with other Rockchip SoCs.

Changes in v2:
- Separate DTS from patch series.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>