Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d4c2af9 authored Feb 15, 2013 by Gabor Juhos Committed by John Crispin Feb 19, 2013

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>

parent f818ca3e

arch/mips/ath79/common.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -72,6 +72,8 @@ void ath79_device_reset_set(u32 mask)
	reg = AR933X_RESET_REG_RESET_MODULE;		reg = AR933X_RESET_REG_RESET_MODULE;
	else if (soc_is_ar934x())		else if (soc_is_ar934x())
	reg = AR934X_RESET_REG_RESET_MODULE;		reg = AR934X_RESET_REG_RESET_MODULE;
			else if (soc_is_qca955x())
			reg = QCA955X_RESET_REG_RESET_MODULE;
	else		else
	BUG();		BUG();

	@@ -98,6 +100,8 @@ void ath79_device_reset_clear(u32 mask)
	reg = AR933X_RESET_REG_RESET_MODULE;		reg = AR933X_RESET_REG_RESET_MODULE;
	else if (soc_is_ar934x())		else if (soc_is_ar934x())
	reg = AR934X_RESET_REG_RESET_MODULE;		reg = AR934X_RESET_REG_RESET_MODULE;
			else if (soc_is_qca955x())
			reg = QCA955X_RESET_REG_RESET_MODULE;
	else		else
	BUG();		BUG();

arch/mips/include/asm/mach-ath79/ar71xx_regs.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -299,6 +299,7 @@
	#define AR934X_RESET_REG_BOOTSTRAP 0xb0		#define AR934X_RESET_REG_BOOTSTRAP 0xb0
	#define AR934X_RESET_REG_PCIE_WMAC_INT_STATUS 0xac		#define AR934X_RESET_REG_PCIE_WMAC_INT_STATUS 0xac

			#define QCA955X_RESET_REG_RESET_MODULE 0x1c
	#define QCA955X_RESET_REG_BOOTSTRAP 0xb0		#define QCA955X_RESET_REG_BOOTSTRAP 0xb0
	#define QCA955X_RESET_REG_EXT_INT_STATUS 0xac		#define QCA955X_RESET_REG_EXT_INT_STATUS 0xac