From: David S. Miller Date: Thu, 3 Nov 2016 19:31:34 +0000 (-0400) Subject: Merge branch 'stmmac-OXNAS' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1b99e5e854d4de2d795c4dbed7cc59c65ae372fe;p=linux-beck.git Merge branch 'stmmac-OXNAS' Neil Armstrong says: ==================== net: stmmac: Add OXNAS DWMAC Glue This patchset add support for the Sysnopsys DWMAC Gigabit Ethernet controller Glue layer of the Oxford Semiconductor OX820 SoC. Changes since v2 at http://lkml.kernel.org/r/20161031105345.16711-1-narmstrong@baylibre.com : - Disable/Unprepare clock if regmap read fails in oxnas_dwmac_init Changes since v1 at https://patchwork.kernel.org/patch/9388231/ : - Split dt-bindings in a separate patch - Add IP version in the dt-bindings compatible - Check return of clk_prepare_enable() - use get_stmmac_bsp_priv() helper - hardwire setup values in oxnas_dwmac_init() Changes since RFC at https://patchwork.kernel.org/patch/9387257 : - Drop init/exit callbacks - Implement proper remove and PM callback - Call init from probe - Disable/Unprepare clock if stmmac probe fails ==================== Signed-off-by: David S. Miller --- 1b99e5e854d4de2d795c4dbed7cc59c65ae372fe