From: David S. Miller Date: Tue, 30 Sep 2014 20:37:13 +0000 (-0400) Subject: Merge branch 'pxa168_eth' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9ba10afe3202aaf3ace1e696ff017d0c0bf4e7a9;p=linux-beck.git Merge branch 'pxa168_eth' Antoine Tenart says: ==================== ARM: Berlin: Ethernet support This series introduce support for the Ethernet controller on Berlin SoCs, using the existing pxa168 Ethernet driver. In order to do this, DT support is added to the driver alongside some other modifications and fixes. This has been tested on a Berlin BG2Q DMP board. Changes since v5: - fixed the build when building the driver as a module Changes since v4: - removed the phy-addr property and added a phy subnode - added COMPILE_TEST for the pxa168_eth driver Changes since v3: - moved the addition of pxa168_eth_get_mac_address() to the patch using it first Changes since v2: - reworked how the MAC address is configured - made the clock anonymous Changes since v1: - removed custom Berlin Ethernet driver - used the pxa168 Ethernet driver instead - made modifications to the pxa168 driver (DT support, fixes) ==================== Signed-off-by: David S. Miller --- 9ba10afe3202aaf3ace1e696ff017d0c0bf4e7a9