aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Murthy <arun.murthy@stericsson.com>2011-06-23 18:51:06 +0530
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-29 10:30:38 +0200
commit1107fe2e37a499cd1c85b82d91786daf0dc090cd (patch)
treea6cdfd4478292ba09409561708da5d755fc56990
parentff062b5640160f61a61e862c028f8b4585ccb443 (diff)
downloadlinux-2.6.38-ux500-1107fe2e37a499cd1c85b82d91786daf0dc090cd.tar.gz
mfd: ab5500 - maintain proper ordering of the deviceid
ab5500 core driver appends device deviceid to the device name and hence the order should be maintained in defining the deviceid Ex: sound/soc/ux500/u5500.c: .codec_name = "ab5500-codec.9", Since 2 new devices chargalg and btemp were added prior to codec audio stopped working. ST-Ericsson Linux next: Not Tested ST-Ericsson ID: WP256401 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Id44e60a16d2c2b7181edd8fb553c3220788d6326 Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25788 Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
-rw-r--r--include/linux/mfd/abx500.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index 65162f8..79e3656 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -212,9 +212,7 @@ enum ab5500_devid {
AB5500_DEVID_SIM,
AB5500_DEVID_RTC,
AB5500_DEVID_CHARGER,
- AB5500_DEVID_CHARGALG,
AB5500_DEVID_FG,
- AB5500_DEVID_BTEMP,
AB5500_DEVID_VIBRATOR,
AB5500_DEVID_CODEC,
AB5500_DEVID_USB,
@@ -222,6 +220,8 @@ enum ab5500_devid {
AB5500_DEVID_VIDEO,
AB5500_DEVID_DBIECI,
AB5500_DEVID_ONSWA,
+ AB5500_DEVID_CHARGALG,
+ AB5500_DEVID_BTEMP,
AB5500_NUM_DEVICES,
};