From: David S. Miller Date: Fri, 19 Oct 2012 17:47:00 +0000 (-0400) Subject: Merge branch 'at91' X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1b6f0f9242e8f963b353b032ae25e0b1e945d57c;p=~shefty%2Frdma-dev.git Merge branch 'at91' Joachim Eastwood says; ==================== This patch series prepares the old at91_ether driver for code sharing with the macb driver. The hardware is similar except for DMA TX/RX, so its not quite clear if it is practical to support both in one driver. But stuff like MDIO and statistics should be possible to share. Patch 1 adds some register defines and bits that is only found on RM9200. Patch 2-4 uses the register defines and access functions from the macb header. These can be squashed if it cause too much churn. Patch 5 merges the private at91_ether struct with the private macb struct. This makes it easier to later share code with the macb. The private macb struct becomes quite large, but most at91_ether specific members are removed in later patches. Patch 8 make macb compile when we select at91_ether. Is this approach okey? Patch 9 makes use of MDIO code from macb. This rips out the private phy handling code in at91_ether. One thing that is lost is the interrupt support for phy. But this should easy to add to macb which will then benefit both drivers. Patch 10 makes use of the macb_set_rx_mode from macb. Patch 11-12 makes at91_ether share the rx dma struct members from macb. Patch also moves the rx buffer allocation into netdev open and dealloc into netdev close. Last patch remove the now unused rm9200 emac header from include/mach. ==================== Signed-off-by: David S. Miller --- 1b6f0f9242e8f963b353b032ae25e0b1e945d57c