summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2012-08-05 13:27:08 +0530
committerLokesh Pathak <lpathak@nvidia.com>2012-08-07 08:45:46 -0700
commitbb4dfdc63e617afe49eb727f70e6638d7e8759c2 (patch)
treec123cde7f90e5edd8cc3fd3ccb3ca6430d5ff6f2
parent0a93f5c4bb384c3a0fd71b5bc3d231f834554dfd (diff)
mfd: tps80031: gpadc: register as mfd sub device
Register General Purpose ADC driver of TPS80031 as mfd sub driver in place of adding it as a sub devices. This is inline with the mfd driver policy. Change-Id: Ib3f86f05716baef96ee534eec5ae262627c6a853 Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/121136 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/board-enterprise-power.c13
-rw-r--r--drivers/mfd/tps80031.c3
2 files changed, 3 insertions, 13 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-power.c b/arch/arm/mach-tegra/board-enterprise-power.c
index 86f0bcd05253..cfcfe9e61ec5 100644
--- a/arch/arm/mach-tegra/board-enterprise-power.c
+++ b/arch/arm/mach-tegra/board-enterprise-power.c
@@ -333,19 +333,6 @@ static struct tps80031_bg_platform_data battery_gauge_data = {
.battery_present = 1,
};
-#define TPS_GPADC() \
- { \
- .name = "tps80031-gpadc", \
- }
-
-#define TPS80031_DEVS_COMMON \
- TPS_GPADC()
-
-
-static struct tps80031_subdev_info tps80031_devs[] = {
- TPS_GPADC()
-};
-
#define TPS_REG_PDATA(_id, _sname) &pdata_##_id##_##_sname
static struct tps80031_regulator_platform_data *tps80031_reg_pdata_a02[] = {
TPS_REG_PDATA(vio, a02),
diff --git a/drivers/mfd/tps80031.c b/drivers/mfd/tps80031.c
index f496c36d6401..10ae059a3818 100644
--- a/drivers/mfd/tps80031.c
+++ b/drivers/mfd/tps80031.c
@@ -306,6 +306,9 @@ static struct mfd_cell tps80031_cell[] = {
.name = "tps80031-rtc",
},
{
+ .name = "tps80031-gpadc",
+ },
+ {
.name = "tps80031-battery-gauge",
},
{