From c734ef4148c46c758144b8616b671fab889af40a Mon Sep 17 00:00:00 2001 From: Bengt Jonsson Date: Thu, 15 Mar 2012 19:50:40 +0100 Subject: [PATCH] --- yaml --- r: 296880 b: refs/heads/master c: 5f96a1a6d5d82f79015e5e480e4ac8772607f69b h: refs/heads/master 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 91f8fc248908..14ec237c9c72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d902d0d18c50fe195c66e60c615cfa0b81169454 +refs/heads/master: 5f96a1a6d5d82f79015e5e480e4ac8772607f69b diff --git a/trunk/drivers/mfd/db8500-prcmu.c b/trunk/drivers/mfd/db8500-prcmu.c index 09fd6a39d7fa..06a3c32b2e6a 100644 --- a/trunk/drivers/mfd/db8500-prcmu.c +++ b/trunk/drivers/mfd/db8500-prcmu.c @@ -2634,6 +2634,8 @@ static char *fw_project_name(u8 project) return "U9500"; case PRCMU_FW_PROJECT_U9500_C2: return "U9500 C2"; + case PRCMU_FW_PROJECT_U8520: + return "U8520"; default: return "Unknown"; } diff --git a/trunk/include/linux/mfd/db8500-prcmu.h b/trunk/include/linux/mfd/db8500-prcmu.h index a220905337b5..19ea0a6b542a 100644 --- a/trunk/include/linux/mfd/db8500-prcmu.h +++ b/trunk/include/linux/mfd/db8500-prcmu.h @@ -497,6 +497,7 @@ struct prcmu_auto_pm_config { #define PRCMU_FW_PROJECT_U9500 4 #define PRCMU_FW_PROJECT_U8500_C2 7 #define PRCMU_FW_PROJECT_U9500_C2 11 +#define PRCMU_FW_PROJECT_U8520 13 struct prcmu_fw_version { u8 project;