From 1107fe2e37a499cd1c85b82d91786daf0dc090cd Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Thu, 23 Jun 2011 18:51:06 +0530 Subject: 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 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25788 Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR --- include/linux/mfd/abx500.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h index 65162f8ecd4..79e365609e5 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, }; -- cgit v1.2.3