From fb93599daa6b2187abe124f036e0a54ac1d4f72f Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 23 Jun 2011 18:13:14 +0200
Subject: [PATCH] --- yaml --- r: 284715 b: refs/heads/master c:
 6d1c8fde2daa498fa6ddf8916bcfc5aee1bbe51b h: refs/heads/master i:   284713:
 5469833ca1a72dfd784c3113e3dc2fe560489df9   284711:
 523c092f3d72d44477bba9cbda22d4cc14850f1c v: v3

---
 [refs]                                               |  2 +-
 trunk/arch/mips/ath79/setup.c                        | 12 ++++++++++++
 trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h |  4 ++++
 trunk/arch/mips/include/asm/mach-ath79/ath79.h       |  4 +++-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1eb7129374c5..604f2ca2693e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bed1288d479fd118d30666de53dfba8044f789f
+refs/heads/master: 6d1c8fde2daa498fa6ddf8916bcfc5aee1bbe51b
diff --git a/trunk/arch/mips/ath79/setup.c b/trunk/arch/mips/ath79/setup.c
index dea5af1a3694..4187a1122048 100644
--- a/trunk/arch/mips/ath79/setup.c
+++ b/trunk/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/trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
index 86f0fc8c07c1..929be06e1475 100644
--- a/trunk/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+++ b/trunk/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/trunk/arch/mips/include/asm/mach-ath79/ath79.h b/trunk/arch/mips/include/asm/mach-ath79/ath79.h
index 6a9f168506fe..2dfc94c0444b 100644
--- a/trunk/arch/mips/include/asm/mach-ath79/ath79.h
+++ b/trunk/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;