From: David S. Miller <davem@davemloft.net>
Date: Mon, 19 Apr 2021 22:58:15 +0000 (-0700)
Subject: Merge branch 'korina-next'
X-Git-Tag: howlett/maple/20220722_2~3257^2~101
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a2a12d3ae24d54c2488d06bd290e24e83eded22b;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'korina-next'

Thomas Bogendoerfer says:

====================
net: Korina improvements

While converting Mikrotik RB532 support to use device tree I stumbled
over the korina ethernet driver, which used way too many MIPS specific
hacks. This series cleans this all up and adds support for device tree.

Changes in v6:
 - remove korina from resource names and adapt DT binding to it
 - removed superfluous braces around of_get_mac_address

Changes in v5:
  - fixed email address in binding document, which prevented sending it

Changes in v4:
  - improve error returns in mdio_read further
  - added clock name and improved clk handling
  - fixed binding errors

Changes in v3:
  - use readl_poll_timeout_atomic in mdio_wait
  - return -ETIMEDOUT, if mdio_wait failed
  - added DT binding and changed name to idt,3243x-emac
  - fixed usage of of_get_mac_address for net-next

Changes in v2:
  - added device tree support to get rid of idt_cpu_freq
  - fixed compile test on 64bit archs
  - fixed descriptor current address handling by storing/using mapped
    dma addresses (dma controller modifies current address)
====================

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

a2a12d3ae24d54c2488d06bd290e24e83eded22b