ar71xx: init external_reset for AR933X

SVN-Revision: 27083
This commit is contained in:
Gabor Juhos 2011-06-01 13:12:30 +00:00
parent af4cae4498
commit 750af1522b
2 changed files with 31 additions and 0 deletions

View file

@ -68,6 +68,31 @@ static int ar933x_r1_get_wmac_revision(void)
return ar71xx_soc_rev; return ar71xx_soc_rev;
} }
static int ar933x_wmac_reset(void)
{
unsigned retries = 0;
ar71xx_device_stop(AR933X_RESET_WMAC);
ar71xx_device_start(AR933X_RESET_WMAC);
while (1) {
u32 bootstrap;
bootstrap = ar71xx_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
if ((bootstrap & AR933X_BOOTSTRAP_EEPBUSY) == 0)
return 0;
if (retries > 20)
break;
udelay(10000);
retries++;
}
pr_err("ar93xx: WMAC reset timed out");
return -ETIMEDOUT;
}
static void ar933x_wmac_init(void) static void ar933x_wmac_init(void)
{ {
ar9xxx_wmac_device.name = "ar933x_wmac"; ar9xxx_wmac_device.name = "ar933x_wmac";
@ -78,6 +103,10 @@ static void ar933x_wmac_init(void)
if (ar71xx_soc_rev == 1) if (ar71xx_soc_rev == 1)
ar9xxx_wmac_data.get_mac_revision = ar933x_r1_get_wmac_revision; ar9xxx_wmac_data.get_mac_revision = ar933x_r1_get_wmac_revision;
ar9xxx_wmac_data.external_reset = ar933x_wmac_reset;
ar933x_wmac_reset();
} }
static void ar934x_wmac_init(void) static void ar934x_wmac_init(void)

View file

@ -609,6 +609,7 @@ void ar71xx_ddr_flush(u32 reg);
#define AR933X_RESET_REG_RESET_MODULE 0x1c #define AR933X_RESET_REG_RESET_MODULE 0x1c
#define AR933X_RESET_REG_BOOTSTRAP 0xac #define AR933X_RESET_REG_BOOTSTRAP 0xac
#define AR933X_BOOTSTRAP_EEPBUSY BIT(4)
#define AR933X_BOOTSTRAP_REF_CLK_40 BIT(0) #define AR933X_BOOTSTRAP_REF_CLK_40 BIT(0)
#define AR934X_RESET_REG_RESET_MODULE 0x1c #define AR934X_RESET_REG_RESET_MODULE 0x1c
@ -672,6 +673,7 @@ void ar71xx_ddr_flush(u32 reg);
#define AR724X_RESET_USB_PHY BIT(4) #define AR724X_RESET_USB_PHY BIT(4)
#define AR724X_RESET_USBSUS_OVERRIDE BIT(3) #define AR724X_RESET_USBSUS_OVERRIDE BIT(3)
#define AR933X_RESET_WMAC BIT(11)
#define AR933X_RESET_GE1_MDIO BIT(23) #define AR933X_RESET_GE1_MDIO BIT(23)
#define AR933X_RESET_GE0_MDIO BIT(22) #define AR933X_RESET_GE0_MDIO BIT(22)
#define AR933X_RESET_GE1_MAC BIT(13) #define AR933X_RESET_GE1_MAC BIT(13)