target/linux/ar71xx/patches-4.1/480-ar913x_wmac_external_reset.patch

   1 --- a/arch/mips/ath79/dev-wmac.c
   2 +++ b/arch/mips/ath79/dev-wmac.c
   3 @@ -44,7 +44,7 @@ static struct platform_device ath79_wmac
   4         },
   5  };
   6
   7 -static void __init ar913x_wmac_setup(void)
   8 +static int ar913x_wmac_reset(void)
   9  {
  10         /* reset the WMAC */
  11         ath79_device_reset_set(AR913X_RESET_AMBA2WMAC);
  12 @@ -53,10 +53,19 @@ static void __init ar913x_wmac_setup(voi
  13         ath79_device_reset_clear(AR913X_RESET_AMBA2WMAC);
  14         mdelay(10);
  15
  16 +       return 0;
  17 +}
  18 +
  19 +static void __init ar913x_wmac_setup(void)
  20 +{
  21 +       ar913x_wmac_reset();
  22 +
  23         ath79_wmac_resources[0].start = AR913X_WMAC_BASE;
  24         ath79_wmac_resources[0].end = AR913X_WMAC_BASE + AR913X_WMAC_SIZE - 1;
  25         ath79_wmac_resources[1].start = ATH79_CPU_IRQ(2);
  26         ath79_wmac_resources[1].end = ATH79_CPU_IRQ(2);
  27 +
  28 +       ath79_wmac_data.external_reset = ar913x_wmac_reset;
  29  }
  30
  31