diff options
author | 2013-02-21 12:51:33 +0100 | |
---|---|---|
committer | 2013-02-21 12:51:33 +0100 | |
commit | 8bfc245f9ad7bd4e461179e4e7852ef99b8b6144 (patch) | |
tree | 0ad091f645fbc8318634599d278966a53d3922ee /arch/mips/ath79/common.c | |
parent | MIPS: Quit exporting kernel internel break codes to uapi/asm/break.h (diff) | |
parent | MIPS: remove broken conditional inside vpe loader code (diff) | |
download | linux-dev-8bfc245f9ad7bd4e461179e4e7852ef99b8b6144.tar.xz linux-dev-8bfc245f9ad7bd4e461179e4e7852ef99b8b6144.zip |
Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
Diffstat (limited to 'arch/mips/ath79/common.c')
-rw-r--r-- | arch/mips/ath79/common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c index 5a4adfc9d79d..eb3966cd8cfc 100644 --- a/arch/mips/ath79/common.c +++ b/arch/mips/ath79/common.c @@ -72,6 +72,8 @@ void ath79_device_reset_set(u32 mask) reg = AR933X_RESET_REG_RESET_MODULE; else if (soc_is_ar934x()) reg = AR934X_RESET_REG_RESET_MODULE; + else if (soc_is_qca955x()) + reg = QCA955X_RESET_REG_RESET_MODULE; else BUG(); @@ -98,6 +100,8 @@ void ath79_device_reset_clear(u32 mask) reg = AR933X_RESET_REG_RESET_MODULE; else if (soc_is_ar934x()) reg = AR934X_RESET_REG_RESET_MODULE; + else if (soc_is_qca955x()) + reg = QCA955X_RESET_REG_RESET_MODULE; else BUG(); |