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

diff --cc arch/arm/boot/dts/at91sam9263.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sama5d3xmb.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sama5d4.dtsi
Simple merge

diff --cc arch/arm/mach-at91/board-dt-sama5.c
index 97f7367d32b8a2b9af60abb3f6b4df68dd860489,86cffcdef14502d312fc3cd43beea9947a50ba0a..3ffe46c2bd4c38b8f5a36f0b3f544bf25c32db63
--- 1/arch/arm/mach-at91/board-dt-sama5.c
--- 2/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 = {