A respin of the merges in the previous pull request with one extra fix. A quiet release for the regulator API, quite a large number of small improvements all over but other than the addition of new drivers for the AS3722 and MAX14577 there is nothing of substantial non-local impact. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJS4QTYAAoJELSic+t+oim92bMP/09kMG+4zS6TGM+ljselfYLQ XmqEAfLpND+07HmxlCRMHIRdrzMm7QrrW076UT3u6Q/RUi6L7LjXWdFNhm9d7k4V l45lvpo8C+bJkmX9Y9+dBPKbY5qnz9Kttpr/8wn0uAz1zhqhCCG2GYp0eV7Qcz7L XrBfiWmmeu11ArFtQcVPheGMdjiG2hpxbHqJ4e5nZ8kJ3C31RgfTR2r8xA8xr99H LhzuwoKjlsjzIuXUgd2F/i4TqtOkpg69wQocRnOYyyEpd4TnI+q4pk4GiMx4EuH1 GMZ/XGmd1GuiAa7hXIWOyz7vNe54RPoLTWN8QEaYGXf8m/AUUVbje33BTtWbwEeU VXWbKpNEWWzykE6lPtxY9I0KMYbqAUvcflIL7kLYbxLS6RE5U4+dwYVEF0gwAWor svwgwXhjzNCJhb+DQlzKQa2zcWwJr0uT+DllPXEXJE5yIIn7cHEraYcS4cPfLNL5 MLnB9BGX5zJQDJVsex/8jnCafI7M/CefIB06CbLK4klR1OtyTJc3yEhGCgWlJU4C NKdUbUhirCkPqY2v4RwWwOaxGs0WFWsyd5gYhCy3gL7O22pGW5yGO3MG524mRWrU ccU9lbpXgtHTTcb+RKBEwr9fWEcsCIt5gImcRoMxqfkjY0CsQJD8tVdl4Md7OYYv BjJexZZulWce7R3F7+Kf =1NsR -----END PGP SIGNATURE----- Merge tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator Pull regulator updates from Mark Brown: "A respin of the merges in the previous pull request with one extra fix. A quiet release for the regulator API, quite a large number of small improvements all over but other than the addition of new drivers for the AS3722 and MAX14577 there is nothing of substantial non-local impact" * tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (47 commits) regulator: pfuze100-regulator: Improve dev_info() message regulator: pfuze100-regulator: Fix some checkpatch complaints regulator: twl: Fix checkpatch issue regulator: core: Fix checkpatch issue regulator: anatop-regulator: Remove unneeded memset() regulator: s5m8767: Update LDO index in s5m8767-regulator.txt regulator: as3722: set enable time for SD0/1/6 regulator: as3722: detect SD0 low-voltage mode regulator: tps62360: Fix up a pointer-integer size mismatch warning regulator: anatop-regulator: Remove unneeded kstrdup() regulator: act8865: Fix build error when !OF regulator: act8865: register all regulators regardless of how many are used regulator: wm831x-dcdc: Remove unneeded 'err' label regulator: anatop-regulator: Add MODULE_ALIAS() regulator: act8865: fix incorrect devm_kzalloc for act8865 regulator: act8865: Remove set_suspend_[en|dis]able implementation regulator: act8865: Remove unneeded regulator_unregister() calls regulator: s2mps11: Clean up redundant code regulator: tps65910: Simplify setting enable_mask for regulators regulator: act8865: add device tree binding doc ...
		
			
				
	
	
		
			388 lines
		
	
	
	
		
			8.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			388 lines
		
	
	
	
		
			8.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * sec-core.c
 | 
						|
 *
 | 
						|
 * Copyright (c) 2012 Samsung Electronics Co., Ltd
 | 
						|
 *              http://www.samsung.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;  either version 2 of the  License, or (at your
 | 
						|
 *  option) any later version.
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/module.h>
 | 
						|
#include <linux/moduleparam.h>
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/err.h>
 | 
						|
#include <linux/slab.h>
 | 
						|
#include <linux/i2c.h>
 | 
						|
#include <linux/of.h>
 | 
						|
#include <linux/of_irq.h>
 | 
						|
#include <linux/interrupt.h>
 | 
						|
#include <linux/pm_runtime.h>
 | 
						|
#include <linux/mutex.h>
 | 
						|
#include <linux/mfd/core.h>
 | 
						|
#include <linux/mfd/samsung/core.h>
 | 
						|
#include <linux/mfd/samsung/irq.h>
 | 
						|
#include <linux/mfd/samsung/rtc.h>
 | 
						|
#include <linux/mfd/samsung/s2mps11.h>
 | 
						|
#include <linux/mfd/samsung/s5m8763.h>
 | 
						|
#include <linux/mfd/samsung/s5m8767.h>
 | 
						|
#include <linux/regmap.h>
 | 
						|
 | 
						|
static const struct mfd_cell s5m8751_devs[] = {
 | 
						|
	{
 | 
						|
		.name = "s5m8751-pmic",
 | 
						|
	}, {
 | 
						|
		.name = "s5m-charger",
 | 
						|
	}, {
 | 
						|
		.name = "s5m8751-codec",
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static const struct mfd_cell s5m8763_devs[] = {
 | 
						|
	{
 | 
						|
		.name = "s5m8763-pmic",
 | 
						|
	}, {
 | 
						|
		.name = "s5m-rtc",
 | 
						|
	}, {
 | 
						|
		.name = "s5m-charger",
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static const struct mfd_cell s5m8767_devs[] = {
 | 
						|
	{
 | 
						|
		.name = "s5m8767-pmic",
 | 
						|
	}, {
 | 
						|
		.name = "s5m-rtc",
 | 
						|
	}, {
 | 
						|
		.name = "s5m8767-clk",
 | 
						|
	}
 | 
						|
};
 | 
						|
 | 
						|
static const struct mfd_cell s2mps11_devs[] = {
 | 
						|
	{
 | 
						|
		.name = "s2mps11-pmic",
 | 
						|
	}, {
 | 
						|
		.name = "s2mps11-clk",
 | 
						|
	}
 | 
						|
};
 | 
						|
 | 
						|
#ifdef CONFIG_OF
 | 
						|
static struct of_device_id sec_dt_match[] = {
 | 
						|
	{	.compatible = "samsung,s5m8767-pmic",
 | 
						|
		.data = (void *)S5M8767X,
 | 
						|
	},
 | 
						|
	{	.compatible = "samsung,s2mps11-pmic",
 | 
						|
		.data = (void *)S2MPS11X,
 | 
						|
	},
 | 
						|
	{},
 | 
						|
};
 | 
						|
#endif
 | 
						|
 | 
						|
static bool s2mps11_volatile(struct device *dev, unsigned int reg)
 | 
						|
{
 | 
						|
	switch (reg) {
 | 
						|
	case S2MPS11_REG_INT1M:
 | 
						|
	case S2MPS11_REG_INT2M:
 | 
						|
	case S2MPS11_REG_INT3M:
 | 
						|
		return false;
 | 
						|
	default:
 | 
						|
		return true;
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
static bool s5m8763_volatile(struct device *dev, unsigned int reg)
 | 
						|
{
 | 
						|
	switch (reg) {
 | 
						|
	case S5M8763_REG_IRQM1:
 | 
						|
	case S5M8763_REG_IRQM2:
 | 
						|
	case S5M8763_REG_IRQM3:
 | 
						|
	case S5M8763_REG_IRQM4:
 | 
						|
		return false;
 | 
						|
	default:
 | 
						|
		return true;
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
static const struct regmap_config sec_regmap_config = {
 | 
						|
	.reg_bits = 8,
 | 
						|
	.val_bits = 8,
 | 
						|
};
 | 
						|
 | 
						|
static const struct regmap_config s2mps11_regmap_config = {
 | 
						|
	.reg_bits = 8,
 | 
						|
	.val_bits = 8,
 | 
						|
 | 
						|
	.max_register = S2MPS11_REG_L38CTRL,
 | 
						|
	.volatile_reg = s2mps11_volatile,
 | 
						|
	.cache_type = REGCACHE_FLAT,
 | 
						|
};
 | 
						|
 | 
						|
static const struct regmap_config s5m8763_regmap_config = {
 | 
						|
	.reg_bits = 8,
 | 
						|
	.val_bits = 8,
 | 
						|
 | 
						|
	.max_register = S5M8763_REG_LBCNFG2,
 | 
						|
	.volatile_reg = s5m8763_volatile,
 | 
						|
	.cache_type = REGCACHE_FLAT,
 | 
						|
};
 | 
						|
 | 
						|
static const struct regmap_config s5m8767_regmap_config = {
 | 
						|
	.reg_bits = 8,
 | 
						|
	.val_bits = 8,
 | 
						|
 | 
						|
	.max_register = S5M8767_REG_LDO28CTRL,
 | 
						|
	.volatile_reg = s2mps11_volatile,
 | 
						|
	.cache_type = REGCACHE_FLAT,
 | 
						|
};
 | 
						|
 | 
						|
static const struct regmap_config sec_rtc_regmap_config = {
 | 
						|
	.reg_bits = 8,
 | 
						|
	.val_bits = 8,
 | 
						|
};
 | 
						|
 | 
						|
#ifdef CONFIG_OF
 | 
						|
/*
 | 
						|
 * Only the common platform data elements for s5m8767 are parsed here from the
 | 
						|
 * device tree. Other sub-modules of s5m8767 such as pmic, rtc , charger and
 | 
						|
 * others have to parse their own platform data elements from device tree.
 | 
						|
 *
 | 
						|
 * The s5m8767 platform data structure is instantiated here and the drivers for
 | 
						|
 * the sub-modules need not instantiate another instance while parsing their
 | 
						|
 * platform data.
 | 
						|
 */
 | 
						|
static struct sec_platform_data *sec_pmic_i2c_parse_dt_pdata(
 | 
						|
					struct device *dev)
 | 
						|
{
 | 
						|
	struct sec_platform_data *pd;
 | 
						|
 | 
						|
	pd = devm_kzalloc(dev, sizeof(*pd), GFP_KERNEL);
 | 
						|
	if (!pd) {
 | 
						|
		dev_err(dev, "could not allocate memory for pdata\n");
 | 
						|
		return ERR_PTR(-ENOMEM);
 | 
						|
	}
 | 
						|
 | 
						|
	/*
 | 
						|
	 * ToDo: the 'wakeup' member in the platform data is more of a linux
 | 
						|
	 * specfic information. Hence, there is no binding for that yet and
 | 
						|
	 * not parsed here.
 | 
						|
	 */
 | 
						|
 | 
						|
	return pd;
 | 
						|
}
 | 
						|
#else
 | 
						|
static struct sec_platform_data *sec_pmic_i2c_parse_dt_pdata(
 | 
						|
					struct device *dev)
 | 
						|
{
 | 
						|
	return NULL;
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
static inline int sec_i2c_get_driver_data(struct i2c_client *i2c,
 | 
						|
						const struct i2c_device_id *id)
 | 
						|
{
 | 
						|
#ifdef CONFIG_OF
 | 
						|
	if (i2c->dev.of_node) {
 | 
						|
		const struct of_device_id *match;
 | 
						|
		match = of_match_node(sec_dt_match, i2c->dev.of_node);
 | 
						|
		return (int)match->data;
 | 
						|
	}
 | 
						|
#endif
 | 
						|
	return (int)id->driver_data;
 | 
						|
}
 | 
						|
 | 
						|
static int sec_pmic_probe(struct i2c_client *i2c,
 | 
						|
			    const struct i2c_device_id *id)
 | 
						|
{
 | 
						|
	struct sec_platform_data *pdata = dev_get_platdata(&i2c->dev);
 | 
						|
	const struct regmap_config *regmap;
 | 
						|
	struct sec_pmic_dev *sec_pmic;
 | 
						|
	int ret;
 | 
						|
 | 
						|
	sec_pmic = devm_kzalloc(&i2c->dev, sizeof(struct sec_pmic_dev),
 | 
						|
				GFP_KERNEL);
 | 
						|
	if (sec_pmic == NULL)
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	i2c_set_clientdata(i2c, sec_pmic);
 | 
						|
	sec_pmic->dev = &i2c->dev;
 | 
						|
	sec_pmic->i2c = i2c;
 | 
						|
	sec_pmic->irq = i2c->irq;
 | 
						|
	sec_pmic->type = sec_i2c_get_driver_data(i2c, id);
 | 
						|
 | 
						|
	if (sec_pmic->dev->of_node) {
 | 
						|
		pdata = sec_pmic_i2c_parse_dt_pdata(sec_pmic->dev);
 | 
						|
		if (IS_ERR(pdata)) {
 | 
						|
			ret = PTR_ERR(pdata);
 | 
						|
			return ret;
 | 
						|
		}
 | 
						|
		pdata->device_type = sec_pmic->type;
 | 
						|
	}
 | 
						|
	if (pdata) {
 | 
						|
		sec_pmic->device_type = pdata->device_type;
 | 
						|
		sec_pmic->ono = pdata->ono;
 | 
						|
		sec_pmic->irq_base = pdata->irq_base;
 | 
						|
		sec_pmic->wakeup = pdata->wakeup;
 | 
						|
		sec_pmic->pdata = pdata;
 | 
						|
	}
 | 
						|
 | 
						|
	switch (sec_pmic->device_type) {
 | 
						|
	case S2MPS11X:
 | 
						|
		regmap = &s2mps11_regmap_config;
 | 
						|
		break;
 | 
						|
	case S5M8763X:
 | 
						|
		regmap = &s5m8763_regmap_config;
 | 
						|
		break;
 | 
						|
	case S5M8767X:
 | 
						|
		regmap = &s5m8767_regmap_config;
 | 
						|
		break;
 | 
						|
	default:
 | 
						|
		regmap = &sec_regmap_config;
 | 
						|
		break;
 | 
						|
	}
 | 
						|
 | 
						|
	sec_pmic->regmap_pmic = devm_regmap_init_i2c(i2c, regmap);
 | 
						|
	if (IS_ERR(sec_pmic->regmap_pmic)) {
 | 
						|
		ret = PTR_ERR(sec_pmic->regmap_pmic);
 | 
						|
		dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
 | 
						|
			ret);
 | 
						|
		return ret;
 | 
						|
	}
 | 
						|
 | 
						|
	sec_pmic->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR);
 | 
						|
	i2c_set_clientdata(sec_pmic->rtc, sec_pmic);
 | 
						|
 | 
						|
	sec_pmic->regmap_rtc = devm_regmap_init_i2c(sec_pmic->rtc,
 | 
						|
			&sec_rtc_regmap_config);
 | 
						|
	if (IS_ERR(sec_pmic->regmap_rtc)) {
 | 
						|
		ret = PTR_ERR(sec_pmic->regmap_rtc);
 | 
						|
		dev_err(&i2c->dev, "Failed to allocate RTC register map: %d\n",
 | 
						|
			ret);
 | 
						|
		return ret;
 | 
						|
	}
 | 
						|
 | 
						|
	if (pdata && pdata->cfg_pmic_irq)
 | 
						|
		pdata->cfg_pmic_irq();
 | 
						|
 | 
						|
	sec_irq_init(sec_pmic);
 | 
						|
 | 
						|
	pm_runtime_set_active(sec_pmic->dev);
 | 
						|
 | 
						|
	switch (sec_pmic->device_type) {
 | 
						|
	case S5M8751X:
 | 
						|
		ret = mfd_add_devices(sec_pmic->dev, -1, s5m8751_devs,
 | 
						|
				      ARRAY_SIZE(s5m8751_devs), NULL, 0, NULL);
 | 
						|
		break;
 | 
						|
	case S5M8763X:
 | 
						|
		ret = mfd_add_devices(sec_pmic->dev, -1, s5m8763_devs,
 | 
						|
				      ARRAY_SIZE(s5m8763_devs), NULL, 0, NULL);
 | 
						|
		break;
 | 
						|
	case S5M8767X:
 | 
						|
		ret = mfd_add_devices(sec_pmic->dev, -1, s5m8767_devs,
 | 
						|
				      ARRAY_SIZE(s5m8767_devs), NULL, 0, NULL);
 | 
						|
		break;
 | 
						|
	case S2MPS11X:
 | 
						|
		ret = mfd_add_devices(sec_pmic->dev, -1, s2mps11_devs,
 | 
						|
				      ARRAY_SIZE(s2mps11_devs), NULL, 0, NULL);
 | 
						|
		break;
 | 
						|
	default:
 | 
						|
		/* If this happens the probe function is problem */
 | 
						|
		BUG();
 | 
						|
	}
 | 
						|
 | 
						|
	if (ret)
 | 
						|
		goto err;
 | 
						|
 | 
						|
	device_init_wakeup(sec_pmic->dev, sec_pmic->wakeup);
 | 
						|
 | 
						|
	return ret;
 | 
						|
 | 
						|
err:
 | 
						|
	sec_irq_exit(sec_pmic);
 | 
						|
	i2c_unregister_device(sec_pmic->rtc);
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
 | 
						|
static int sec_pmic_remove(struct i2c_client *i2c)
 | 
						|
{
 | 
						|
	struct sec_pmic_dev *sec_pmic = i2c_get_clientdata(i2c);
 | 
						|
 | 
						|
	mfd_remove_devices(sec_pmic->dev);
 | 
						|
	sec_irq_exit(sec_pmic);
 | 
						|
	i2c_unregister_device(sec_pmic->rtc);
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int sec_pmic_suspend(struct device *dev)
 | 
						|
{
 | 
						|
	struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
 | 
						|
	struct sec_pmic_dev *sec_pmic = i2c_get_clientdata(i2c);
 | 
						|
 | 
						|
	if (device_may_wakeup(dev)) {
 | 
						|
		enable_irq_wake(sec_pmic->irq);
 | 
						|
		/*
 | 
						|
		 * PMIC IRQ must be disabled during suspend for RTC alarm
 | 
						|
		 * to work properly.
 | 
						|
		 * When device is woken up from suspend by RTC Alarm, an
 | 
						|
		 * interrupt occurs before resuming I2C bus controller.
 | 
						|
		 * The interrupt is handled by regmap_irq_thread which tries
 | 
						|
		 * to read RTC registers. This read fails (I2C is still
 | 
						|
		 * suspended) and RTC Alarm interrupt is disabled.
 | 
						|
		 */
 | 
						|
		disable_irq(sec_pmic->irq);
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int sec_pmic_resume(struct device *dev)
 | 
						|
{
 | 
						|
	struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
 | 
						|
	struct sec_pmic_dev *sec_pmic = i2c_get_clientdata(i2c);
 | 
						|
 | 
						|
	if (device_may_wakeup(dev)) {
 | 
						|
		disable_irq_wake(sec_pmic->irq);
 | 
						|
		enable_irq(sec_pmic->irq);
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static SIMPLE_DEV_PM_OPS(sec_pmic_pm_ops, sec_pmic_suspend, sec_pmic_resume);
 | 
						|
 | 
						|
static const struct i2c_device_id sec_pmic_id[] = {
 | 
						|
	{ "sec_pmic", 0 },
 | 
						|
	{ }
 | 
						|
};
 | 
						|
MODULE_DEVICE_TABLE(i2c, sec_pmic_id);
 | 
						|
 | 
						|
static struct i2c_driver sec_pmic_driver = {
 | 
						|
	.driver = {
 | 
						|
		   .name = "sec_pmic",
 | 
						|
		   .owner = THIS_MODULE,
 | 
						|
		   .pm = &sec_pmic_pm_ops,
 | 
						|
		   .of_match_table = of_match_ptr(sec_dt_match),
 | 
						|
	},
 | 
						|
	.probe = sec_pmic_probe,
 | 
						|
	.remove = sec_pmic_remove,
 | 
						|
	.id_table = sec_pmic_id,
 | 
						|
};
 | 
						|
 | 
						|
static int __init sec_pmic_init(void)
 | 
						|
{
 | 
						|
	return i2c_add_driver(&sec_pmic_driver);
 | 
						|
}
 | 
						|
 | 
						|
subsys_initcall(sec_pmic_init);
 | 
						|
 | 
						|
static void __exit sec_pmic_exit(void)
 | 
						|
{
 | 
						|
	i2c_del_driver(&sec_pmic_driver);
 | 
						|
}
 | 
						|
module_exit(sec_pmic_exit);
 | 
						|
 | 
						|
MODULE_AUTHOR("Sangbeom Kim <sbkim73@samsung.com>");
 | 
						|
MODULE_DESCRIPTION("Core support for the S5M MFD");
 | 
						|
MODULE_LICENSE("GPL");
 |