From e02567a7123817660db15649a76d64aa3314a257 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <ice@extreme.hu>
Date: Sun, 22 Jul 2012 16:29:26 +0200
Subject: [PATCH] Merge F2012 and G2231

---
 drivers/fet_db.c | 37 +------------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/drivers/fet_db.c b/drivers/fet_db.c
index aa08f1a..48978cb 100644
--- a/drivers/fet_db.c
+++ b/drivers/fet_db.c
@@ -990,7 +990,7 @@ static const struct fet_db_record fet_db[] = {
 		}
 	},
 	{
-		.name = "MSP430F2012",
+		.name = "MSP430F2012/G2231",
 		.msg28_data = {
 			0xf2, 0x01, 0x30, 0x40, 0x00, 0x00, 0x00, 0x00,
 			0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00,
@@ -1457,41 +1457,6 @@ static const struct fet_db_record fet_db[] = {
 			0x00, 0x00
 		}
 	},
-	{ /* Copied from MSP430F2013 */
-		.name = "MSP430G2231",
-		.msg28_data = {
-			0xf2, 0x01, 0x30, 0x40, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00,
-			0x00, 0x00
-			/* extra: 89 00 00 00 00 00 00 00 */
-		},
-		.msg29_params = {0x00, 0x39, 0x31},
-		.msg29_data = { /* Copied from MSP430F2274, with changes */
-			0x00, 0xf8, 0xff, 0xff, 0x00, 0x00, 0x00, 0x10,
-			0xff, 0x10, 0x40, 0x00, 0x00, 0x02, 0x7f, 0x02,
-			0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00,
-			0x01, 0x00, 0xd7, 0x60, 0x00, 0x00, 0x00, 0x00,
-			0x08, 0x07, 0x10, 0x0e, 0xc4, 0x09, 0x70, 0x17,
-			0x58, 0x1b, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-			0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x33, 0x0f, 0x1f, 0x0f,
-			0xff, 0xff
-		},
-		.msg2b_len = 0x4a,
-		.msg2b_data = { /* Copied from MSP430F2616 */
-			0x00, 0x0c, 0xff, 0x0f, 0x00, 0x02, 0x02, 0x00,
-			0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00
-		}
-	},
 	{ /* Copied from MSP430G2452, with modifications */
 		.name = "MSP430G2553/G2403",
 		.msg28_data = {