Skip to content

L
linux
Commit f71f2627 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branches 'regulator/topic/s2mps11',... 

Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/s2mpu02', 'regulator/topic/s5m8767' and 'regulator/topic/tps65090' into regulator-next
parents d5b5d9d4 cad35c3f 448b55c2 0a3ade7e 4f2352cf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 263 additions and 473 deletions
drivers/extcon/extcon-max77693.c
View file @ f71f2627
...@@ -255,10 +255,10 @@ static int max77693_muic_set_debounce_time(struct max77693_muic_info *info, ...@@ -255,10 +255,10 @@ static int max77693_muic_set_debounce_time(struct max77693_muic_info *info,
case ADC_DEBOUNCE_TIME_10MS: case ADC_DEBOUNCE_TIME_10MS:
case ADC_DEBOUNCE_TIME_25MS: case ADC_DEBOUNCE_TIME_25MS:
case ADC_DEBOUNCE_TIME_38_62MS: case ADC_DEBOUNCE_TIME_38_62MS:
ret = max77693_update_reg(info->max77693->regmap_muic, ret = regmap_update_bits(info->max77693->regmap_muic,
MAX77693_MUIC_REG_CTRL3, MAX77693_MUIC_REG_CTRL3,
time << CONTROL3_ADCDBSET_SHIFT, CONTROL3_ADCDBSET_MASK,
CONTROL3_ADCDBSET_MASK); time << CONTROL3_ADCDBSET_SHIFT);
if (ret) { if (ret) {
dev_err(info->dev, "failed to set ADC debounce time\n"); dev_err(info->dev, "failed to set ADC debounce time\n");
return ret; return ret;
...@@ -286,15 +286,15 @@ static int max77693_muic_set_path(struct max77693_muic_info *info, ...@@ -286,15 +286,15 @@ static int max77693_muic_set_path(struct max77693_muic_info *info,
u8 val, bool attached) u8 val, bool attached)
{ {
int ret = 0; int ret = 0;
u8 ctrl1, ctrl2 = 0; unsigned int ctrl1, ctrl2 = 0;
if (attached) if (attached)
ctrl1 = val; ctrl1 = val;
else else
ctrl1 = CONTROL1_SW_OPEN; ctrl1 = CONTROL1_SW_OPEN;
ret = max77693_update_reg(info->max77693->regmap_muic, ret = regmap_update_bits(info->max77693->regmap_muic,
MAX77693_MUIC_REG_CTRL1, ctrl1, COMP_SW_MASK); MAX77693_MUIC_REG_CTRL1, COMP_SW_MASK, ctrl1);
if (ret < 0) { if (ret < 0) {
dev_err(info->dev, "failed to update MUIC register\n"); dev_err(info->dev, "failed to update MUIC register\n");
return ret; return ret;
...@@ -305,9 +305,9 @@ static int max77693_muic_set_path(struct max77693_muic_info *info, ...@@ -305,9 +305,9 @@ static int max77693_muic_set_path(struct max77693_muic_info *info,
else else
ctrl2 |= CONTROL2_LOWPWR_MASK; /* LowPwr=1, CPEn=0 */ ctrl2 |= CONTROL2_LOWPWR_MASK; /* LowPwr=1, CPEn=0 */
ret = max77693_update_reg(info->max77693->regmap_muic, ret = regmap_update_bits(info->max77693->regmap_muic,
MAX77693_MUIC_REG_CTRL2, ctrl2, MAX77693_MUIC_REG_CTRL2,
CONTROL2_LOWPWR_MASK | CONTROL2_CPEN_MASK); CONTROL2_LOWPWR_MASK | CONTROL2_CPEN_MASK, ctrl2);
if (ret < 0) { if (ret < 0) {
dev_err(info->dev, "failed to update MUIC register\n"); dev_err(info->dev, "failed to update MUIC register\n");
return ret; return ret;
...@@ -969,8 +969,8 @@ static void max77693_muic_irq_work(struct work_struct *work) ...@@ -969,8 +969,8 @@ static void max77693_muic_irq_work(struct work_struct *work)
if (info->irq == muic_irqs[i].virq) if (info->irq == muic_irqs[i].virq)
irq_type = muic_irqs[i].irq; irq_type = muic_irqs[i].irq;
ret = max77693_bulk_read(info->max77693->regmap_muic, ret = regmap_bulk_read(info->max77693->regmap_muic,
MAX77693_MUIC_REG_STATUS1, 2, info->status); MAX77693_MUIC_REG_STATUS1, info->status, 2);
if (ret) { if (ret) {
dev_err(info->dev, "failed to read MUIC register\n"); dev_err(info->dev, "failed to read MUIC register\n");
mutex_unlock(&info->mutex); mutex_unlock(&info->mutex);
...@@ -1042,8 +1042,8 @@ static int max77693_muic_detect_accessory(struct max77693_muic_info *info) ...@@ -1042,8 +1042,8 @@ static int max77693_muic_detect_accessory(struct max77693_muic_info *info)
mutex_lock(&info->mutex); mutex_lock(&info->mutex);
/* Read STATUSx register to detect accessory */ /* Read STATUSx register to detect accessory */
ret = max77693_bulk_read(info->max77693->regmap_muic, ret = regmap_bulk_read(info->max77693->regmap_muic,
MAX77693_MUIC_REG_STATUS1, 2, info->status); MAX77693_MUIC_REG_STATUS1, info->status, 2);
if (ret) { if (ret) {
dev_err(info->dev, "failed to read MUIC register\n"); dev_err(info->dev, "failed to read MUIC register\n");
mutex_unlock(&info->mutex); mutex_unlock(&info->mutex);
...@@ -1095,7 +1095,7 @@ static int max77693_muic_probe(struct platform_device *pdev) ...@@ -1095,7 +1095,7 @@ static int max77693_muic_probe(struct platform_device *pdev)
int delay_jiffies; int delay_jiffies;
int ret; int ret;
int i; int i;
u8 id; unsigned int id;
info = devm_kzalloc(&pdev->dev, sizeof(struct max77693_muic_info), info = devm_kzalloc(&pdev->dev, sizeof(struct max77693_muic_info),
GFP_KERNEL); GFP_KERNEL);
...@@ -1154,7 +1154,8 @@ static int max77693_muic_probe(struct platform_device *pdev) ...@@ -1154,7 +1154,8 @@ static int max77693_muic_probe(struct platform_device *pdev)
struct max77693_muic_irq *muic_irq = &muic_irqs[i]; struct max77693_muic_irq *muic_irq = &muic_irqs[i];
unsigned int virq = 0; unsigned int virq = 0;
virq = irq_create_mapping(max77693->irq_domain, muic_irq->irq); virq = regmap_irq_get_virq(max77693->irq_data_muic,
muic_irq->irq);
if (!virq) { if (!virq) {
ret = -EINVAL; ret = -EINVAL;
goto err_irq; goto err_irq;
...@@ -1204,7 +1205,7 @@ static int max77693_muic_probe(struct platform_device *pdev) ...@@ -1204,7 +1205,7 @@ static int max77693_muic_probe(struct platform_device *pdev)
enum max77693_irq_source irq_src enum max77693_irq_source irq_src
= MAX77693_IRQ_GROUP_NR; = MAX77693_IRQ_GROUP_NR;
max77693_write_reg(info->max77693->regmap_muic, regmap_write(info->max77693->regmap_muic,
init_data[i].addr, init_data[i].addr,
init_data[i].data); init_data[i].data);
...@@ -1262,7 +1263,7 @@ static int max77693_muic_probe(struct platform_device *pdev) ...@@ -1262,7 +1263,7 @@ static int max77693_muic_probe(struct platform_device *pdev)
max77693_muic_set_path(info, info->path_uart, true); max77693_muic_set_path(info, info->path_uart, true);
/* Check revision number of MUIC device*/ /* Check revision number of MUIC device*/
ret = max77693_read_reg(info->max77693->regmap_muic, ret = regmap_read(info->max77693->regmap_muic,
MAX77693_MUIC_REG_ID, &id); MAX77693_MUIC_REG_ID, &id);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "failed to read revision number\n"); dev_err(&pdev->dev, "failed to read revision number\n");
......
drivers/mfd/Kconfig
View file @ f71f2627
...@@ -384,6 +384,7 @@ config MFD_MAX77693 ...@@ -384,6 +384,7 @@ config MFD_MAX77693
depends on I2C=y depends on I2C=y
select MFD_CORE select MFD_CORE
select REGMAP_I2C select REGMAP_I2C
select REGMAP_IRQ
help help
Say yes here to add support for Maxim Semiconductor MAX77693. Say yes here to add support for Maxim Semiconductor MAX77693.
This is a companion Power Management IC with Flash, Haptic, Charger, This is a companion Power Management IC with Flash, Haptic, Charger,
......
drivers/mfd/Makefile
View file @ f71f2627
...@@ -116,7 +116,7 @@ obj-$(CONFIG_MFD_DA9063) += da9063.o ...@@ -116,7 +116,7 @@ obj-$(CONFIG_MFD_DA9063) += da9063.o
obj-$(CONFIG_MFD_MAX14577) += max14577.o obj-$(CONFIG_MFD_MAX14577) += max14577.o
obj-$(CONFIG_MFD_MAX77686) += max77686.o max77686-irq.o obj-$(CONFIG_MFD_MAX77686) += max77686.o max77686-irq.o
obj-$(CONFIG_MFD_MAX77693) += max77693.o max77693-irq.o obj-$(CONFIG_MFD_MAX77693) += max77693.o
obj-$(CONFIG_MFD_MAX8907) += max8907.o obj-$(CONFIG_MFD_MAX8907) += max8907.o
max8925-objs := max8925-core.o max8925-i2c.o max8925-objs := max8925-core.o max8925-i2c.o
obj-$(CONFIG_MFD_MAX8925) += max8925.o obj-$(CONFIG_MFD_MAX8925) += max8925.o
......
drivers/mfd/max77693-irq.c deleted 100644 → 0
View file @ d5b5d9d4
This diff is collapsed.
drivers/mfd/max77693.c
View file @ f71f2627
...@@ -49,62 +49,62 @@ static const struct mfd_cell max77693_devs[] = { ...@@ -49,62 +49,62 @@ static const struct mfd_cell max77693_devs[] = {
{ .name = "max77693-haptic", }, { .name = "max77693-haptic", },
}; };
int max77693_read_reg(struct regmap *map, u8 reg, u8 *dest) static const struct regmap_config max77693_regmap_config = {
{ .reg_bits = 8,
unsigned int val; .val_bits = 8,
int ret; .max_register = MAX77693_PMIC_REG_END,
};
ret = regmap_read(map, reg, &val);
*dest = val;
return ret;
}
EXPORT_SYMBOL_GPL(max77693_read_reg);
int max77693_bulk_read(struct regmap *map, u8 reg, int count, u8 *buf)
{
int ret;
ret = regmap_bulk_read(map, reg, buf, count);
return ret;
}
EXPORT_SYMBOL_GPL(max77693_bulk_read);
int max77693_write_reg(struct regmap *map, u8 reg, u8 value)
{
int ret;
ret = regmap_write(map, reg, value);
return ret;
}
EXPORT_SYMBOL_GPL(max77693_write_reg);
int max77693_bulk_write(struct regmap *map, u8 reg, int count, u8 *buf)
{
int ret;
ret = regmap_bulk_write(map, reg, buf, count); static const struct regmap_irq max77693_led_irqs[] = {
{ .mask = LED_IRQ_FLED2_OPEN, },
{ .mask = LED_IRQ_FLED2_SHORT, },
{ .mask = LED_IRQ_FLED1_OPEN, },
{ .mask = LED_IRQ_FLED1_SHORT, },
{ .mask = LED_IRQ_MAX_FLASH, },
};
return ret; static const struct regmap_irq_chip max77693_led_irq_chip = {
} .name = "max77693-led",
EXPORT_SYMBOL_GPL(max77693_bulk_write); .status_base = MAX77693_LED_REG_FLASH_INT,
.mask_base = MAX77693_LED_REG_FLASH_INT_MASK,
.mask_invert = false,
.num_regs = 1,
.irqs = max77693_led_irqs,
.num_irqs = ARRAY_SIZE(max77693_led_irqs),
};
int max77693_update_reg(struct regmap *map, u8 reg, u8 val, u8 mask) static const struct regmap_irq max77693_topsys_irqs[] = {
{ { .mask = TOPSYS_IRQ_T120C_INT, },
int ret; { .mask = TOPSYS_IRQ_T140C_INT, },
{ .mask = TOPSYS_IRQ_LOWSYS_INT, },
};
ret = regmap_update_bits(map, reg, mask, val); static const struct regmap_irq_chip max77693_topsys_irq_chip = {
.name = "max77693-topsys",
.status_base = MAX77693_PMIC_REG_TOPSYS_INT,
.mask_base = MAX77693_PMIC_REG_TOPSYS_INT_MASK,
.mask_invert = false,
.num_regs = 1,
.irqs = max77693_topsys_irqs,
.num_irqs = ARRAY_SIZE(max77693_topsys_irqs),
};
return ret; static const struct regmap_irq max77693_charger_irqs[] = {
} { .mask = CHG_IRQ_BYP_I, },
EXPORT_SYMBOL_GPL(max77693_update_reg); { .mask = CHG_IRQ_THM_I, },
{ .mask = CHG_IRQ_BAT_I, },
{ .mask = CHG_IRQ_CHG_I, },
{ .mask = CHG_IRQ_CHGIN_I, },
};
static const struct regmap_config max77693_regmap_config = { static const struct regmap_irq_chip max77693_charger_irq_chip = {
.reg_bits = 8, .name = "max77693-charger",
.val_bits = 8, .status_base = MAX77693_CHG_REG_CHG_INT,
.max_register = MAX77693_PMIC_REG_END, .mask_base = MAX77693_CHG_REG_CHG_INT_MASK,
.mask_invert = false,
.num_regs = 1,
.irqs = max77693_charger_irqs,
.num_irqs = ARRAY_SIZE(max77693_charger_irqs),
}; };
static const struct regmap_config max77693_regmap_muic_config = { static const struct regmap_config max77693_regmap_muic_config = {
...@@ -113,11 +113,42 @@ static const struct regmap_config max77693_regmap_muic_config = { ...@@ -113,11 +113,42 @@ static const struct regmap_config max77693_regmap_muic_config = {
.max_register = MAX77693_MUIC_REG_END, .max_register = MAX77693_MUIC_REG_END,
}; };
static const struct regmap_irq max77693_muic_irqs[] = {
{ .reg_offset = 0, .mask = MUIC_IRQ_INT1_ADC, },
{ .reg_offset = 0, .mask = MUIC_IRQ_INT1_ADC_LOW, },
{ .reg_offset = 0, .mask = MUIC_IRQ_INT1_ADC_ERR, },
{ .reg_offset = 0, .mask = MUIC_IRQ_INT1_ADC1K, },
{ .reg_offset = 1, .mask = MUIC_IRQ_INT2_CHGTYP, },
{ .reg_offset = 1, .mask = MUIC_IRQ_INT2_CHGDETREUN, },
{ .reg_offset = 1, .mask = MUIC_IRQ_INT2_DCDTMR, },
{ .reg_offset = 1, .mask = MUIC_IRQ_INT2_DXOVP, },
{ .reg_offset = 1, .mask = MUIC_IRQ_INT2_VBVOLT, },
{ .reg_offset = 1, .mask = MUIC_IRQ_INT2_VIDRM, },
{ .reg_offset = 2, .mask = MUIC_IRQ_INT3_EOC, },
{ .reg_offset = 2, .mask = MUIC_IRQ_INT3_CGMBC, },
{ .reg_offset = 2, .mask = MUIC_IRQ_INT3_OVP, },
{ .reg_offset = 2, .mask = MUIC_IRQ_INT3_MBCCHG_ERR, },
{ .reg_offset = 2, .mask = MUIC_IRQ_INT3_CHG_ENABLED, },
{ .reg_offset = 2, .mask = MUIC_IRQ_INT3_BAT_DET, },
};
static const struct regmap_irq_chip max77693_muic_irq_chip = {
.name = "max77693-muic",
.status_base = MAX77693_MUIC_REG_INT1,
.mask_base = MAX77693_MUIC_REG_INTMASK1,
.mask_invert = true,
.num_regs = 3,
.irqs = max77693_muic_irqs,
.num_irqs = ARRAY_SIZE(max77693_muic_irqs),
};
static int max77693_i2c_probe(struct i2c_client *i2c, static int max77693_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct max77693_dev *max77693; struct max77693_dev *max77693;
u8 reg_data; unsigned int reg_data;
int ret = 0; int ret = 0;
max77693 = devm_kzalloc(&i2c->dev, max77693 = devm_kzalloc(&i2c->dev,
...@@ -139,7 +170,7 @@ static int max77693_i2c_probe(struct i2c_client *i2c, ...@@ -139,7 +170,7 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
return ret; return ret;
} }
ret = max77693_read_reg(max77693->regmap, MAX77693_PMIC_REG_PMIC_ID2, ret = regmap_read(max77693->regmap, MAX77693_PMIC_REG_PMIC_ID2,
&reg_data); &reg_data);
if (ret < 0) { if (ret < 0) {
dev_err(max77693->dev, "device not found on this channel\n"); dev_err(max77693->dev, "device not found on this channel\n");
...@@ -176,9 +207,45 @@ static int max77693_i2c_probe(struct i2c_client *i2c, ...@@ -176,9 +207,45 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
goto err_regmap_muic; goto err_regmap_muic;
} }
ret = max77693_irq_init(max77693); ret = regmap_add_irq_chip(max77693->regmap, max77693->irq,
if (ret < 0) IRQF_ONESHOT | IRQF_SHARED |
goto err_irq; IRQF_TRIGGER_FALLING, 0,
&max77693_led_irq_chip,
&max77693->irq_data_led);
if (ret) {
dev_err(max77693->dev, "failed to add irq chip: %d\n", ret);
goto err_regmap_muic;
}
ret = regmap_add_irq_chip(max77693->regmap, max77693->irq,
IRQF_ONESHOT | IRQF_SHARED |
IRQF_TRIGGER_FALLING, 0,
&max77693_topsys_irq_chip,
&max77693->irq_data_topsys);
if (ret) {
dev_err(max77693->dev, "failed to add irq chip: %d\n", ret);
goto err_irq_topsys;
}
ret = regmap_add_irq_chip(max77693->regmap, max77693->irq,
IRQF_ONESHOT | IRQF_SHARED |
IRQF_TRIGGER_FALLING, 0,
&max77693_charger_irq_chip,
&max77693->irq_data_charger);
if (ret) {
dev_err(max77693->dev, "failed to add irq chip: %d\n", ret);
goto err_irq_charger;
}
ret = regmap_add_irq_chip(max77693->regmap, max77693->irq,
IRQF_ONESHOT | IRQF_SHARED |
IRQF_TRIGGER_FALLING, 0,
&max77693_muic_irq_chip,
&max77693->irq_data_muic);
if (ret) {
dev_err(max77693->dev, "failed to add irq chip: %d\n", ret);
goto err_irq_muic;
}
pm_runtime_set_active(max77693->dev); pm_runtime_set_active(max77693->dev);
...@@ -190,8 +257,14 @@ static int max77693_i2c_probe(struct i2c_client *i2c, ...@@ -190,8 +257,14 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
return ret; return ret;
err_mfd: err_mfd:
max77693_irq_exit(max77693); mfd_remove_devices(max77693->dev);
err_irq: regmap_del_irq_chip(max77693->irq, max77693->irq_data_muic);
err_irq_muic:
regmap_del_irq_chip(max77693->irq, max77693->irq_data_charger);
err_irq_charger:
regmap_del_irq_chip(max77693->irq, max77693->irq_data_topsys);
err_irq_topsys:
regmap_del_irq_chip(max77693->irq, max77693->irq_data_led);
err_regmap_muic: err_regmap_muic:
i2c_unregister_device(max77693->haptic); i2c_unregister_device(max77693->haptic);
err_i2c_haptic: err_i2c_haptic:
...@@ -204,7 +277,12 @@ static int max77693_i2c_remove(struct i2c_client *i2c) ...@@ -204,7 +277,12 @@ static int max77693_i2c_remove(struct i2c_client *i2c)
struct max77693_dev *max77693 = i2c_get_clientdata(i2c); struct max77693_dev *max77693 = i2c_get_clientdata(i2c);
mfd_remove_devices(max77693->dev); mfd_remove_devices(max77693->dev);
max77693_irq_exit(max77693);
regmap_del_irq_chip(max77693->irq, max77693->irq_data_muic);
regmap_del_irq_chip(max77693->irq, max77693->irq_data_charger);
regmap_del_irq_chip(max77693->irq, max77693->irq_data_topsys);
regmap_del_irq_chip(max77693->irq, max77693->irq_data_led);
i2c_unregister_device(max77693->muic); i2c_unregister_device(max77693->muic);
i2c_unregister_device(max77693->haptic); i2c_unregister_device(max77693->haptic);
...@@ -222,8 +300,11 @@ static int max77693_suspend(struct device *dev) ...@@ -222,8 +300,11 @@ static int max77693_suspend(struct device *dev)
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
struct max77693_dev *max77693 = i2c_get_clientdata(i2c); struct max77693_dev *max77693 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev)) {
irq_set_irq_wake(max77693->irq, 1); enable_irq_wake(max77693->irq);
disable_irq(max77693->irq);
}
return 0; return 0;
} }
...@@ -232,9 +313,12 @@ static int max77693_resume(struct device *dev) ...@@ -232,9 +313,12 @@ static int max77693_resume(struct device *dev)
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
struct max77693_dev *max77693 = i2c_get_clientdata(i2c); struct max77693_dev *max77693 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev)) {
irq_set_irq_wake(max77693->irq, 0); disable_irq_wake(max77693->irq);
return max77693_irq_resume(max77693); enable_irq(max77693->irq);
}
return 0;
} }
static const struct dev_pm_ops max77693_pm = { static const struct dev_pm_ops max77693_pm = {
......
drivers/regulator/Kconfig
View file @ f71f2627
...@@ -467,10 +467,10 @@ config REGULATOR_S2MPA01 ...@@ -467,10 +467,10 @@ config REGULATOR_S2MPA01
via I2C bus. S2MPA01 has 10 Bucks and 26 LDO outputs. via I2C bus. S2MPA01 has 10 Bucks and 26 LDO outputs.
config REGULATOR_S2MPS11 config REGULATOR_S2MPS11
tristate "Samsung S2MPS11/S2MPS14 voltage regulator" tristate "Samsung S2MPS11/S2MPS14/S2MPU02 voltage regulator"
depends on MFD_SEC_CORE depends on MFD_SEC_CORE
help help
This driver supports a Samsung S2MPS11/S2MPS14 voltage output This driver supports a Samsung S2MPS11/S2MPS14/S2MPU02 voltage output
regulator via I2C bus. The chip is comprised of high efficient Buck regulator via I2C bus. The chip is comprised of high efficient Buck
converters including Dual-Phase Buck converter, Buck-Boost converter, converters including Dual-Phase Buck converter, Buck-Boost converter,
various LDOs. various LDOs.
......
drivers/regulator/max77693.c
View file @ f71f2627
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <linux/mfd/max77693.h> #include <linux/mfd/max77693.h>
#include <linux/mfd/max77693-private.h> #include <linux/mfd/max77693-private.h>
#include <linux/regulator/of_regulator.h> #include <linux/regulator/of_regulator.h>
#include <linux/regmap.h>
#define CHGIN_ILIM_STEP_20mA 20000 #define CHGIN_ILIM_STEP_20mA 20000
...@@ -39,9 +40,9 @@ ...@@ -39,9 +40,9 @@
static int max77693_chg_is_enabled(struct regulator_dev *rdev) static int max77693_chg_is_enabled(struct regulator_dev *rdev)
{ {
int ret; int ret;
u8 val; unsigned int val;
ret = max77693_read_reg(rdev->regmap, rdev->desc->enable_reg, &val); ret = regmap_read(rdev->regmap, rdev->desc->enable_reg, &val);
if (ret) if (ret)
return ret; return ret;
...@@ -57,12 +58,11 @@ static int max77693_chg_get_current_limit(struct regulator_dev *rdev) ...@@ -57,12 +58,11 @@ static int max77693_chg_get_current_limit(struct regulator_dev *rdev)
{ {
unsigned int chg_min_uA = rdev->constraints->min_uA; unsigned int chg_min_uA = rdev->constraints->min_uA;
unsigned int chg_max_uA = rdev->constraints->max_uA; unsigned int chg_max_uA = rdev->constraints->max_uA;
u8 reg, sel; unsigned int reg, sel;
unsigned int val; unsigned int val;
int ret; int ret;
ret = max77693_read_reg(rdev->regmap, ret = regmap_read(rdev->regmap, MAX77693_CHG_REG_CHG_CNFG_09, &reg);
MAX77693_CHG_REG_CHG_CNFG_09, &reg);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -96,7 +96,7 @@ static int max77693_chg_set_current_limit(struct regulator_dev *rdev, ...@@ -96,7 +96,7 @@ static int max77693_chg_set_current_limit(struct regulator_dev *rdev,
/* the first four codes for charger current are all 60mA */ /* the first four codes for charger current are all 60mA */
sel += 3; sel += 3;
return max77693_write_reg(rdev->regmap, return regmap_write(rdev->regmap,
MAX77693_CHG_REG_CHG_CNFG_09, sel); MAX77693_CHG_REG_CHG_CNFG_09, sel);
} }
/* end of CHARGER regulator ops */ /* end of CHARGER regulator ops */
......
drivers/regulator/s2mps11.c
View file @ f71f2627
...@@ -766,5 +766,5 @@ module_exit(s2mps11_pmic_exit); ...@@ -766,5 +766,5 @@ module_exit(s2mps11_pmic_exit);
/* Module information */ /* Module information */
MODULE_AUTHOR("Sangbeom Kim <sbkim73@samsung.com>"); MODULE_AUTHOR("Sangbeom Kim <sbkim73@samsung.com>");
MODULE_DESCRIPTION("SAMSUNG S2MPS11/S2MPS14 Regulator Driver"); MODULE_DESCRIPTION("SAMSUNG S2MPS11/S2MPS14/S2MPU02 Regulator Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/regulator/s5m8767.c
View file @ f71f2627
...@@ -686,7 +686,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev) ...@@ -686,7 +686,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
struct sec_platform_data *pdata = iodev->pdata; struct sec_platform_data *pdata = iodev->pdata;
struct regulator_config config = { }; struct regulator_config config = { };
struct s5m8767_info *s5m8767; struct s5m8767_info *s5m8767;
int i, ret, size, buck_init; int i, ret, buck_init;
if (!pdata) { if (!pdata) {
dev_err(pdev->dev.parent, "Platform data not supplied\n"); dev_err(pdev->dev.parent, "Platform data not supplied\n");
...@@ -725,8 +725,6 @@ static int s5m8767_pmic_probe(struct platform_device *pdev) ...@@ -725,8 +725,6 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
if (!s5m8767) if (!s5m8767)
return -ENOMEM; return -ENOMEM;
size = sizeof(struct regulator_dev *) * (S5M8767_REG_MAX - 2);
s5m8767->dev = &pdev->dev; s5m8767->dev = &pdev->dev;
s5m8767->iodev = iodev; s5m8767->iodev = iodev;
s5m8767->num_regulators = pdata->num_regulators; s5m8767->num_regulators = pdata->num_regulators;
......
drivers/regulator/tps65090-regulator.c
View file @ f71f2627
...@@ -192,12 +192,14 @@ static struct regulator_ops tps65090_fet_control_ops = { ...@@ -192,12 +192,14 @@ static struct regulator_ops tps65090_fet_control_ops = {
static struct regulator_ops tps65090_ldo_ops = { static struct regulator_ops tps65090_ldo_ops = {
}; };
#define tps65090_REG_DESC(_id, _sname, _en_reg, _en_bits, _ops) \ #define tps65090_REG_DESC(_id, _sname, _en_reg, _en_bits, _nvolt, _volt, _ops) \
{ \ { \
.name = "TPS65090_RAILS"#_id, \ .name = "TPS65090_RAILS"#_id, \
.supply_name = _sname, \ .supply_name = _sname, \
.id = TPS65090_REGULATOR_##_id, \ .id = TPS65090_REGULATOR_##_id, \
.n_voltages = _nvolt, \
.ops = &_ops, \ .ops = &_ops, \
.fixed_uV = _volt, \
.enable_reg = _en_reg, \ .enable_reg = _en_reg, \
.enable_val = _en_bits, \ .enable_val = _en_bits, \
.enable_mask = _en_bits, \ .enable_mask = _en_bits, \
...@@ -205,40 +207,46 @@ static struct regulator_ops tps65090_ldo_ops = { ...@@ -205,40 +207,46 @@ static struct regulator_ops tps65090_ldo_ops = {
.owner = THIS_MODULE, \ .owner = THIS_MODULE, \
} }
#define tps65090_REG_FIXEDV(_id, _sname, en_reg, _en_bits, _volt, _ops) \
tps65090_REG_DESC(_id, _sname, en_reg, _en_bits, 1, _volt, _ops)
#define tps65090_REG_SWITCH(_id, _sname, en_reg, _en_bits, _ops) \
tps65090_REG_DESC(_id, _sname, en_reg, _en_bits, 0, 0, _ops)
static struct regulator_desc tps65090_regulator_desc[] = { static struct regulator_desc tps65090_regulator_desc[] = {
tps65090_REG_DESC(DCDC1, "vsys1", 0x0C, BIT(CTRL_EN_BIT), tps65090_REG_FIXEDV(DCDC1, "vsys1", 0x0C, BIT(CTRL_EN_BIT), 5000000,
tps65090_reg_control_ops), tps65090_reg_control_ops),
tps65090_REG_DESC(DCDC2, "vsys2", 0x0D, BIT(CTRL_EN_BIT), tps65090_REG_FIXEDV(DCDC2, "vsys2", 0x0D, BIT(CTRL_EN_BIT), 3300000,
tps65090_reg_control_ops), tps65090_reg_control_ops),
tps65090_REG_DESC(DCDC3, "vsys3", 0x0E, BIT(CTRL_EN_BIT), tps65090_REG_SWITCH(DCDC3, "vsys3", 0x0E, BIT(CTRL_EN_BIT),
tps65090_reg_control_ops), tps65090_reg_control_ops),
tps65090_REG_DESC(FET1, "infet1", 0x0F, tps65090_REG_SWITCH(FET1, "infet1", 0x0F,
BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT), BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT),
tps65090_fet_control_ops), tps65090_fet_control_ops),
tps65090_REG_DESC(FET2, "infet2", 0x10, tps65090_REG_SWITCH(FET2, "infet2", 0x10,
BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT), BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT),
tps65090_fet_control_ops), tps65090_fet_control_ops),
tps65090_REG_DESC(FET3, "infet3", 0x11, tps65090_REG_SWITCH(FET3, "infet3", 0x11,
BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT), BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT),
tps65090_fet_control_ops), tps65090_fet_control_ops),
tps65090_REG_DESC(FET4, "infet4", 0x12, tps65090_REG_SWITCH(FET4, "infet4", 0x12,
BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT), BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT),
tps65090_fet_control_ops), tps65090_fet_control_ops),
tps65090_REG_DESC(FET5, "infet5", 0x13, tps65090_REG_SWITCH(FET5, "infet5", 0x13,
BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT), BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT),
tps65090_fet_control_ops), tps65090_fet_control_ops),
tps65090_REG_DESC(FET6, "infet6", 0x14, tps65090_REG_SWITCH(FET6, "infet6", 0x14,
BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT), BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT),
tps65090_fet_control_ops), tps65090_fet_control_ops),
tps65090_REG_DESC(FET7, "infet7", 0x15, tps65090_REG_SWITCH(FET7, "infet7", 0x15,
BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT), BIT(CTRL_EN_BIT) | BIT(CTRL_PG_BIT),
tps65090_fet_control_ops), tps65090_fet_control_ops),
tps65090_REG_DESC(LDO1, "vsys-l1", 0, 0, tps65090_REG_FIXEDV(LDO1, "vsys-l1", 0, 0, 5000000,
tps65090_ldo_ops), tps65090_ldo_ops),
tps65090_REG_DESC(LDO2, "vsys-l2", 0, 0, tps65090_REG_FIXEDV(LDO2, "vsys-l2", 0, 0, 3300000,
tps65090_ldo_ops), tps65090_ldo_ops),
}; };
static inline bool is_dcdc(int id) static inline bool is_dcdc(int id)
......
include/linux/mfd/max77693-private.h
View file @ f71f2627
...@@ -262,6 +262,41 @@ enum max77693_irq_source { ...@@ -262,6 +262,41 @@ enum max77693_irq_source {
MAX77693_IRQ_GROUP_NR, MAX77693_IRQ_GROUP_NR,
}; };
#define LED_IRQ_FLED2_OPEN BIT(0)
#define LED_IRQ_FLED2_SHORT BIT(1)
#define LED_IRQ_FLED1_OPEN BIT(2)
#define LED_IRQ_FLED1_SHORT BIT(3)
#define LED_IRQ_MAX_FLASH BIT(4)
#define TOPSYS_IRQ_T120C_INT BIT(0)
#define TOPSYS_IRQ_T140C_INT BIT(1)
#define TOPSYS_IRQ_LOWSYS_INT BIT(3)
#define CHG_IRQ_BYP_I BIT(0)
#define CHG_IRQ_THM_I BIT(2)
#define CHG_IRQ_BAT_I BIT(3)
#define CHG_IRQ_CHG_I BIT(4)
#define CHG_IRQ_CHGIN_I BIT(6)
#define MUIC_IRQ_INT1_ADC BIT(0)
#define MUIC_IRQ_INT1_ADC_LOW BIT(1)
#define MUIC_IRQ_INT1_ADC_ERR BIT(2)
#define MUIC_IRQ_INT1_ADC1K BIT(3)
#define MUIC_IRQ_INT2_CHGTYP BIT(0)
#define MUIC_IRQ_INT2_CHGDETREUN BIT(1)
#define MUIC_IRQ_INT2_DCDTMR BIT(2)
#define MUIC_IRQ_INT2_DXOVP BIT(3)
#define MUIC_IRQ_INT2_VBVOLT BIT(4)
#define MUIC_IRQ_INT2_VIDRM BIT(5)
#define MUIC_IRQ_INT3_EOC BIT(0)
#define MUIC_IRQ_INT3_CGMBC BIT(1)
#define MUIC_IRQ_INT3_OVP BIT(2)
#define MUIC_IRQ_INT3_MBCCHG_ERR BIT(3)
#define MUIC_IRQ_INT3_CHG_ENABLED BIT(4)
#define MUIC_IRQ_INT3_BAT_DET BIT(5)
enum max77693_irq { enum max77693_irq {
/* PMIC - FLASH */ /* PMIC - FLASH */
MAX77693_LED_IRQ_FLED2_OPEN, MAX77693_LED_IRQ_FLED2_OPEN,
...@@ -282,6 +317,10 @@ enum max77693_irq { ...@@ -282,6 +317,10 @@ enum max77693_irq {
MAX77693_CHG_IRQ_CHG_I, MAX77693_CHG_IRQ_CHG_I,
MAX77693_CHG_IRQ_CHGIN_I, MAX77693_CHG_IRQ_CHGIN_I,
MAX77693_IRQ_NR,
};
enum max77693_irq_muic {
/* MUIC INT1 */ /* MUIC INT1 */
MAX77693_MUIC_IRQ_INT1_ADC, MAX77693_MUIC_IRQ_INT1_ADC,
MAX77693_MUIC_IRQ_INT1_ADC_LOW, MAX77693_MUIC_IRQ_INT1_ADC_LOW,
...@@ -304,7 +343,7 @@ enum max77693_irq { ...@@ -304,7 +343,7 @@ enum max77693_irq {
MAX77693_MUIC_IRQ_INT3_CHG_ENABLED, MAX77693_MUIC_IRQ_INT3_CHG_ENABLED,
MAX77693_MUIC_IRQ_INT3_BAT_DET, MAX77693_MUIC_IRQ_INT3_BAT_DET,
MAX77693_IRQ_NR, MAX77693_MUIC_IRQ_NR,
}; };
struct max77693_dev { struct max77693_dev {
...@@ -319,7 +358,10 @@ struct max77693_dev { ...@@ -319,7 +358,10 @@ struct max77693_dev {
struct regmap *regmap_muic; struct regmap *regmap_muic;
struct regmap *regmap_haptic; struct regmap *regmap_haptic;
struct irq_domain *irq_domain; struct regmap_irq_chip_data *irq_data_led;
struct regmap_irq_chip_data *irq_data_topsys;
struct regmap_irq_chip_data *irq_data_charger;
struct regmap_irq_chip_data *irq_data_muic;
int irq; int irq;
int irq_gpio; int irq_gpio;
...@@ -332,14 +374,6 @@ enum max77693_types { ...@@ -332,14 +374,6 @@ enum max77693_types {
TYPE_MAX77693, TYPE_MAX77693,
}; };
extern int max77693_read_reg(struct regmap *map, u8 reg, u8 *dest);
extern int max77693_bulk_read(struct regmap *map, u8 reg, int count,
u8 *buf);
extern int max77693_write_reg(struct regmap *map, u8 reg, u8 value);
extern int max77693_bulk_write(struct regmap *map, u8 reg, int count,
u8 *buf);
extern int max77693_update_reg(struct regmap *map, u8 reg, u8 val, u8 mask);
extern int max77693_irq_init(struct max77693_dev *max77686); extern int max77693_irq_init(struct max77693_dev *max77686);
extern void max77693_irq_exit(struct max77693_dev *max77686); extern void max77693_irq_exit(struct max77693_dev *max77686);
extern int max77693_irq_resume(struct max77693_dev *max77686); extern int max77693_irq_resume(struct max77693_dev *max77686);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7