From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Mon, 2 Feb 2015 09:59:34 +0000 (+0100)
Subject: Merge tag 'at91-cleanup3' into at91-3.20-soc
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=980657d8cdff97343619cf2e3332b8307e9d07ea;p=deliverable%2Flinux.git

Merge tag 'at91-cleanup3' into at91-3.20-soc
---

980657d8cdff97343619cf2e3332b8307e9d07ea
diff --cc arch/arm/mach-at91/board-dt-sama5.c
index 97f7367d32b8,86cffcdef145..3ffe46c2bd4c
--- a/arch/arm/mach-at91/board-dt-sama5.c
+++ b/arch/arm/mach-at91/board-dt-sama5.c
@@@ -27,26 -26,10 +27,27 @@@
  
  #include "generic.h"
  
 +static int ksz8081_phy_fixup(struct phy_device *phy)
 +{
 +	int value;
 +
 +	value = phy_read(phy, 0x16);
 +	value &= ~0x20;
 +	phy_write(phy, 0x16, value);
 +
 +	return 0;
 +}
 +
  static void __init sama5_dt_device_init(void)
  {
 +	if (of_machine_is_compatible("atmel,sama5d4ek") &&
 +	   IS_ENABLED(CONFIG_PHYLIB)) {
 +		phy_register_fixup_for_id("fc028000.etherne:00",
 +						ksz8081_phy_fixup);
 +	}
 +
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+ 	at91_sam9x5_pm_init();
  }
  
  static const char *sama5_dt_board_compat[] __initconst = {