MIPS: ath79: add revision id for the AR933X SoCs

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: Kathy Giori <kgiori@qca.qualcomm.com>
Cc: "Luis R.  Rodriguez" <rodrigue@qca.qualcomm.com>
Patchwork: https://patchwork.linux-mips.org/patch/2538/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

3 files changed, 19 insertions, 1 deletions

diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index dea5af1a3694..4187a1122048 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -116,6 +116,18 @@ static void __init ath79_detect_sys_type(void)
                 rev = id & AR724X_REV_ID_REVISION_MASK;
                 break;
 
+        case REV_ID_MAJOR_AR9330:
+                ath79_soc = ATH79_SOC_AR9330;
+                chip = "9330";
+                rev = id & AR933X_REV_ID_REVISION_MASK;
+                break;
+
+        case REV_ID_MAJOR_AR9331:
+                ath79_soc = ATH79_SOC_AR9331;
+                chip = "9331";
+                rev = id & AR933X_REV_ID_REVISION_MASK;
+                break;
+
         case REV_ID_MAJOR_AR913X:
                 minor = id & AR913X_REV_ID_MINOR_MASK;
                 rev = id >> AR913X_REV_ID_REVISION_SHIFT;
diff --git a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
index 86f0fc8c07c1..929be06e1475 100644
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
@@ -207,6 +207,8 @@
 #define REV_ID_MAJOR_AR7240             0x00c0
 #define REV_ID_MAJOR_AR7241             0x0100
 #define REV_ID_MAJOR_AR7242             0x1100
+#define REV_ID_MAJOR_AR9330             0x0110
+#define REV_ID_MAJOR_AR9331             0x1110
 
 #define AR71XX_REV_ID_MINOR_MASK        0x3
 #define AR71XX_REV_ID_MINOR_AR7130      0x0
@@ -221,6 +223,8 @@
 #define AR913X_REV_ID_REVISION_MASK     0x3
 #define AR913X_REV_ID_REVISION_SHIFT    2
 
+#define AR933X_REV_ID_REVISION_MASK     0x3
+
 #define AR724X_REV_ID_REVISION_MASK     0x3
 
 /*
diff --git a/arch/mips/include/asm/mach-ath79/ath79.h b/arch/mips/include/asm/mach-ath79/ath79.h
index 6a9f168506fe..2dfc94c0444b 100644
--- a/arch/mips/include/asm/mach-ath79/ath79.h
+++ b/arch/mips/include/asm/mach-ath79/ath79.h
@@ -26,7 +26,9 @@ enum ath79_soc_type {
         ATH79_SOC_AR7241,
         ATH79_SOC_AR7242,
         ATH79_SOC_AR9130,
-        ATH79_SOC_AR9132
+        ATH79_SOC_AR9132,
+        ATH79_SOC_AR9330,
+        ATH79_SOC_AR9331,
 };
 
 extern enum ath79_soc_type ath79_soc;