Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7d4c2af9bdbbe789fe4a93f32c5890d72cbf60a1

Authored by Gabor Juhos
Committed by John Crispin
1 parent f818ca3e68
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

MIPS: ath79: add QCA955X specific glue to ath79_device_reset_{set, clear} 

The ath79_device_reset_* are causing BUG when
those are used on the QCA955x SoCs. The patch
adds the required code to avoid that.

Cc: Rodriguez, Luis <rodrigue@qca.qualcomm.com>
Cc: Giori, Kathy <kgiori@qca.qualcomm.com>
Cc: QCA Linux Team <qca-linux-team@qca.qualcomm.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/4948/
Signed-off-by: John Crispin <blogic@openwrt.org>

Showing 2 changed files with 5 additions and 0 deletions Side-by-side Diff

arch/mips/ath79/common.c
Diff comments   View file @ 7d4c2af
... ... @@ -72,6 +72,8 @@
72 72 reg = AR933X_RESET_REG_RESET_MODULE;
73 73 else if (soc_is_ar934x())
74 74 reg = AR934X_RESET_REG_RESET_MODULE;
  75 + else if (soc_is_qca955x())
  76 + reg = QCA955X_RESET_REG_RESET_MODULE;
75 77 else
76 78 BUG();
77 79  
... ... @@ -98,6 +100,8 @@
98 100 reg = AR933X_RESET_REG_RESET_MODULE;
99 101 else if (soc_is_ar934x())
100 102 reg = AR934X_RESET_REG_RESET_MODULE;
  103 + else if (soc_is_qca955x())
  104 + reg = QCA955X_RESET_REG_RESET_MODULE;
101 105 else
102 106 BUG();
103 107  
arch/mips/include/asm/mach-ath79/ar71xx_regs.h
Diff comments   View file @ 7d4c2af
... ... @@ -299,6 +299,7 @@
299 299 #define AR934X_RESET_REG_BOOTSTRAP 0xb0
300 300 #define AR934X_RESET_REG_PCIE_WMAC_INT_STATUS 0xac
301 301  
  302 +#define QCA955X_RESET_REG_RESET_MODULE 0x1c
302 303 #define QCA955X_RESET_REG_BOOTSTRAP 0xb0
303 304 #define QCA955X_RESET_REG_EXT_INT_STATUS 0xac
304 305