From 09f2dd19eaf3931e30c7d17b11f800d23bed614b Mon Sep 17 00:00:00 2001 From: Virupax Sadashivpetimath Date: Thu, 22 Sep 2011 16:39:54 +0530 Subject: input:misc: Add accessory driver Add driver for the accessory detection block of the ab5500 PMIC. The common functions from the 8500 accessory driver are moved to abx500-accdet generic driver. This generic driver uses callbacks registerd from the 8500 and 5500 specific driver to work as a accessory driver for a perticluar platform. ST Ericsson ID: 353610 ST Ericsson FOSS-OUT ID: Trivial ST Ericsson Linux next: NA Change-Id: Ifb06f9c9dd0dc59cbc071198c9e244a422a63af0 Signed-off-by: Virupax Sadashivpetimath Signed-off-by: Robert Marklund --- include/linux/mfd/ab8500.h | 2 +- include/linux/mfd/abx500/ab5500.h | 2 ++ include/linux/regulator/ab5500.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/linux/mfd/ab8500.h b/include/linux/mfd/ab8500.h index f1979bbd464..8908dd989f9 100644 --- a/include/linux/mfd/ab8500.h +++ b/include/linux/mfd/ab8500.h @@ -206,7 +206,7 @@ struct ab8500_platform_data { struct ab8500_regulator_reg_init *regulator_reg_init; int num_regulator; struct regulator_init_data *regulator; - struct ab8500_accdet_platform_data *accdet; + struct abx500_accdet_platform_data *accdet; struct ab8500_bm_data *battery; struct ab8500_denc_platform_data *denc; struct ab8500_audio_platform_data *audio; diff --git a/include/linux/mfd/abx500/ab5500.h b/include/linux/mfd/abx500/ab5500.h index 3a35f2d4b52..7c200c483b0 100644 --- a/include/linux/mfd/abx500/ab5500.h +++ b/include/linux/mfd/abx500/ab5500.h @@ -29,6 +29,7 @@ enum ab5500_devid { AB5500_DEVID_CHARGALG, AB5500_DEVID_BTEMP, AB5500_DEVID_TEMPMON, + AB5500_DEVID_ACCDET, AB5500_NUM_DEVICES, }; @@ -157,6 +158,7 @@ struct ab5500_platform_data { bool pm_power_off; struct ab5500_regulator_platform_data *regulator; struct ab5500_usbgpio_platform_data *usb; + struct abx500_accdet_platform_data *accdet; }; struct ab5500_ponkey_platform_data { diff --git a/include/linux/regulator/ab5500.h b/include/linux/regulator/ab5500.h index 26c57078f95..2d85b57cae8 100644 --- a/include/linux/regulator/ab5500.h +++ b/include/linux/regulator/ab5500.h @@ -14,6 +14,7 @@ enum ab5500_regulator_id { AB5500_LDO_L, AB5500_LDO_VDIGMIC, AB5500_LDO_SIM, + AB5500_BIAS2, AB5500_NUM_REGULATORS, }; -- cgit v1.2.3