---

yaml --- r: 296881 b: refs/heads/master c: 1927ddf h: refs/heads/master i: 296879: 7a46cdf v: v3
git-mirror · Mar 16, 2012 · 7064d70 · 7064d70
1 parent c734ef4
commit 7064d70
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f96a1a6d5d82f79015e5e480e4ac8772607f69b
+refs/heads/master: 1927ddf66805fca2af010c3e9d0b29216aed0fae
diff --git a/trunk/drivers/mfd/db8500-prcmu.c b/trunk/drivers/mfd/db8500-prcmu.c
@@ -2636,6 +2636,8 @@ static char *fw_project_name(u8 project)
 		return "U9500 C2";
 	case PRCMU_FW_PROJECT_U8520:
 		return "U8520";
+	case PRCMU_FW_PROJECT_U8420:
+		return "U8420";
 	default:
 		return "Unknown";
 	}

diff --git a/trunk/include/linux/mfd/db8500-prcmu.h b/trunk/include/linux/mfd/db8500-prcmu.h
@@ -498,6 +498,7 @@ struct prcmu_auto_pm_config {
 #define PRCMU_FW_PROJECT_U8500_C2	7
 #define PRCMU_FW_PROJECT_U9500_C2	11
 #define PRCMU_FW_PROJECT_U8520		13
+#define PRCMU_FW_PROJECT_U8420		14
 
 struct prcmu_fw_version {
 	u8 project;