summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Murthy <arun.murthy@stericsson.com>2011-06-23 18:51:06 +0530
committerPhilippe Langlais <philippe.langlais@linaro.org>2011-07-22 15:52:30 +0200
commit5881ac6d4f6b63b45b7f56b5f7389be59faf62f9 (patch)
treeeac21c9e9e7fb3e672414ca9b2eb6e7384cf7a33
parent7a565b3a46c285a5d000cf17dc194064a9e78ec0 (diff)
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 37a4bfecc30..7a1d3179f6a 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -220,9 +220,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,
@@ -230,6 +228,8 @@ enum ab5500_devid {
AB5500_DEVID_VIDEO,
AB5500_DEVID_DBIECI,
AB5500_DEVID_ONSWA,
+ AB5500_DEVID_CHARGALG,
+ AB5500_DEVID_BTEMP,
AB5500_NUM_DEVICES,
};