From 7064d705fe6c2cbfcedf928fe704682d0d5689ae Mon Sep 17 00:00:00 2001 From: Bengt Jonsson Date: Thu, 15 Mar 2012 19:50:51 +0100 Subject: [PATCH] --- yaml --- r: 296881 b: refs/heads/master c: 1927ddf66805fca2af010c3e9d0b29216aed0fae h: refs/heads/master i: 296879: 7a46cdf441e538e3e216d3cd561a2b1fa0d00e86 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/db8500-prcmu.c | 2 ++ trunk/include/linux/mfd/db8500-prcmu.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 14ec237c9c72..de895899d494 100644 --- 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 index 06a3c32b2e6a..ebc1e8658226 100644 --- 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 index 19ea0a6b542a..b3a43b1263fe 100644 --- 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;