diff options
author | Syed Rafiuddin <srafiuddin@nvidia.com> | 2013-03-01 14:12:17 +0530 |
---|---|---|
committer | Mrutyunjay Sawant <msawant@nvidia.com> | 2013-03-06 06:23:17 -0800 |
commit | df6821a3a1013d4775fe7ed0c52a56a8bef29a1f (patch) | |
tree | 38d6d79d4201cf8a635bb0c163bb12a18a2a36a7 /drivers/mfd | |
parent | b2183dca8729336665f97a19a0e6edfd588a248e (diff) |
mfd/regulator: remove bq2419x driver
The bq2419x driver functionality is merged into single file as
power/bq2419x-charger, these files are not required hence deleting.
Bug 1240114
Change-Id: Ie9ab505c08d535978cf53ee26b0d1ace98c8e4b8
Signed-off-by: Syed Rafiuddin <srafiuddin@nvidia.com>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/205497
GVS: Gerrit_Virtual_Submit
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/Kconfig | 8 | ||||
-rw-r--r-- | drivers/mfd/Makefile | 1 | ||||
-rw-r--r-- | drivers/mfd/bq2419x.c | 136 |
3 files changed, 0 insertions, 145 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index e3117736466d..5e18375f0cb3 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -46,14 +46,6 @@ config MFD_ASIC3 This driver supports the ASIC3 multifunction chip found on many PDAs (mainly iPAQ and HTC based ones) -config MFD_BQ2419X - bool "Support for bq24190, bq24911, bq24192" - depends on I2C=y - select MFD_CORE - select REGMAP_I2C - help - This supports the bq24190, bq24911, bq24192 drivers. - config MFD_DAVINCI_VOICECODEC tristate select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 3a72df44cfba..00fc5cc70f63 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -11,7 +11,6 @@ obj-$(CONFIG_HTC_EGPIO) += htc-egpio.o obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o obj-$(CONFIG_HTC_I2CPLD) += htc-i2cpld.o -obj-$(CONFIG_MFD_BQ2419X) += bq2419x.o obj-$(CONFIG_MFD_DAVINCI_VOICECODEC) += davinci_voicecodec.o obj-$(CONFIG_MFD_DM355EVM_MSP) += dm355evm_msp.o obj-$(CONFIG_MFD_TI_SSP) += ti-ssp.o diff --git a/drivers/mfd/bq2419x.c b/drivers/mfd/bq2419x.c deleted file mode 100644 index 71c510e5332e..000000000000 --- a/drivers/mfd/bq2419x.c +++ /dev/null @@ -1,136 +0,0 @@ -/* - * bq2419x.c -- bq2419x - * - * MFD driver for BQ2419X charger. - * - * Copyright (c) 2012, NVIDIA Corporation. - * - * Author: Laxman Dewangan <ldewangan@nvidia.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation version 2. - * - * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind, - * whether express or implied; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307, USA - */ - -#include <linux/err.h> -#include <linux/gpio.h> -#include <linux/i2c.h> -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/platform_device.h> -#include <linux/regmap.h> -#include <linux/mfd/core.h> -#include <linux/mfd/bq2419x.h> -#include <linux/slab.h> - -static struct mfd_cell bq2419x_children[] = { - {.name = "bq2419x-pmic",}, - {.name = "bq2419x-battery-charger",}, -}; - -static const struct regmap_config bq2419x_regmap_config = { - .reg_bits = 8, - .val_bits = 8, - .max_register = BQ2419X_MAX_REGS, - .cache_type = REGCACHE_RBTREE, -}; - -static int __devinit bq2419x_probe(struct i2c_client *client, - const struct i2c_device_id *id) -{ - struct bq2419x_platform_data *pdata; - struct bq2419x_chip *bq; - int ret; - - pdata = client->dev.platform_data; - if (!pdata) { - dev_err(&client->dev, "No Platform data"); - return -EIO; - } - - bq = devm_kzalloc(&client->dev, sizeof(*bq), GFP_KERNEL); - if (!bq) { - dev_err(&client->dev, "Memory allocation failed\n"); - return -ENOMEM; - } - - bq->dev = &client->dev; - bq->regmap = devm_regmap_init_i2c(client, &bq2419x_regmap_config); - if (IS_ERR(bq->regmap)) { - ret = PTR_ERR(bq->regmap); - dev_err(&client->dev, "regmap init failed with err %d\n", ret); - return ret; - } - i2c_set_clientdata(client, bq); - - if (pdata->disable_watchdog) { - ret = regmap_update_bits(bq->regmap, BQ2419X_WD, - BQ2419X_WD_MASK, BQ2419X_WD_DISABLE); - if (ret < 0) { - dev_err(bq->dev, "register %d update failed with err %d", - BQ2419X_WD, ret); - return ret; - } - } - - ret = mfd_add_devices(bq->dev, -1, bq2419x_children, - ARRAY_SIZE(bq2419x_children), NULL, 0); - if (ret < 0) { - dev_err(bq->dev, - "registering mfd sub devices failed, err = %d\n", ret); - return ret; - } - return 0; -} - -static int __devexit bq2419x_remove(struct i2c_client *client) -{ - struct bq2419x_chip *bq = i2c_get_clientdata(client); - - mfd_remove_devices(bq->dev); - return 0; -} - -static const struct i2c_device_id bq2419x_id[] = { - {.name = "bq2419x",}, - {}, -}; - -MODULE_DEVICE_TABLE(i2c, bq2419x_id); - -static struct i2c_driver bq2419x_i2c_driver = { - .driver = { - .name = "bq2419x", - .owner = THIS_MODULE, - }, - .probe = bq2419x_probe, - .remove = __devexit_p(bq2419x_remove), - .id_table = bq2419x_id, -}; - -static int __init bq2419x_init(void) -{ - return i2c_add_driver(&bq2419x_i2c_driver); -} -subsys_initcall(bq2419x_init); - -static void __exit bq2419x_cleanup(void) -{ - i2c_del_driver(&bq2419x_i2c_driver); -} -module_exit(bq2419x_cleanup); - -MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>"); -MODULE_DESCRIPTION("BQ2419X mfd core driver"); -MODULE_LICENSE("GPL v2"); |