From 863f1b216a002566dfc15d65c034878a02a07f04 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 20 Jun 2011 21:26:05 +0200 Subject: [PATCH] --- yaml --- r: 284718 b: refs/heads/master c: 7ee15d8a2837841d75f56319b94510ed950094b5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/ath79/common.c | 4 ++++ trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 66699be66d17..f57fdca6587d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04225e1d227c8e68d685936ecf42ac175fec0e54 +refs/heads/master: 7ee15d8a2837841d75f56319b94510ed950094b5 diff --git a/trunk/arch/mips/ath79/common.c b/trunk/arch/mips/ath79/common.c index 58f60e722a03..38c2ad7bd871 100644 --- a/trunk/arch/mips/ath79/common.c +++ b/trunk/arch/mips/ath79/common.c @@ -64,6 +64,8 @@ void ath79_device_reset_set(u32 mask) reg = AR724X_RESET_REG_RESET_MODULE; else if (soc_is_ar913x()) reg = AR913X_RESET_REG_RESET_MODULE; + else if (soc_is_ar933x()) + reg = AR933X_RESET_REG_RESET_MODULE; else BUG(); @@ -86,6 +88,8 @@ void ath79_device_reset_clear(u32 mask) reg = AR724X_RESET_REG_RESET_MODULE; else if (soc_is_ar913x()) reg = AR913X_RESET_REG_RESET_MODULE; + else if (soc_is_ar933x()) + reg = AR933X_RESET_REG_RESET_MODULE; else BUG(); diff --git a/trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h index 418b7392e8c3..c7159e3479c2 100644 --- a/trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +++ b/trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h @@ -173,6 +173,7 @@ #define AR724X_RESET_REG_RESET_MODULE 0x1c +#define AR933X_RESET_REG_RESET_MODULE 0x1c #define AR933X_RESET_REG_BOOTSTRAP 0xac #define MISC_INT_ETHSW BIT(12)